From b2cd1765c75083ec890f9af89596b81d04c03476 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Wed, 21 Jun 2017 16:40:06 +0200 Subject: [PATCH 001/136] add ellipsis (...) punctuator to objective-C --- src/punctuators.cpp | 42 +++++++++++++++++------------------ src/punctuators.h | 1 - tests/input/oc/i1213.m | 9 ++++++++ tests/objective-c.test | 3 ++- tests/output/oc/50801-i1213.m | 9 ++++++++ 5 files changed, 41 insertions(+), 23 deletions(-) create mode 100644 tests/input/oc/i1213.m create mode 100644 tests/output/oc/50801-i1213.m diff --git a/src/punctuators.cpp b/src/punctuators.cpp index 788ba544a8..ebbae8fd5e 100644 --- a/src/punctuators.cpp +++ b/src/punctuators.cpp @@ -47,27 +47,27 @@ static const chunk_tag_t symbols4[] = // 3-char symbols static const chunk_tag_t symbols3[] = { - { "!<=", CT_COMPARE, LANG_D }, - { "!<>", CT_COMPARE, LANG_D }, - { "!==", CT_COMPARE, LANG_D | LANG_ECMA }, - { "!>=", CT_COMPARE, LANG_D }, - { "->*", CT_MEMBER, LANG_C | LANG_CPP | LANG_D }, - { "...", CT_ELLIPSIS, LANG_C | LANG_CPP | LANG_D | LANG_PAWN | LANG_JAVA }, - { "<<=", CT_ASSIGN, LANG_ALL }, - { "<>=", CT_COMPARE, LANG_D }, - { "===", CT_COMPARE, LANG_D | LANG_ECMA }, - { ">>=", CT_ASSIGN, LANG_ALL }, - { ">>>", CT_ARITH, LANG_D | LANG_JAVA | LANG_PAWN | LANG_ECMA }, - { "->*", CT_MEMBER, LANG_C | LANG_CPP | LANG_D }, - { "%:@", CT_POUND, LANG_C | LANG_CPP | LANG_OC }, // digraph #@ MS extension - { R"_(??=)_", CT_POUND, LANG_C | LANG_CPP | FLAG_DIG }, // trigraph # - { R"_(??()_", CT_SQUARE_OPEN, LANG_C | LANG_CPP | FLAG_DIG }, // trigraph [ - { R"_(??))_", CT_SQUARE_CLOSE, LANG_C | LANG_CPP | FLAG_DIG }, // trigraph ] - { R"_(??')_", CT_CARET, LANG_C | LANG_CPP | FLAG_DIG }, // trigraph ^ - { R"_(??<)_", CT_BRACE_OPEN, LANG_C | LANG_CPP | FLAG_DIG }, // trigraph { - { R"_(??>)_", CT_BRACE_CLOSE, LANG_C | LANG_CPP | FLAG_DIG }, // trigraph } - { R"_(??-)_", CT_INV, LANG_C | LANG_CPP | FLAG_DIG }, // trigraph ~ - { R"_(??!)_", CT_ARITH, LANG_C | LANG_CPP | FLAG_DIG }, // trigraph | + { "!<=", CT_COMPARE, LANG_D }, + { "!<>", CT_COMPARE, LANG_D }, + { "!==", CT_COMPARE, LANG_D | LANG_ECMA }, + { "!>=", CT_COMPARE, LANG_D }, + { "->*", CT_MEMBER, LANG_C | LANG_CPP | LANG_D }, + { "...", CT_ELLIPSIS, LANG_C | LANG_CPP | LANG_D | LANG_PAWN | LANG_JAVA | LANG_OC }, + { "<<=", CT_ASSIGN, LANG_ALL }, + { "<>=", CT_COMPARE, LANG_D }, + { "===", CT_COMPARE, LANG_D | LANG_ECMA }, + { ">>=", CT_ASSIGN, LANG_ALL }, + { ">>>", CT_ARITH, LANG_D | LANG_JAVA | LANG_PAWN | LANG_ECMA }, + { "->*", CT_MEMBER, LANG_C | LANG_CPP | LANG_D }, + { "%:@", CT_POUND, LANG_C | LANG_CPP | LANG_OC }, // digraph #@ MS extension + { R"_(??=)_", CT_POUND, LANG_C | LANG_CPP | FLAG_DIG }, // trigraph # + { R"_(??()_", CT_SQUARE_OPEN, LANG_C | LANG_CPP | FLAG_DIG }, // trigraph [ + { R"_(??))_", CT_SQUARE_CLOSE, LANG_C | LANG_CPP | FLAG_DIG }, // trigraph ] + { R"_(??')_", CT_CARET, LANG_C | LANG_CPP | FLAG_DIG }, // trigraph ^ + { R"_(??<)_", CT_BRACE_OPEN, LANG_C | LANG_CPP | FLAG_DIG }, // trigraph { + { R"_(??>)_", CT_BRACE_CLOSE, LANG_C | LANG_CPP | FLAG_DIG }, // trigraph } + { R"_(??-)_", CT_INV, LANG_C | LANG_CPP | FLAG_DIG }, // trigraph ~ + { R"_(??!)_", CT_ARITH, LANG_C | LANG_CPP | FLAG_DIG }, // trigraph | }; // { R"_(??/)_", CT_UNKNOWN, LANG_C | LANG_CPP | FLAG_DIG }, // trigraph '\' diff --git a/src/punctuators.h b/src/punctuators.h index ec599e4cba..ea568f83a0 100644 --- a/src/punctuators.h +++ b/src/punctuators.h @@ -1,6 +1,5 @@ /** * @file punctuators.h - * Automatically generated */ #ifndef PUNCTUATORS_H_INCLUDED diff --git a/tests/input/oc/i1213.m b/tests/input/oc/i1213.m new file mode 100644 index 0000000000..f47e596425 --- /dev/null +++ b/tests/input/oc/i1213.m @@ -0,0 +1,9 @@ +int main (int argc, const char * argv[]) +{ + switch (argc) + { + case 0 ... 1: + return 1; + } + return 0; +} \ No newline at end of file diff --git a/tests/objective-c.test b/tests/objective-c.test index 1fd31fd95e..ab21d21898 100644 --- a/tests/objective-c.test +++ b/tests/objective-c.test @@ -95,4 +95,5 @@ 50700 cmt_insert-0.cfg oc/cmt_insert.m -50800 obj-c-properties.cfg oc/properties.m +50800 obj-c-properties.cfg oc/properties.m +50801 empty.cfg oc/i1213.m diff --git a/tests/output/oc/50801-i1213.m b/tests/output/oc/50801-i1213.m new file mode 100644 index 0000000000..f47e596425 --- /dev/null +++ b/tests/output/oc/50801-i1213.m @@ -0,0 +1,9 @@ +int main (int argc, const char * argv[]) +{ + switch (argc) + { + case 0 ... 1: + return 1; + } + return 0; +} \ No newline at end of file From 666617918013bdf3e64b5ee0714d87d20358b6fb Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Fri, 29 Sep 2017 18:03:13 +0200 Subject: [PATCH 002/136] Introduce keyword CT_NOEXCEPT Some mode debug lines --- src/combine.cpp | 62 +++++++++++++---------------- src/keywords.cpp | 1 + src/token_enum.h | 1 + tests/config/bug_1321.cfg | 3 ++ tests/cpp.test | 1 + tests/input/cpp/bug_1321.cpp | 6 +++ tests/output/cpp/30275-bug_1321.cpp | 6 +++ 7 files changed, 45 insertions(+), 35 deletions(-) create mode 100644 tests/config/bug_1321.cfg create mode 100644 tests/input/cpp/bug_1321.cpp create mode 100644 tests/output/cpp/30275-bug_1321.cpp diff --git a/src/combine.cpp b/src/combine.cpp index e0be5609a7..31d6ac8d2d 100644 --- a/src/combine.cpp +++ b/src/combine.cpp @@ -3895,11 +3895,8 @@ static void mark_function(chunk_t *pc) } } -#ifdef DEBUG - LOG_FMT(LFCN, "\n(%d) ", __LINE__); -#endif - LOG_FMT(LFCN, "%s: orig_line=%zu] %s[%s] - parent=%s level=%zu/%zu, next=%s[%s] - level=%zu\n", - __func__, pc->orig_line, pc->text(), + LOG_FMT(LFCN, "%s(%d): orig_line=%zu] %s[%s] - parent=%s level=%zu/%zu, next=%s[%s] - level=%zu\n", + __func__, __LINE__, pc->orig_line, pc->text(), get_token_name(pc->type), get_token_name(pc->parent_type), pc->level, pc->brace_level, next->text(), get_token_name(next->type), next->level); @@ -4046,17 +4043,14 @@ static void mark_function(chunk_t *pc) // Assume it is a function call if not already labeled if (pc->type == CT_FUNCTION) { -#ifdef DEBUG - LOG_FMT(LFCN, "(%d) ", __LINE__); -#endif - LOG_FMT(LFCN, "%s: examine [%zu.%zu] [%s], type %s\n", - __func__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type)); + LOG_FMT(LFCN, "%s(%d): examine [%zu.%zu] [%s], type %s\n", + __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type)); // look for an assigment. Issue 575 chunk_t *temp = chunk_get_next_type(pc, CT_ASSIGN, pc->level); if (temp != nullptr) { - LOG_FMT(LFCN, "%s: assigment found [%zu.%zu] [%s]\n", - __func__, temp->orig_line, temp->orig_col, temp->text()); + LOG_FMT(LFCN, "%s(%d): assigment found [%zu.%zu] [%s]\n", + __func__, __LINE__, temp->orig_line, temp->orig_col, temp->text()); set_chunk_type(pc, CT_FUNC_CALL); } else @@ -4099,10 +4093,8 @@ static void mark_function(chunk_t *pc) if (pc->str.equals(prev->str)) { set_chunk_type(pc, CT_FUNC_CLASS_DEF); -#ifdef DEBUG - LOG_FMT(LFCN, "(%d) ", __LINE__); -#endif - LOG_FMT(LFCN, "(%d) %zu:%zu - FOUND %sSTRUCTOR for %s[%s]\n", __LINE__, + LOG_FMT(LFCN, "%s(%d) %zu:%zu - FOUND %sSTRUCTOR for %s[%s]\n", + __func__, __LINE__, prev->orig_line, prev->orig_col, (destr != NULL) ? "DE" : "CON", prev->text(), get_token_name(prev->type)); @@ -4129,7 +4121,7 @@ static void mark_function(chunk_t *pc) bool isa_def = false; bool hit_star = false; #ifdef DEBUG - LOG_FMT(LFCN, "(%d) ", __LINE__); + LOG_FMT(LFCN, "%s(%d):", __func__, __LINE__); #endif LOG_FMT(LFCN, " Checking func call: prev=%s", (prev == NULL) ? "" : get_token_name(prev->type)); #ifdef DEBUG @@ -4179,7 +4171,7 @@ static void mark_function(chunk_t *pc) if (prev->type == CT_PAREN_CLOSE && prev->parent_type == CT_D_CAST) { #ifdef DEBUG - LOG_FMT(LFCN, "(%d) ", __LINE__); + LOG_FMT(LFCN, "%s(%d):", __func__, __LINE__); #endif LOG_FMT(LFCN, " --> For sure a prototype or definition\n"); isa_def = true; @@ -4196,7 +4188,7 @@ static void mark_function(chunk_t *pc) && prev->type != CT_THIS)) { #ifdef DEBUG - LOG_FMT(LFCN, "(%d) ", __LINE__); + LOG_FMT(LFCN, "%s(%d):", __func__, __LINE__); #endif LOG_FMT(LFCN, " --? Skipped MEMBER and landed on %s\n", (prev == NULL) ? "" : get_token_name(prev->type)); @@ -4215,14 +4207,14 @@ static void mark_function(chunk_t *pc) if (!hit_star) { #ifdef DEBUG - LOG_FMT(LFCN, "\n(%d) ", __LINE__); + LOG_FMT(LFCN, "\n%s(%d) ", __func__, __LINE__); #endif LOG_FMT(LFCN, " --> For sure a prototype or definition\n"); isa_def = true; break; } #ifdef DEBUG - LOG_FMT(LFCN, "(%d) ", __LINE__); + LOG_FMT(LFCN, "%s(%d) ", __func__, __LINE__); #endif LOG_FMT(LFCN, " --> maybe a proto/def\n"); isa_def = true; @@ -4242,7 +4234,7 @@ static void mark_function(chunk_t *pc) && !chunk_is_ptr_operator(prev)) { #ifdef DEBUG - LOG_FMT(LFCN, "\n(%d) ", __LINE__); + LOG_FMT(LFCN, "\n%s(%d) ", __func__, __LINE__); #endif LOG_FMT(LFCN, " --> Stopping on %s [%s]\n", prev->text(), get_token_name(prev->type)); @@ -4281,7 +4273,7 @@ static void mark_function(chunk_t *pc) || prev->type == CT_RETURN)) { #ifdef DEBUG - LOG_FMT(LFCN, "(%d) ", __LINE__); + LOG_FMT(LFCN, "%s(%d):", __func__, __LINE__); #endif LOG_FMT(LFCN, " -- overriding DEF due to %s [%s]\n", prev->text(), get_token_name(prev->type)); @@ -4291,9 +4283,9 @@ static void mark_function(chunk_t *pc) { set_chunk_type(pc, CT_FUNC_DEF); #ifdef DEBUG - LOG_FMT(LFCN, "(%d) ", __LINE__); + LOG_FMT(LFCN, "%s(%d):", __func__, __LINE__); #endif - LOG_FMT(LFCN, "%s: '%s' is FCN_DEF:", __func__, pc->text()); + LOG_FMT(LFCN, " '%s' is FCN_DEF:", pc->text()); if (prev == nullptr) { prev = chunk_get_head(); @@ -4312,7 +4304,7 @@ static void mark_function(chunk_t *pc) if (pc->type != CT_FUNC_DEF) { #ifdef DEBUG - LOG_FMT(LFCN, "(%d) ", __LINE__); + LOG_FMT(LFCN, "%s(%d) ", __func__, __LINE__); #endif LOG_FMT(LFCN, " Detected %s '%s' on line %zu col %zu\n", get_token_name(pc->type), @@ -4362,7 +4354,7 @@ static void mark_function(chunk_t *pc) semi = tmp; set_chunk_type(pc, CT_FUNC_PROTO); #ifdef DEBUG - LOG_FMT(LFCN, "(%d) ", __LINE__); + LOG_FMT(LFCN, "%s(%d) ", __func__, __LINE__); #endif LOG_FMT(LFCN, " 2) Marked [%s] as FUNC_PROTO on line %zu col %zu\n", pc->text(), pc->orig_line, pc->orig_col); @@ -4372,7 +4364,7 @@ static void mark_function(chunk_t *pc) { set_chunk_type(pc, CT_FUNC_CTOR_VAR); #ifdef DEBUG - LOG_FMT(LFCN, "(%d) ", __LINE__); + LOG_FMT(LFCN, "%s(%d) ", __func__, __LINE__); #endif LOG_FMT(LFCN, " 2) Marked [%s] as FUNC_CTOR_VAR on line %zu col %zu\n", pc->text(), pc->orig_line, pc->orig_col); @@ -4395,10 +4387,10 @@ static void mark_function(chunk_t *pc) && pc->parent_type != CT_OPERATOR) { #ifdef DEBUG - LOG_FMT(LFPARAM, "(%d) ", __LINE__); + LOG_FMT(LFPARAM, "%s(%d):", __func__, __LINE__); #endif - LOG_FMT(LFPARAM, "%s :: checking '%s' for constructor variable %s %s\n", - __func__, pc->text(), + LOG_FMT(LFPARAM, " checking '%s' for constructor variable %s %s\n", + pc->text(), get_token_name(paren_open->type), get_token_name(paren_close->type)); @@ -4438,7 +4430,7 @@ static void mark_function(chunk_t *pc) { set_chunk_type(pc, CT_FUNC_CTOR_VAR); #ifdef DEBUG - LOG_FMT(LFCN, "(%d) ", __LINE__); + LOG_FMT(LFCN, "%s(%d) ", __func__, __LINE__); #endif LOG_FMT(LFCN, " 3) Marked [%s] as FUNC_CTOR_VAR on line %zu col %zu\n", pc->text(), pc->orig_line, pc->orig_col); @@ -4463,7 +4455,7 @@ static void mark_function(chunk_t *pc) { set_chunk_type(pc, CT_FUNC_CTOR_VAR); #ifdef DEBUG - LOG_FMT(LFCN, "(%d) ", __LINE__); + LOG_FMT(LFCN, "%s(%d) ", __func__, __LINE__); #endif LOG_FMT(LFCN, " 4) Marked [%s] as FUNC_CTOR_VAR on line %zu col %zu\n", pc->text(), pc->orig_line, pc->orig_col); @@ -4543,8 +4535,8 @@ static void mark_cpp_constructor(chunk_t *pc) is_destr = true; } - LOG_FMT(LFTOR, "(%d) %zu:%zu FOUND %sSTRUCTOR for %s[%s] prev=%s[%s]", - __LINE__, pc->orig_line, pc->orig_col, + LOG_FMT(LFTOR, "%s(%d): %zu:%zu FOUND %sSTRUCTOR for %s[%s] prev=%s[%s]", + __func__, __LINE__, pc->orig_line, pc->orig_col, is_destr ? "DE" : "CON", pc->text(), get_token_name(pc->type), tmp->text(), get_token_name(tmp->type)); diff --git a/src/keywords.cpp b/src/keywords.cpp index 069135953d..effeda3dcb 100644 --- a/src/keywords.cpp +++ b/src/keywords.cpp @@ -219,6 +219,7 @@ static const chunk_tag_t keywords[] = { "native", CT_NATIVE, LANG_PAWN }, // PAWN { "native", CT_QUALIFIER, LANG_JAVA | LANG_ECMA }, { "new", CT_NEW, LANG_CPP | LANG_CS | LANG_D | LANG_JAVA | LANG_PAWN | LANG_VALA | LANG_ECMA }, // PAWN + { "noexcept", CT_NOEXCEPT, LANG_CPP }, { "not", CT_SARITH, LANG_C | LANG_CPP }, { "not_eq", CT_SCOMPARE, LANG_C | LANG_CPP }, { "null", CT_TYPE, LANG_CS | LANG_D | LANG_JAVA | LANG_VALA }, diff --git a/src/token_enum.h b/src/token_enum.h index 1beaba4f8e..b5722580d3 100644 --- a/src/token_enum.h +++ b/src/token_enum.h @@ -151,6 +151,7 @@ enum c_token_t CT_PRIVATE, CT_PRIVATE_COLON, CT_THROW, + CT_NOEXCEPT, CT_TRY, CT_USING, CT_USING_STMT, // using (xxx) ... diff --git a/tests/config/bug_1321.cfg b/tests/config/bug_1321.cfg new file mode 100644 index 0000000000..8762ffd120 --- /dev/null +++ b/tests/config/bug_1321.cfg @@ -0,0 +1,3 @@ +indent_columns = 2 +nl_func_leave_one_liners = true +nl_fdef_brace = force diff --git a/tests/cpp.test b/tests/cpp.test index 71f56ec4f2..2833db4634 100644 --- a/tests/cpp.test +++ b/tests/cpp.test @@ -139,6 +139,7 @@ 30272 sp_throw_paren-f.cfg cpp/sp_throw_paren.cpp 30273 sp_cparen_oparen-f.cfg cpp/sp_cparen_oparen.cpp 30274 sp_cparen_oparen-r.cfg cpp/sp_cparen_oparen.cpp +30275 bug_1321.cfg cpp/bug_1321.cpp 30280 sf557.cfg cpp/sf557.cpp diff --git a/tests/input/cpp/bug_1321.cpp b/tests/input/cpp/bug_1321.cpp new file mode 100644 index 0000000000..c381f91ce2 --- /dev/null +++ b/tests/input/cpp/bug_1321.cpp @@ -0,0 +1,6 @@ +#include + +template +inline decltype(auto) Invoke(Fun&& f, Args&&... args) + noexcept(noexcept(std::forward(f)(std::forward(args) ...))) +{ return std::forward(f)(std::forward(args) ...); } diff --git a/tests/output/cpp/30275-bug_1321.cpp b/tests/output/cpp/30275-bug_1321.cpp new file mode 100644 index 0000000000..7dbf43da1c --- /dev/null +++ b/tests/output/cpp/30275-bug_1321.cpp @@ -0,0 +1,6 @@ +#include + +template +inline decltype(auto)Invoke(Fun&& f, Args&&... args) +noexcept (noexcept (std::forward(f)(std::forward(args) ...))) +{ return std::forward(f)(std::forward(args) ...); } From 89fc2b2ce8662d824939cda02e5659a378a2e309 Mon Sep 17 00:00:00 2001 From: Ben Mayo Date: Fri, 29 Sep 2017 16:37:03 -0500 Subject: [PATCH 003/136] Add options for empty function calls This adds two options: *nl_func_call_empty - same as nl_func_decl_empty but for function calls *nl_func_call_paren_empty - same as nl_func_def_paren_empty but for function calls Change-Id: Ib49ca03b18043368ceeb96e2c6f4fcfed3928ccb --- scripts/More_Options_to_Test/help.txt | 2 +- scripts/More_Options_to_Test/show_config.txt | 6 + scripts/Output/mini_d_uc.txt | 2 + scripts/Output/mini_d_ucwd.txt | 6 + scripts/Output/mini_nd_uc.txt | 2 + scripts/Output/mini_nd_ucwd.txt | 6 + src/newlines.cpp | 216 ++++++++++-------- src/options.cpp | 4 + src/options.h | 2 + tests/config/nl_func_call_empty.cfg | 1 + tests/config/nl_func_call_paren_empty.cfg | 1 + tests/cpp.test | 2 + tests/input/cpp/nl_func_call_empty.cpp | 3 + tests/input/cpp/nl_func_call_paren_empty.cpp | 3 + tests/output/cpp/30043-nl_func_call_empty.cpp | 2 + .../cpp/30044-nl_func_call_paren_empty.cpp | 2 + 16 files changed, 169 insertions(+), 91 deletions(-) create mode 100644 tests/config/nl_func_call_empty.cfg create mode 100644 tests/config/nl_func_call_paren_empty.cfg create mode 100644 tests/input/cpp/nl_func_call_empty.cpp create mode 100644 tests/input/cpp/nl_func_call_paren_empty.cpp create mode 100644 tests/output/cpp/30043-nl_func_call_empty.cpp create mode 100644 tests/output/cpp/30044-nl_func_call_paren_empty.cpp diff --git a/scripts/More_Options_to_Test/help.txt b/scripts/More_Options_to_Test/help.txt index a19b1b2646..21acc386e9 100644 --- a/scripts/More_Options_to_Test/help.txt +++ b/scripts/More_Options_to_Test/help.txt @@ -70,6 +70,6 @@ Note: Use comments containing ' *INDENT-OFF*' and ' *INDENT-ON*' to disable processing of parts of the source file (these can be overridden with enable_processing_cmt and disable_processing_cmt). -There are currently 604 options and minimal documentation. +There are currently 606 options and minimal documentation. Try UniversalIndentGUI and good luck. diff --git a/scripts/More_Options_to_Test/show_config.txt b/scripts/More_Options_to_Test/show_config.txt index da656f0c27..c13acdc117 100644 --- a/scripts/More_Options_to_Test/show_config.txt +++ b/scripts/More_Options_to_Test/show_config.txt @@ -1173,6 +1173,9 @@ nl_func_def_paren_empty { Ignore, Add, Remove, Force } nl_func_call_paren { Ignore, Add, Remove, Force } Add or remove newline between a function name and the opening '(' in the call +nl_func_call_paren_empty { Ignore, Add, Remove, Force } + Overrides nl_func_call_paren for functions with no parameters. + nl_func_decl_start { Ignore, Add, Remove, Force } Add or remove newline after '(' in a function declaration. @@ -1227,6 +1230,9 @@ nl_func_decl_empty { Ignore, Add, Remove, Force } nl_func_def_empty { Ignore, Add, Remove, Force } Add or remove newline between '()' in a function definition. +nl_func_call_empty { Ignore, Add, Remove, Force } + Add or remove newline between '()' in a function call. + nl_func_call_start_multi_line { False, True } Whether to add newline after '(' in a function call if '(' and ')' are in different lines. diff --git a/scripts/Output/mini_d_uc.txt b/scripts/Output/mini_d_uc.txt index 1294672f49..ca897a7a41 100644 --- a/scripts/Output/mini_d_uc.txt +++ b/scripts/Output/mini_d_uc.txt @@ -356,6 +356,7 @@ nl_func_paren_empty = ignore nl_func_def_paren = ignore nl_func_def_paren_empty = ignore nl_func_call_paren = ignore +nl_func_call_paren_empty = ignore nl_func_decl_start = ignore nl_func_def_start = ignore nl_func_decl_start_single = ignore @@ -374,6 +375,7 @@ nl_func_decl_end_multi_line = false nl_func_def_end_multi_line = false nl_func_decl_empty = ignore nl_func_def_empty = ignore +nl_func_call_empty = ignore nl_func_call_start_multi_line = false nl_func_call_args_multi_line = false nl_func_call_end_multi_line = false diff --git a/scripts/Output/mini_d_ucwd.txt b/scripts/Output/mini_d_ucwd.txt index 61823c3252..53e8997e70 100644 --- a/scripts/Output/mini_d_ucwd.txt +++ b/scripts/Output/mini_d_ucwd.txt @@ -1175,6 +1175,9 @@ nl_func_def_paren_empty = ignore # ignore/add/remove/force # Add or remove newline between a function name and the opening '(' in the call nl_func_call_paren = ignore # ignore/add/remove/force +# Overrides nl_func_call_paren for functions with no parameters. +nl_func_call_paren_empty = ignore # ignore/add/remove/force + # Add or remove newline after '(' in a function declaration. nl_func_decl_start = ignore # ignore/add/remove/force @@ -1229,6 +1232,9 @@ nl_func_decl_empty = ignore # ignore/add/remove/force # Add or remove newline between '()' in a function definition. nl_func_def_empty = ignore # ignore/add/remove/force +# Add or remove newline between '()' in a function call. +nl_func_call_empty = ignore # ignore/add/remove/force + # Whether to add newline after '(' in a function call if '(' and ')' are in different lines. nl_func_call_start_multi_line = false # false/true diff --git a/scripts/Output/mini_nd_uc.txt b/scripts/Output/mini_nd_uc.txt index aa7c2fcef5..ebbf5fb616 100644 --- a/scripts/Output/mini_nd_uc.txt +++ b/scripts/Output/mini_nd_uc.txt @@ -356,6 +356,7 @@ nl_func_paren_empty = ignore nl_func_def_paren = ignore nl_func_def_paren_empty = ignore nl_func_call_paren = ignore +nl_func_call_paren_empty = ignore nl_func_decl_start = ignore nl_func_def_start = ignore nl_func_decl_start_single = ignore @@ -374,6 +375,7 @@ nl_func_decl_end_multi_line = false nl_func_def_end_multi_line = false nl_func_decl_empty = ignore nl_func_def_empty = ignore +nl_func_call_empty = ignore nl_func_call_start_multi_line = false nl_func_call_args_multi_line = false nl_func_call_end_multi_line = false diff --git a/scripts/Output/mini_nd_ucwd.txt b/scripts/Output/mini_nd_ucwd.txt index 884cb33f85..ead922bb9d 100644 --- a/scripts/Output/mini_nd_ucwd.txt +++ b/scripts/Output/mini_nd_ucwd.txt @@ -1175,6 +1175,9 @@ nl_func_def_paren_empty = ignore # ignore/add/remove/force # Add or remove newline between a function name and the opening '(' in the call nl_func_call_paren = ignore # ignore/add/remove/force +# Overrides nl_func_call_paren for functions with no parameters. +nl_func_call_paren_empty = ignore # ignore/add/remove/force + # Add or remove newline after '(' in a function declaration. nl_func_decl_start = ignore # ignore/add/remove/force @@ -1229,6 +1232,9 @@ nl_func_decl_empty = ignore # ignore/add/remove/force # Add or remove newline between '()' in a function definition. nl_func_def_empty = ignore # ignore/add/remove/force +# Add or remove newline between '()' in a function call. +nl_func_call_empty = ignore # ignore/add/remove/force + # Whether to add newline after '(' in a function call if '(' and ')' are in different lines. nl_func_call_start_multi_line = false # false/true diff --git a/src/newlines.cpp b/src/newlines.cpp index 3dd8114a51..9043f68989 100644 --- a/src/newlines.cpp +++ b/src/newlines.cpp @@ -2141,131 +2141,162 @@ static void newline_func_def(chunk_t *start) __func__, __LINE__, start->orig_line, start->orig_col, start->text(), get_token_name(start->type), get_token_name(start->parent_type)); - chunk_t *prev = nullptr; - bool is_def = (start->parent_type == CT_FUNC_DEF) - || start->parent_type == CT_FUNC_CLASS_DEF; - argval_t atmp = cpd.settings[is_def ? UO_nl_func_def_paren : UO_nl_func_paren].a; - if (atmp != AV_IGNORE) - { - prev = chunk_get_prev_ncnl(start); - if (prev != nullptr) - { - newline_iarf(prev, atmp); - } - } + chunk_t *prev = nullptr; + bool is_def = (start->parent_type == CT_FUNC_DEF) + || start->parent_type == CT_FUNC_CLASS_DEF; + bool is_call = (start->parent_type == CT_FUNC_CALL) + || start->parent_type == CT_FUNC_CALL_USER; - atmp = cpd.settings[UO_nl_func_call_paren].a; - if (atmp != AV_IGNORE) + if (is_call) { - prev = chunk_get_prev_ncnl(start); - if (prev != nullptr) + argval_t atmp = cpd.settings[UO_nl_func_call_paren].a; + if (atmp != AV_IGNORE) { - newline_iarf(prev, atmp); + prev = chunk_get_prev_ncnl(start); + if (prev != nullptr) + { + newline_iarf(prev, atmp); + } } - } - // Handle break newlines type and function - prev = chunk_get_prev_ncnl(start); - prev = skip_template_prev(prev); - // Don't split up a function variable - prev = chunk_is_paren_close(prev) ? nullptr : chunk_get_prev_ncnl(prev); + chunk_t *pc = chunk_get_next_ncnl(start); + if (chunk_is_str(pc, ")", 1)) + { + atmp = cpd.settings[UO_nl_func_call_paren_empty].a; + if (atmp != AV_IGNORE) + { + prev = chunk_get_prev_ncnl(start); + if (prev != nullptr) + { + newline_iarf(prev, atmp); + } + } - if ( prev != nullptr - && prev->type == CT_DC_MEMBER - && (cpd.settings[UO_nl_func_class_scope].a != AV_IGNORE)) - { - newline_iarf(chunk_get_prev_ncnl(prev), cpd.settings[UO_nl_func_class_scope].a); + atmp = cpd.settings[UO_nl_func_call_empty].a; + if (atmp != AV_IGNORE) + { + newline_iarf(start, atmp); + } + return; + } } - - chunk_t *tmp; - if (prev != nullptr && prev->type != CT_PRIVATE_COLON) + else { - if (prev->type == CT_OPERATOR) + argval_t atmp = cpd.settings[is_def ? UO_nl_func_def_paren : UO_nl_func_paren].a; + if (atmp != AV_IGNORE) { - tmp = prev; - prev = chunk_get_prev_ncnl(prev); + prev = chunk_get_prev_ncnl(start); + if (prev != nullptr) + { + newline_iarf(prev, atmp); + } } - else + + // Handle break newlines type and function + prev = chunk_get_prev_ncnl(start); + prev = skip_template_prev(prev); + // Don't split up a function variable + prev = chunk_is_paren_close(prev) ? nullptr : chunk_get_prev_ncnl(prev); + + if ( prev != nullptr + && prev->type == CT_DC_MEMBER + && (cpd.settings[UO_nl_func_class_scope].a != AV_IGNORE)) { - tmp = start; + newline_iarf(chunk_get_prev_ncnl(prev), cpd.settings[UO_nl_func_class_scope].a); } - if (prev != nullptr && prev->type == CT_DC_MEMBER) + + if (prev != nullptr && prev->type != CT_PRIVATE_COLON) { - if (cpd.settings[UO_nl_func_scope_name].a != AV_IGNORE) + chunk_t *tmp; + if (prev->type == CT_OPERATOR) { - newline_iarf(prev, cpd.settings[UO_nl_func_scope_name].a); + tmp = prev; + prev = chunk_get_prev_ncnl(prev); } - } - - if (chunk_get_next_ncnl(prev)->type != CT_FUNC_CLASS_DEF) - { - argval_t a = (tmp->parent_type == CT_FUNC_PROTO) ? - cpd.settings[UO_nl_func_proto_type_name].a : - cpd.settings[UO_nl_func_type_name].a; - if ( (tmp->flags & PCF_IN_CLASS) - && (cpd.settings[UO_nl_func_type_name_class].a != AV_IGNORE)) + else { - a = cpd.settings[UO_nl_func_type_name_class].a; + tmp = start; } - - if (a != AV_IGNORE) + if (prev != nullptr && prev->type == CT_DC_MEMBER) { - LOG_FMT(LNFD, "%s(%d): prev %zu:%zu '%s' [%s/%s]\n", - __func__, __LINE__, prev->orig_line, prev->orig_col, - prev->text(), get_token_name(prev->type), get_token_name(prev->parent_type)); - - if (prev != nullptr && prev->type == CT_DESTRUCTOR) + if (cpd.settings[UO_nl_func_scope_name].a != AV_IGNORE) { - prev = chunk_get_prev_ncnl(prev); + newline_iarf(prev, cpd.settings[UO_nl_func_scope_name].a); } + } - /* - * If we are on a '::', step back two tokens - * TODO: do we also need to check for '.' ? - */ - while (prev != nullptr && prev->type == CT_DC_MEMBER) + if (chunk_get_next_ncnl(prev)->type != CT_FUNC_CLASS_DEF) + { + argval_t a = (tmp->parent_type == CT_FUNC_PROTO) ? + cpd.settings[UO_nl_func_proto_type_name].a : + cpd.settings[UO_nl_func_type_name].a; + if ( (tmp->flags & PCF_IN_CLASS) + && (cpd.settings[UO_nl_func_type_name_class].a != AV_IGNORE)) { - prev = chunk_get_prev_ncnl(prev); - prev = skip_template_prev(prev); - prev = chunk_get_prev_ncnl(prev); + a = cpd.settings[UO_nl_func_type_name_class].a; } - if ( prev != nullptr - && prev->type != CT_BRACE_CLOSE - && prev->type != CT_VBRACE_CLOSE - && prev->type != CT_BRACE_OPEN - && prev->type != CT_SEMICOLON - && prev->type != CT_PRIVATE_COLON) + if (a != AV_IGNORE) { - newline_iarf(prev, a); + LOG_FMT(LNFD, "%s(%d): prev %zu:%zu '%s' [%s/%s]\n", + __func__, __LINE__, prev->orig_line, prev->orig_col, + prev->text(), get_token_name(prev->type), get_token_name(prev->parent_type)); + + if (prev != nullptr && prev->type == CT_DESTRUCTOR) + { + prev = chunk_get_prev_ncnl(prev); + } + + /* + * If we are on a '::', step back two tokens + * TODO: do we also need to check for '.' ? + */ + while (prev != nullptr && prev->type == CT_DC_MEMBER) + { + prev = chunk_get_prev_ncnl(prev); + prev = skip_template_prev(prev); + prev = chunk_get_prev_ncnl(prev); + } + + if ( prev != nullptr + && prev->type != CT_BRACE_CLOSE + && prev->type != CT_VBRACE_CLOSE + && prev->type != CT_BRACE_OPEN + && prev->type != CT_SEMICOLON + && prev->type != CT_PRIVATE_COLON) + { + newline_iarf(prev, a); + } } } } - } - chunk_t *pc = chunk_get_next_ncnl(start); - if (chunk_is_str(pc, ")", 1)) - { - atmp = cpd.settings[is_def ? UO_nl_func_def_empty : UO_nl_func_decl_empty].a; - if (atmp != AV_IGNORE) + chunk_t *pc = chunk_get_next_ncnl(start); + if (chunk_is_str(pc, ")", 1)) { - newline_iarf(start, atmp); - } + atmp = cpd.settings[is_def ? UO_nl_func_def_empty : UO_nl_func_decl_empty].a; + if (atmp != AV_IGNORE) + { + newline_iarf(start, atmp); + } - atmp = cpd.settings[is_def ? UO_nl_func_def_paren_empty : UO_nl_func_paren_empty].a; - if (atmp != AV_IGNORE) - { - prev = chunk_get_prev_ncnl(start); - if (prev != NULL) + atmp = cpd.settings[is_def ? UO_nl_func_def_paren_empty : UO_nl_func_paren_empty].a; + if (atmp != AV_IGNORE) { - newline_iarf(prev, atmp); + prev = chunk_get_prev_ncnl(start); + if (prev != NULL) + { + newline_iarf(prev, atmp); + } } + return; } - return; } // Now scan for commas - size_t comma_count = 0; + size_t comma_count = 0; + chunk_t *tmp; + chunk_t *pc; for (pc = chunk_get_next_ncnl(start); pc != nullptr && pc->level > start->level; pc = chunk_get_next_ncnl(pc)) @@ -2289,6 +2320,7 @@ static void newline_func_def(chunk_t *start) argval_t ae = cpd.settings[is_def ? UO_nl_func_def_end : UO_nl_func_decl_end].a; if (comma_count == 0) { + argval_t atmp; atmp = cpd.settings[is_def ? UO_nl_func_def_start_single : UO_nl_func_decl_start_single].a; if (atmp != AV_IGNORE) @@ -3201,9 +3233,13 @@ void newlines_cleanup_braces(bool first) && ( (cpd.settings[UO_nl_func_call_start_multi_line].b) || (cpd.settings[UO_nl_func_call_args_multi_line].b) || (cpd.settings[UO_nl_func_call_end_multi_line].b) - || (cpd.settings[UO_nl_func_call_paren].a != AV_IGNORE))) + || (cpd.settings[UO_nl_func_call_paren].a != AV_IGNORE) + || (cpd.settings[UO_nl_func_call_paren_empty].a != AV_IGNORE) + || (cpd.settings[UO_nl_func_call_empty].a != AV_IGNORE))) { - if (cpd.settings[UO_nl_func_call_paren].a != AV_IGNORE) + if ( cpd.settings[UO_nl_func_call_paren].a != AV_IGNORE + || cpd.settings[UO_nl_func_call_paren_empty].a != AV_IGNORE + || cpd.settings[UO_nl_func_call_empty].a != AV_IGNORE) { newline_func_def(pc); } diff --git a/src/options.cpp b/src/options.cpp index 8d939b46f1..58721abf91 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -1099,6 +1099,8 @@ void register_options(void) "Overrides nl_func_def_paren for functions with no parameters."); unc_add_option("nl_func_call_paren", UO_nl_func_call_paren, AT_IARF, "Add or remove newline between a function name and the opening '(' in the call"); + unc_add_option("nl_func_call_paren_empty", UO_nl_func_call_paren_empty, AT_IARF, + "Overrides nl_func_call_paren for functions with no parameters."); unc_add_option("nl_func_decl_start", UO_nl_func_decl_start, AT_IARF, "Add or remove newline after '(' in a function declaration."); unc_add_option("nl_func_def_start", UO_nl_func_def_start, AT_IARF, @@ -1135,6 +1137,8 @@ void register_options(void) "Add or remove newline between '()' in a function declaration."); unc_add_option("nl_func_def_empty", UO_nl_func_def_empty, AT_IARF, "Add or remove newline between '()' in a function definition."); + unc_add_option("nl_func_call_empty", UO_nl_func_call_empty, AT_IARF, + "Add or remove newline between '()' in a function call."); unc_add_option("nl_func_call_start_multi_line", UO_nl_func_call_start_multi_line, AT_BOOL, "Whether to add newline after '(' in a function call if '(' and ')' are in different lines."); unc_add_option("nl_func_call_args_multi_line", UO_nl_func_call_args_multi_line, AT_BOOL, diff --git a/src/options.h b/src/options.h index ecdf3a64f9..0799f1b6e1 100644 --- a/src/options.h +++ b/src/options.h @@ -522,6 +522,7 @@ enum uncrustify_options UO_nl_func_def_paren_empty, // Overrides nl_func_def_paren for functions with no parameters UO_nl_func_call_paren, // Add or remove newline between a function name and // the opening '(' in the call + UO_nl_func_call_paren_empty, // Overrides nl_func_call_paren for functions with no parameters UO_nl_func_decl_start, // newline after the '(' in a function decl UO_nl_func_def_start, // newline after the '(' in a function def UO_nl_func_decl_start_single, // Overrides nl_func_decl_start when there is only one parameter @@ -546,6 +547,7 @@ enum uncrustify_options // are on different lines UO_nl_func_decl_empty, // as above, but for empty parens '()' UO_nl_func_def_empty, // as above, but for empty parens '()' + UO_nl_func_call_empty, // as above, but for empty parens '()' UO_nl_func_call_start_multi_line, // newline after the '(' in a function call if '(' and ')' // are on different lines UO_nl_func_call_args_multi_line, // newline after each ',' in a function call if '(' and ')' diff --git a/tests/config/nl_func_call_empty.cfg b/tests/config/nl_func_call_empty.cfg new file mode 100644 index 0000000000..6609b3ddcd --- /dev/null +++ b/tests/config/nl_func_call_empty.cfg @@ -0,0 +1 @@ +nl_func_call_empty = remove \ No newline at end of file diff --git a/tests/config/nl_func_call_paren_empty.cfg b/tests/config/nl_func_call_paren_empty.cfg new file mode 100644 index 0000000000..89c83415d6 --- /dev/null +++ b/tests/config/nl_func_call_paren_empty.cfg @@ -0,0 +1 @@ +nl_func_call_paren_empty = remove \ No newline at end of file diff --git a/tests/cpp.test b/tests/cpp.test index 71f56ec4f2..6a843dfe25 100644 --- a/tests/cpp.test +++ b/tests/cpp.test @@ -44,6 +44,8 @@ 30040 nl_class-r.cfg cpp/nl-class.h 30041 nl_class-a.cfg cpp/nl-class.h +30043 nl_func_call_empty.cfg cpp/nl_func_call_empty.cpp +30044 nl_func_call_paren_empty.cfg cpp/nl_func_call_paren_empty.cpp 30045 nl_func_decl_1.cfg cpp/nl_func_decl.cpp 30046 nl_func_decl_2.cfg cpp/nl_func_decl.cpp 30047 nl_func_paren_empty.cfg cpp/nl_func_paren_empty.cpp diff --git a/tests/input/cpp/nl_func_call_empty.cpp b/tests/input/cpp/nl_func_call_empty.cpp new file mode 100644 index 0000000000..6678ee180b --- /dev/null +++ b/tests/input/cpp/nl_func_call_empty.cpp @@ -0,0 +1,3 @@ +SomeFunction +( +); \ No newline at end of file diff --git a/tests/input/cpp/nl_func_call_paren_empty.cpp b/tests/input/cpp/nl_func_call_paren_empty.cpp new file mode 100644 index 0000000000..6678ee180b --- /dev/null +++ b/tests/input/cpp/nl_func_call_paren_empty.cpp @@ -0,0 +1,3 @@ +SomeFunction +( +); \ No newline at end of file diff --git a/tests/output/cpp/30043-nl_func_call_empty.cpp b/tests/output/cpp/30043-nl_func_call_empty.cpp new file mode 100644 index 0000000000..fbf89d162d --- /dev/null +++ b/tests/output/cpp/30043-nl_func_call_empty.cpp @@ -0,0 +1,2 @@ +SomeFunction + (); \ No newline at end of file diff --git a/tests/output/cpp/30044-nl_func_call_paren_empty.cpp b/tests/output/cpp/30044-nl_func_call_paren_empty.cpp new file mode 100644 index 0000000000..4495d667f4 --- /dev/null +++ b/tests/output/cpp/30044-nl_func_call_paren_empty.cpp @@ -0,0 +1,2 @@ +SomeFunction( + ); \ No newline at end of file From a1e3be54ffd1a295de91b10a489709b357af042d Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Sun, 1 Oct 2017 18:38:01 +0200 Subject: [PATCH 004/136] CT_IGNORED comment may not be changed --- src/output.cpp | 2 ++ src/tokenize.cpp | 24 ++++++++++++++---------- tests/config/bug_1338.cfg | 2 ++ tests/cpp.test | 1 + tests/input/cpp/bug_1338.cpp | 3 +++ tests/output/cpp/30210-bug_1338.cpp | 3 +++ 6 files changed, 25 insertions(+), 10 deletions(-) create mode 100644 tests/config/bug_1338.cfg create mode 100644 tests/input/cpp/bug_1338.cpp create mode 100644 tests/output/cpp/30210-bug_1338.cpp diff --git a/src/output.cpp b/src/output.cpp index 65576a8ca1..3caf38fcf5 100644 --- a/src/output.cpp +++ b/src/output.cpp @@ -582,6 +582,8 @@ void output_text(FILE *pfile) } else if (pc->type == CT_JUNK || pc->type == CT_IGNORED) { + LOG_FMT(LOUTIND, "%s(%d): orig_line is %zu, orig_col is %zu,\npc->text() >%s<, pc->str.size() is %zu\n", + __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), pc->str.size()); // do not adjust the column for junk add_text(pc->str, true); } diff --git a/src/tokenize.cpp b/src/tokenize.cpp index 39abddc0b1..47e789e2a1 100644 --- a/src/tokenize.cpp +++ b/src/tokenize.cpp @@ -1974,18 +1974,22 @@ void tokenize(const deque &data, chunk_t *ref) last_was_tab = false; } - // Strip trailing whitespace (for CPP comments and PP blocks) - while ( (chunk.str.size() > 0) - && ( (chunk.str[chunk.str.size() - 1] == ' ') - || (chunk.str[chunk.str.size() - 1] == '\t'))) - { - // If comment contains backslash '\' followed by whitespace chars, keep last one; - // this will prevent it from turning '\' into line continuation. - if ((chunk.str.size() > 1) && (chunk.str[chunk.str.size() - 2] == '\\')) + if (chunk.type != CT_IGNORED) + { + // Issue #1338 + // Strip trailing whitespace (for CPP comments and PP blocks) + while ( (chunk.str.size() > 0) + && ( (chunk.str[chunk.str.size() - 1] == ' ') + || (chunk.str[chunk.str.size() - 1] == '\t'))) { - break; + // If comment contains backslash '\' followed by whitespace chars, keep last one; + // this will prevent it from turning '\' into line continuation. + if ((chunk.str.size() > 1) && (chunk.str[chunk.str.size() - 2] == '\\')) + { + break; + } + chunk.str.pop_back(); } - chunk.str.pop_back(); } // Store off the end column diff --git a/tests/config/bug_1338.cfg b/tests/config/bug_1338.cfg new file mode 100644 index 0000000000..8d2ab2a0c8 --- /dev/null +++ b/tests/config/bug_1338.cfg @@ -0,0 +1,2 @@ + +nl_max=2 diff --git a/tests/cpp.test b/tests/cpp.test index 2833db4634..8e4379c4c6 100644 --- a/tests/cpp.test +++ b/tests/cpp.test @@ -109,6 +109,7 @@ 30207 cmt_indent_pp.cfg cpp/cmt_indent_pp.h 30208 bug_1108.cfg cpp/bug_1108.cpp 30209 empty.cfg cpp/bug_1134.cpp +30210 bug_1338.cfg cpp/bug_1338.cpp 30240 align_func_params.cfg cpp/align_func_params.cpp 30241 align_func_params_span.cfg cpp/align_func_params.cpp diff --git a/tests/input/cpp/bug_1338.cpp b/tests/input/cpp/bug_1338.cpp new file mode 100644 index 0000000000..7cceffecea --- /dev/null +++ b/tests/input/cpp/bug_1338.cpp @@ -0,0 +1,3 @@ +/* *INDENT-OFF* */ +printf("Hello World!\n"); +/* *INDENT-ON* */ diff --git a/tests/output/cpp/30210-bug_1338.cpp b/tests/output/cpp/30210-bug_1338.cpp new file mode 100644 index 0000000000..7cceffecea --- /dev/null +++ b/tests/output/cpp/30210-bug_1338.cpp @@ -0,0 +1,3 @@ +/* *INDENT-OFF* */ +printf("Hello World!\n"); +/* *INDENT-ON* */ From bd87b741fe29bd08643ce929cec6e2002e2bfa9f Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Mon, 2 Oct 2017 18:33:33 +0200 Subject: [PATCH 005/136] Take care of multiple newlines. --- src/newlines.cpp | 41 ++++++++++++++++------------- src/output.cpp | 4 +-- tests/input/cpp/bug_1338.cpp | 3 +++ tests/output/cpp/30210-bug_1338.cpp | 3 +++ 4 files changed, 30 insertions(+), 21 deletions(-) diff --git a/src/newlines.cpp b/src/newlines.cpp index 3dd8114a51..9dab8307ea 100644 --- a/src/newlines.cpp +++ b/src/newlines.cpp @@ -3963,6 +3963,16 @@ void do_blank_lines(void) for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc)) { + if (pc->type == CT_NEWLINE) + { + LOG_FMT(LBLANKD, "%s(%d): orig_line is %zu, orig_col is %zu, NEWLINE, nl is %zu\n", + __func__, __LINE__, pc->orig_line, pc->orig_col, pc->nl_count); + } + else + { + LOG_FMT(LBLANKD, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', type is %s\n", + __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type)); + } bool line_added = false; if (pc->type != CT_NEWLINE) @@ -3970,19 +3980,22 @@ void do_blank_lines(void) continue; } - chunk_t *next = chunk_get_next(pc); - chunk_t *prev = chunk_get_prev_nc(pc); - chunk_t *pcmt = chunk_get_prev(pc); - size_t old_nl = pc->nl_count; - if (next != nullptr && prev != nullptr) + chunk_t *prev = chunk_get_prev_nc(pc); + if (prev != nullptr) { - LOG_FMT(LBLANK, "%s(%d): orig_line is %zu, prev->text() '%s', prev->type is %s, vs. next->text() '%s', next->type is %s, nl is %zu\n", + LOG_FMT(LBLANK, "%s(%d): prev->orig_line is %zu, prev->text() '%s', prev->type is %s\n", __func__, __LINE__, pc->orig_line, - prev->text(), get_token_name(prev->type), - next->text(), get_token_name(next->type), - pc->nl_count); + prev->text(), get_token_name(prev->type)); + if (prev->type == CT_IGNORED) + { + continue; + } } + chunk_t *next = chunk_get_next(pc); + chunk_t *pcmt = chunk_get_prev(pc); + size_t old_nl = pc->nl_count; + /* * If this is the first or the last token, pretend that there is an extra * line. It will be removed at the end. @@ -4000,16 +4013,6 @@ void do_blank_lines(void) blank_line_max(pc, UO_nl_max); } - if (pc->type == CT_NEWLINE) - { - LOG_FMT(LBLANKD, "%s(%d): orig_line is %zu, orig_col is %zu, NEWLINE\n", - __func__, __LINE__, pc->orig_line, pc->orig_col); - } - else - { - LOG_FMT(LBLANKD, "%s(%d): text() '%s', orig_line is %zu, orig_col is %zu\n", - __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col); - } if (!can_increase_nl(pc)) { LOG_FMT(LBLANKD, "%s(%d): force to 1 orig_line is %zu, orig_col is %zu\n", diff --git a/src/output.cpp b/src/output.cpp index 3caf38fcf5..5448e25b41 100644 --- a/src/output.cpp +++ b/src/output.cpp @@ -472,8 +472,8 @@ void output_text(FILE *pfile) // loop over the whole chunk list for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc)) { - LOG_FMT(LOUTIND, "%s(%d): text() is %s, type is %s, orig_col is %zu, column is %zu\n", - __func__, __LINE__, pc->text(), get_token_name(pc->type), pc->orig_col, pc->column); + LOG_FMT(LOUTIND, "%s(%d): text() is %s, type is %s, orig_col is %zu, column is %zu, nl is %zu\n", + __func__, __LINE__, pc->text(), get_token_name(pc->type), pc->orig_col, pc->column, pc->nl_count); cpd.output_tab_as_space = ( cpd.settings[UO_cmt_convert_tab_to_spaces].b && chunk_is_comment(pc)); if (pc->type == CT_NEWLINE) diff --git a/tests/input/cpp/bug_1338.cpp b/tests/input/cpp/bug_1338.cpp index 7cceffecea..04b4cd8abb 100644 --- a/tests/input/cpp/bug_1338.cpp +++ b/tests/input/cpp/bug_1338.cpp @@ -1,3 +1,6 @@ /* *INDENT-OFF* */ printf("Hello World!\n"); + + +//test /* *INDENT-ON* */ diff --git a/tests/output/cpp/30210-bug_1338.cpp b/tests/output/cpp/30210-bug_1338.cpp index 7cceffecea..04b4cd8abb 100644 --- a/tests/output/cpp/30210-bug_1338.cpp +++ b/tests/output/cpp/30210-bug_1338.cpp @@ -1,3 +1,6 @@ /* *INDENT-OFF* */ printf("Hello World!\n"); + + +//test /* *INDENT-ON* */ From 4036bf67f81d293b1256a1ff4fbaf32956634e42 Mon Sep 17 00:00:00 2001 From: Dmitry Povolotsky Date: Tue, 3 Oct 2017 22:10:38 +0200 Subject: [PATCH 006/136] Fixed #1366 - Wrong indentation of the break in switch --- src/indent.cpp | 15 +++++++++++---- tests/input/oc/bug_1366.m | 14 ++++++++++++++ tests/objective-c.test | 1 + tests/output/oc/50606-bug_1366.m | 14 ++++++++++++++ 4 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 tests/input/oc/bug_1366.m create mode 100644 tests/output/oc/50606-bug_1366.m diff --git a/src/indent.cpp b/src/indent.cpp index 2e8b868ab3..8722143a85 100644 --- a/src/indent.cpp +++ b/src/indent.cpp @@ -1547,10 +1547,17 @@ void indent_text(void) && prev->type == CT_BRACE_CLOSE && prev->parent_type == CT_CASE) { - // issue #663 - chunk_t *temp = chunk_get_prev_type(pc, CT_BRACE_OPEN, pc->level); - // This only affects the 'break', so no need for a stack entry - indent_column_set(temp->column); + // issue #663 + issue #1366 + chunk_t *prev_newline = chunk_get_prev_nl(pc); + if (prev_newline != nullptr) + { + chunk_t *prev_prev_newline = chunk_get_prev_nl(prev_newline); + if (prev_prev_newline != nullptr) + { + // This only affects the 'break', so no need for a stack entry + indent_column_set(prev_prev_newline->next->column); + } + } } } else if (pc->type == CT_LABEL) diff --git a/tests/input/oc/bug_1366.m b/tests/input/oc/bug_1366.m new file mode 100644 index 0000000000..5e81ed4a1c --- /dev/null +++ b/tests/input/oc/bug_1366.m @@ -0,0 +1,14 @@ +@implementation UCTestClass + +- (void) test{ + + switch (test) { + case "longlonglonglong":{ + i = 1; + } + break; + } +} + +@end + diff --git a/tests/objective-c.test b/tests/objective-c.test index 1fd31fd95e..f19f7e303b 100644 --- a/tests/objective-c.test +++ b/tests/objective-c.test @@ -92,6 +92,7 @@ 50603 obj-c.cfg oc/gh511.m 50604 objc_bug_497.cfg oc/bug_497.m 50605 empty.cfg oc/bug_404.m +50606 obj-c.cfg oc/bug_1366.m 50700 cmt_insert-0.cfg oc/cmt_insert.m diff --git a/tests/output/oc/50606-bug_1366.m b/tests/output/oc/50606-bug_1366.m new file mode 100644 index 0000000000..f4058b1f76 --- /dev/null +++ b/tests/output/oc/50606-bug_1366.m @@ -0,0 +1,14 @@ +@implementation UCTestClass + +-(void) test +{ + switch (test) + { + case "longlonglonglong": { + i = 1; + } + break; + } +} + +@end From 5e22dcb594e004be1c9bb6473e366dd4dc0b3d2f Mon Sep 17 00:00:00 2001 From: Ben Mayo Date: Fri, 29 Sep 2017 16:59:18 -0500 Subject: [PATCH 007/136] Rename the function name nl_func_def to show it deals with calls Renaming nl_func_def to nl_func_def_or_call because it now deals with newlines in function calls. Change-Id: Ifd601f7b483edb2b3443ce421298c17b0064596e --- src/newlines.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/newlines.cpp b/src/newlines.cpp index 9043f68989..119b50b308 100644 --- a/src/newlines.cpp +++ b/src/newlines.cpp @@ -110,7 +110,7 @@ static void newline_func_multi_line(chunk_t *start); * Formats a function declaration * Start points to the open paren */ -static void newline_func_def(chunk_t *start); +static void newline_func_def_or_call(chunk_t *start); /** @@ -2133,7 +2133,7 @@ static void newline_func_multi_line(chunk_t *start) } // newline_func_multi_line -static void newline_func_def(chunk_t *start) +static void newline_func_def_or_call(chunk_t *start) { LOG_FUNC_ENTRY(); @@ -2347,7 +2347,7 @@ static void newline_func_def(chunk_t *start) newline_func_multi_line(start); } -} // newline_func_def +} // newline_func_def_or_call static void newline_oc_msg(chunk_t *start) @@ -3226,7 +3226,7 @@ void newlines_cleanup_braces(bool first) || cpd.settings[UO_nl_func_def_paren_empty].a != AV_IGNORE || cpd.settings[UO_nl_func_paren_empty].a != AV_IGNORE)) { - newline_func_def(pc); + newline_func_def_or_call(pc); } else if ( ( pc->parent_type == CT_FUNC_CALL || pc->parent_type == CT_FUNC_CALL_USER) @@ -3241,7 +3241,7 @@ void newlines_cleanup_braces(bool first) || cpd.settings[UO_nl_func_call_paren_empty].a != AV_IGNORE || cpd.settings[UO_nl_func_call_empty].a != AV_IGNORE) { - newline_func_def(pc); + newline_func_def_or_call(pc); } newline_func_multi_line(pc); } From ab18e7fccdaceffc1c98f40fb263fc9bfd7ed9de Mon Sep 17 00:00:00 2001 From: Viktor Kireev Date: Thu, 5 Oct 2017 18:28:38 +0300 Subject: [PATCH 008/136] Fix 'Permission denied' during output path creation Creating intermediate directories for the output file can sometimes lead to 'Unable to create d:: Permission denied (13)' error in Windows. This happens when Uncrustify try to create a Windows drive letter. This does not affect the creation of the path, but prints annoying messages. This patch fixes this issue. --- src/uncrustify.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/uncrustify.cpp b/src/uncrustify.cpp index b8413157c0..150483e353 100644 --- a/src/uncrustify.cpp +++ b/src/uncrustify.cpp @@ -923,8 +923,10 @@ static void make_folders(const string &filename) outname[idx] = 0; // mark the end of the subpath // create subfolder if it is not the start symbol of a path + // and not a Windows drive letter if ( (strcmp(&outname[last_idx], ".") != 0) - && (strcmp(&outname[last_idx], "..") != 0)) + && (strcmp(&outname[last_idx], "..") != 0) + && (!(last_idx == 0 && idx == 2 && outname[1] == ':'))) { int status; // Coverity CID 75999 status = mkdir(outname, 0750); From 6ca5a645e99a4e335aeb133007ff9a3886817ffe Mon Sep 17 00:00:00 2001 From: Viktor Kireev Date: Mon, 9 Oct 2017 10:47:48 +0300 Subject: [PATCH 009/136] Fix indent comment alignment rule 3 Also this fixes issue #1287. --- src/indent.cpp | 68 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 52 insertions(+), 16 deletions(-) diff --git a/src/indent.cpp b/src/indent.cpp index 2e8b868ab3..4e7aef229a 100644 --- a/src/indent.cpp +++ b/src/indent.cpp @@ -2622,6 +2622,33 @@ static bool single_line_comment_indent_rule_applies(chunk_t *start) } // single_line_comment_indent_rule_applies +static size_t calc_comment_next_col_diff(chunk_t *pc) +{ + chunk_t *next = pc; + + do + { + chunk_t *next_nl = chunk_get_next(next); + + if (next_nl == NULL || next_nl->nl_count > 1) + { + // FIXME: Max thresh magic number 5000 + return(5000); + } + + next = chunk_get_next(next_nl); + } while (chunk_is_comment(next)); + + if (next != NULL) + { + return(abs(int(next->orig_col - pc->orig_col))); + } + + // FIXME: Max thresh magic number 5000 + return(5000); +} + + static void indent_comment(chunk_t *pc, size_t col) { LOG_FUNC_ENTRY(); @@ -2657,24 +2684,33 @@ static void indent_comment(chunk_t *pc, size_t col) } } - prev = chunk_get_prev(nl); - if (chunk_is_comment(prev) && nl->nl_count == 1) + // TODO: Add an indent_comment_align_thresh option? + const size_t indent_comment_align_thresh = 3; + if (pc->orig_col > 1) { - int coldiff = prev->orig_col - pc->orig_col; + prev = chunk_get_prev(nl); + if (chunk_is_comment(prev) && nl->nl_count == 1) + { + size_t prev_col_diff = abs(int(prev->orig_col - pc->orig_col)); - /* - * Here we want to align comments that are relatively close one to another - * but not when the comment is a Doxygen comment - */ - // Issue #1134 - if ( coldiff <= 3 - && coldiff >= -3 - && !chunk_is_Doxygen_comment(pc)) - { - reindent_line(pc, prev->column); - LOG_FMT(LCMTIND, "rule 3 - prev comment, coldiff = %d, now in %zu\n", - coldiff, pc->column); - return; + /* + * Here we want to align comments that are relatively close one to another + * but not when the comment is a Doxygen comment (Issue #1134) + */ + if ( prev_col_diff <= indent_comment_align_thresh + && !chunk_is_Doxygen_comment(pc)) + { + size_t next_col_diff = calc_comment_next_col_diff(pc); + // Align to the previous comment or to the next token? + if ( prev_col_diff <= next_col_diff + || next_col_diff == 5000) // FIXME: Max thresh magic number 5000 + { + reindent_line(pc, prev->column); + LOG_FMT(LCMTIND, "rule 3 - prev comment, coldiff = %d, now in %zu\n", + prev_col_diff, pc->column); + return; + } + } } } From 52d3c345ea337c7bfdc161463dcae09286747ce9 Mon Sep 17 00:00:00 2001 From: Viktor Kireev Date: Mon, 9 Oct 2017 10:51:34 +0300 Subject: [PATCH 010/136] Add tests for the indent comment alignment rule 3 --- .../config/indent_comment_align_thresh_1.cfg | 5 + .../config/indent_comment_align_thresh_2.cfg | 6 + tests/cpp.test | 2 + .../input/cpp/indent_comment_align_thresh.cpp | 153 ++++++++++++++++++ .../cpp/30211-indent_comment_align_thresh.cpp | 153 ++++++++++++++++++ .../cpp/30212-indent_comment_align_thresh.cpp | 153 ++++++++++++++++++ 6 files changed, 472 insertions(+) create mode 100644 tests/config/indent_comment_align_thresh_1.cfg create mode 100644 tests/config/indent_comment_align_thresh_2.cfg create mode 100644 tests/input/cpp/indent_comment_align_thresh.cpp create mode 100644 tests/output/cpp/30211-indent_comment_align_thresh.cpp create mode 100644 tests/output/cpp/30212-indent_comment_align_thresh.cpp diff --git a/tests/config/indent_comment_align_thresh_1.cfg b/tests/config/indent_comment_align_thresh_1.cfg new file mode 100644 index 0000000000..ef132801d5 --- /dev/null +++ b/tests/config/indent_comment_align_thresh_1.cfg @@ -0,0 +1,5 @@ +input_tab_size = 4 + +indent_with_tabs = 0 +indent_columns = 4 +indent_class = true diff --git a/tests/config/indent_comment_align_thresh_2.cfg b/tests/config/indent_comment_align_thresh_2.cfg new file mode 100644 index 0000000000..b37de685e4 --- /dev/null +++ b/tests/config/indent_comment_align_thresh_2.cfg @@ -0,0 +1,6 @@ +input_tab_size = 4 + +indent_with_tabs = 0 +indent_columns = 4 +indent_class = true +indent_col1_comment = true diff --git a/tests/cpp.test b/tests/cpp.test index 8e4379c4c6..f6be3b481b 100644 --- a/tests/cpp.test +++ b/tests/cpp.test @@ -110,6 +110,8 @@ 30208 bug_1108.cfg cpp/bug_1108.cpp 30209 empty.cfg cpp/bug_1134.cpp 30210 bug_1338.cfg cpp/bug_1338.cpp +30211 indent_comment_align_thresh_1.cfg cpp/indent_comment_align_thresh.cpp +30212 indent_comment_align_thresh_2.cfg cpp/indent_comment_align_thresh.cpp 30240 align_func_params.cfg cpp/align_func_params.cpp 30241 align_func_params_span.cfg cpp/align_func_params.cpp diff --git a/tests/input/cpp/indent_comment_align_thresh.cpp b/tests/input/cpp/indent_comment_align_thresh.cpp new file mode 100644 index 0000000000..7ddfacbfc5 --- /dev/null +++ b/tests/input/cpp/indent_comment_align_thresh.cpp @@ -0,0 +1,153 @@ +// First comment + // Second comment + + // First comment +// Second comment + +// Issue #1134 +class MyClass : public BaseClass +{ + //@{ BaseClass interface +#if VERY_LONG_AND_COMPLICATED_DEFINE + void foo(); +#endif // VERY_LONG_AND_COMPLICATED_DEFINE + //@} +}; + +// Issue #1287 +void foo() +{ +#if defined(SUPPORT_FEATURE) + bar(); +#endif // SUPPORT_FEATURE + // Handle error + if (error != 0) + { + } + +#if defined(SUPPORT_FEATURE) + bar(); +#endif // SUPPORT_FEATURE + // Handle error + // Handle error + if (error != 0) + { + } + +# if defined(SUPPORT_FEATURE) + bar(); +# endif // SUPPORT_FEATURE + // SUPPORT_FEATURE + // Handle error + // Handle error + if (error != 0) + { + } + +# if defined(SUPPORT_FEATURE) + bar(); +# endif // SUPPORT_FEATURE + // SUPPORT_FEATURE + // Handle error + // Handle error + if (error != 0) + { + } + + #if defined(SUPPORT_FEATURE) + bar(); + #endif /* SUPPORT_FEATURE + SUPPORT_FEATURE */ + // Handle error + // Handle error + if (error != 0) + { + } +} + +// ----- Some namespace scope -------------------------------------------------- +// ----- FooNamespace scope ---------------------------------------------------- +namespace FooNamespace +{ +// ----- Some classes scope ---------------------------------------------------- +// ----- FooClass scope -------------------------------------------------------- +class FooClass +{ + using FooUsing = FooTemplate< + param1, + param2 + >; // FooTemplate + // Foo description + void foo() + { + if (a == b) + { +// Col1 comment + // Col1 comment + // Col1 comment + // Baz description + baz(); // Baz trailing comment begin + // Baz trailing comment ... + // Baz trailing comment end + } // if (a == b) + // Bar description begin + // Bar description ... + // Bar description end + bar( + a, + b + ); // bar trailing comment begin + // bar trailing comment ... + // Baz trailing comment end + /*! Baz description begin + *Baz description ... + * Baz description end */ + baz(a, + b); /* Baz trailing comment begin + Baz trailing comment ... + Baz trailing comment end */ + // Bar description + bar(); // bar trailing comment begin + // bar trailing comment ... + // Baz trailing comment end + + // Baz description + baz(); + } + void bar(); + // Many methods + void baz(); +}; // FooClass +// ----- FooClass scope -------------------------------------------------------- + +// Many classes + // Many classes + // Many classes + +class BazClass +{ + void foo(); + +// Many methods + // Many methods + // Many methods + +// Overrides + // Overrides + //Overrides +protected: + // Bar description + void baz(); + //Overrides +}; // BazClass trailing comment begin + // BazClass trailing comment ... + // BazClass trailing comment end +// ----- Some classes scope ---------------------------------------------------- +} // FooNamespace trailing comment begin + // FooNamespace trailing comment end +// ----- FooNamespace scope ---------------------------------------------------- +// BarNamespace description +namespace BarNamespace +{ +} // namespace BarNamespace +// ----- Some namespace scope -------------------------------------------------- diff --git a/tests/output/cpp/30211-indent_comment_align_thresh.cpp b/tests/output/cpp/30211-indent_comment_align_thresh.cpp new file mode 100644 index 0000000000..74b3d7e43e --- /dev/null +++ b/tests/output/cpp/30211-indent_comment_align_thresh.cpp @@ -0,0 +1,153 @@ +// First comment +// Second comment + +// First comment +// Second comment + +// Issue #1134 +class MyClass : public BaseClass +{ + //@{ BaseClass interface +#if VERY_LONG_AND_COMPLICATED_DEFINE + void foo(); +#endif // VERY_LONG_AND_COMPLICATED_DEFINE + //@} +}; + +// Issue #1287 +void foo() +{ +#if defined(SUPPORT_FEATURE) + bar(); +#endif // SUPPORT_FEATURE + // Handle error + if (error != 0) + { + } + +#if defined(SUPPORT_FEATURE) + bar(); +#endif // SUPPORT_FEATURE + // Handle error + // Handle error + if (error != 0) + { + } + +# if defined(SUPPORT_FEATURE) + bar(); +# endif // SUPPORT_FEATURE + // SUPPORT_FEATURE + // Handle error + // Handle error + if (error != 0) + { + } + +# if defined(SUPPORT_FEATURE) + bar(); +# endif // SUPPORT_FEATURE + // SUPPORT_FEATURE + // Handle error + // Handle error + if (error != 0) + { + } + + #if defined(SUPPORT_FEATURE) + bar(); + #endif /* SUPPORT_FEATURE + SUPPORT_FEATURE */ + // Handle error + // Handle error + if (error != 0) + { + } +} + +// ----- Some namespace scope -------------------------------------------------- +// ----- FooNamespace scope ---------------------------------------------------- +namespace FooNamespace +{ +// ----- Some classes scope ---------------------------------------------------- +// ----- FooClass scope -------------------------------------------------------- +class FooClass +{ + using FooUsing = FooTemplate< + param1, + param2 + >; // FooTemplate + // Foo description + void foo() + { + if (a == b) + { +// Col1 comment +// Col1 comment +// Col1 comment + // Baz description + baz(); // Baz trailing comment begin + // Baz trailing comment ... + // Baz trailing comment end + } // if (a == b) + // Bar description begin + // Bar description ... + // Bar description end + bar( + a, + b + ); // bar trailing comment begin + // bar trailing comment ... + // Baz trailing comment end + /*! Baz description begin + * Baz description ... + * Baz description end */ + baz(a, + b); /* Baz trailing comment begin + Baz trailing comment ... + Baz trailing comment end */ + // Bar description + bar(); // bar trailing comment begin + // bar trailing comment ... + // Baz trailing comment end + + // Baz description + baz(); + } + void bar(); + // Many methods + void baz(); +}; // FooClass +// ----- FooClass scope -------------------------------------------------------- + +// Many classes +// Many classes +// Many classes + +class BazClass +{ + void foo(); + +// Many methods +// Many methods +// Many methods + +// Overrides +// Overrides +//Overrides +protected: + // Bar description + void baz(); + //Overrides +}; // BazClass trailing comment begin + // BazClass trailing comment ... + // BazClass trailing comment end +// ----- Some classes scope ---------------------------------------------------- +} // FooNamespace trailing comment begin + // FooNamespace trailing comment end +// ----- FooNamespace scope ---------------------------------------------------- +// BarNamespace description +namespace BarNamespace +{ +} // namespace BarNamespace +// ----- Some namespace scope -------------------------------------------------- diff --git a/tests/output/cpp/30212-indent_comment_align_thresh.cpp b/tests/output/cpp/30212-indent_comment_align_thresh.cpp new file mode 100644 index 0000000000..b2af08eed7 --- /dev/null +++ b/tests/output/cpp/30212-indent_comment_align_thresh.cpp @@ -0,0 +1,153 @@ +// First comment +// Second comment + +// First comment +// Second comment + +// Issue #1134 +class MyClass : public BaseClass +{ + //@{ BaseClass interface +#if VERY_LONG_AND_COMPLICATED_DEFINE + void foo(); +#endif // VERY_LONG_AND_COMPLICATED_DEFINE + //@} +}; + +// Issue #1287 +void foo() +{ +#if defined(SUPPORT_FEATURE) + bar(); +#endif // SUPPORT_FEATURE + // Handle error + if (error != 0) + { + } + +#if defined(SUPPORT_FEATURE) + bar(); +#endif // SUPPORT_FEATURE + // Handle error + // Handle error + if (error != 0) + { + } + +# if defined(SUPPORT_FEATURE) + bar(); +# endif // SUPPORT_FEATURE + // SUPPORT_FEATURE + // Handle error + // Handle error + if (error != 0) + { + } + +# if defined(SUPPORT_FEATURE) + bar(); +# endif // SUPPORT_FEATURE + // SUPPORT_FEATURE + // Handle error + // Handle error + if (error != 0) + { + } + + #if defined(SUPPORT_FEATURE) + bar(); + #endif /* SUPPORT_FEATURE + SUPPORT_FEATURE */ + // Handle error + // Handle error + if (error != 0) + { + } +} + +// ----- Some namespace scope -------------------------------------------------- +// ----- FooNamespace scope ---------------------------------------------------- +namespace FooNamespace +{ +// ----- Some classes scope ---------------------------------------------------- +// ----- FooClass scope -------------------------------------------------------- +class FooClass +{ + using FooUsing = FooTemplate< + param1, + param2 + >; // FooTemplate + // Foo description + void foo() + { + if (a == b) + { + // Col1 comment + // Col1 comment + // Col1 comment + // Baz description + baz(); // Baz trailing comment begin + // Baz trailing comment ... + // Baz trailing comment end + } // if (a == b) + // Bar description begin + // Bar description ... + // Bar description end + bar( + a, + b + ); // bar trailing comment begin + // bar trailing comment ... + // Baz trailing comment end + /*! Baz description begin + * Baz description ... + * Baz description end */ + baz(a, + b); /* Baz trailing comment begin + Baz trailing comment ... + Baz trailing comment end */ + // Bar description + bar(); // bar trailing comment begin + // bar trailing comment ... + // Baz trailing comment end + + // Baz description + baz(); + } + void bar(); + // Many methods + void baz(); +}; // FooClass +// ----- FooClass scope -------------------------------------------------------- + +// Many classes +// Many classes +// Many classes + +class BazClass +{ + void foo(); + + // Many methods + // Many methods + // Many methods + + // Overrides + // Overrides + //Overrides +protected: + // Bar description + void baz(); + //Overrides +}; // BazClass trailing comment begin + // BazClass trailing comment ... + // BazClass trailing comment end +// ----- Some classes scope ---------------------------------------------------- +} // FooNamespace trailing comment begin + // FooNamespace trailing comment end +// ----- FooNamespace scope ---------------------------------------------------- +// BarNamespace description +namespace BarNamespace +{ +} // namespace BarNamespace +// ----- Some namespace scope -------------------------------------------------- From bd444ec6d3f8a18481bba5ba7b82b53247a3dc13 Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Wed, 11 Oct 2017 17:46:16 +0200 Subject: [PATCH 011/136] Prepare better LOG for #1342 --- scripts/Output/28.txt | 88 +++++++-------- scripts/Output/31.txt | 13 --- scripts/Output/36.txt | 24 ++-- scripts/Output/66.txt | 156 +++++++++++++++++++------- scripts/Output/I-842.txt | 2 +- scripts/Output/unmatched_close_pp.txt | 2 +- src/align.cpp | 46 ++++++-- src/align_stack.cpp | 25 +++-- src/brace_cleanup.cpp | 49 ++++---- src/combine.cpp | 139 ++++++++++++----------- src/indent.cpp | 5 +- src/space.cpp | 15 +-- src/tokenize.cpp | 6 +- 13 files changed, 330 insertions(+), 240 deletions(-) diff --git a/scripts/Output/28.txt b/scripts/Output/28.txt index f1d3b2fcca..b0fb9bfe38 100644 --- a/scripts/Output/28.txt +++ b/scripts/Output/28.txt @@ -1,44 +1,44 @@ -parse_cleanup(): orig_line is , type is STRUCT, tos is , type is NONE, TOS.stage is -parse_cleanup(): orig_line is , type is TYPE, tos is , type is NONE, TOS.stage is -parse_cleanup(): orig_line is , type is BRACE_OPEN, tos is , type is NONE, TOS.stage is -parse_cleanup(): orig_line is , type is WORD, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is PAREN_OPEN, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is QUALIFIER, tos is , type is PAREN_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is TYPE, tos is , type is PAREN_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is PTR_TYPE, tos is , type is PAREN_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is WORD, tos is , type is PAREN_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is COMMA, tos is , type is PAREN_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is TYPE, tos is , type is PAREN_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is TYPE, tos is , type is PAREN_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is WORD, tos is , type is PAREN_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is PAREN_CLOSE, tos is , type is PAREN_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is COLON, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is WORD, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is PAREN_OPEN, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is WORD, tos is , type is PAREN_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is PAREN_CLOSE, tos is , type is PAREN_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is COMMA, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is WORD, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is PAREN_OPEN, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is WORD, tos is , type is PAREN_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is PAREN_CLOSE, tos is , type is PAREN_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is BRACE_OPEN, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is BRACE_CLOSE, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is INV, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is WORD, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is PAREN_OPEN, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is PAREN_CLOSE, tos is , type is PAREN_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is BRACE_OPEN, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is BRACE_CLOSE, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is QUALIFIER, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is TYPE, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is PTR_TYPE, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is QUALIFIER, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is WORD, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is SEMICOLON, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is TYPE, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is TYPE, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is WORD, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is SEMICOLON, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is BRACE_CLOSE, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is SEMICOLON, tos is , type is NONE, TOS.stage is +parse_cleanup(): orig_line is , type is STRUCT, tos is , TOS.type is NONE, TOS.stage is +parse_cleanup(): orig_line is , type is TYPE, tos is , TOS.type is NONE, TOS.stage is +parse_cleanup(): orig_line is , type is BRACE_OPEN, tos is , TOS.type is NONE, TOS.stage is +parse_cleanup(): orig_line is , type is WORD, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is PAREN_OPEN, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is QUALIFIER, tos is , TOS.type is PAREN_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is TYPE, tos is , TOS.type is PAREN_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is PTR_TYPE, tos is , TOS.type is PAREN_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is WORD, tos is , TOS.type is PAREN_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is COMMA, tos is , TOS.type is PAREN_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is TYPE, tos is , TOS.type is PAREN_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is TYPE, tos is , TOS.type is PAREN_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is WORD, tos is , TOS.type is PAREN_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is PAREN_CLOSE, tos is , TOS.type is PAREN_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is COLON, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is WORD, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is PAREN_OPEN, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is WORD, tos is , TOS.type is PAREN_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is PAREN_CLOSE, tos is , TOS.type is PAREN_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is COMMA, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is WORD, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is PAREN_OPEN, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is WORD, tos is , TOS.type is PAREN_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is PAREN_CLOSE, tos is , TOS.type is PAREN_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is BRACE_OPEN, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is BRACE_CLOSE, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is INV, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is WORD, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is PAREN_OPEN, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is PAREN_CLOSE, tos is , TOS.type is PAREN_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is BRACE_OPEN, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is BRACE_CLOSE, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is QUALIFIER, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is TYPE, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is PTR_TYPE, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is QUALIFIER, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is WORD, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is SEMICOLON, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is TYPE, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is TYPE, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is WORD, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is SEMICOLON, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is BRACE_CLOSE, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is SEMICOLON, tos is , TOS.type is NONE, TOS.stage is diff --git a/scripts/Output/31.txt b/scripts/Output/31.txt index f4cecb72a5..76d22a1c1d 100644 --- a/scripts/Output/31.txt +++ b/scripts/Output/31.txt @@ -274,9 +274,7 @@ indent_text(): frm.pse_tos is , ...indent_tmp is indent_text(): frm.pse_tos is , ...indent_tmp is [x:IN_STRUCT,FORCE_SPACE,STMT_START,EXPR_START] [x:IN_STRUCT] -[x:IN_STRUCT] [x:IN_STRUCT,PUNCTUATOR] -[x:IN_STRUCT] [x:IN_STRUCT,IN_CLASS,STMT_START,EXPR_START] [x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] [x:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,FORCE_SPACE,EXPR_START] @@ -289,46 +287,35 @@ indent_text(): frm.pse_tos is , ...indent_tmp is [x:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,VAR_DEF] [x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] [x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] -[x:IN_STRUCT] [x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,STMT_START,EXPR_START] [x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] [x:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,EXPR_START] [x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] [x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] -[x:IN_STRUCT] [x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,EXPR_START] [x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] [x:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,EXPR_START] [x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] -[x:IN_STRUCT] [x:IN_STRUCT,IN_CLASS,EMPTY_BODY,PUNCTUATOR] -[x:IN_STRUCT] [x:IN_STRUCT,IN_CLASS,EMPTY_BODY,PUNCTUATOR] -[x:IN_STRUCT] [x:IN_STRUCT,IN_CLASS,STMT_START,EXPR_START,PUNCTUATOR] [x:IN_STRUCT,IN_CLASS,EXPR_START] [x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] [x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] -[x:IN_STRUCT] [x:IN_STRUCT,IN_CLASS,EMPTY_BODY,PUNCTUATOR] -[x:IN_STRUCT] [x:IN_STRUCT,IN_CLASS,EMPTY_BODY,PUNCTUATOR] -[x:IN_STRUCT] [x:IN_STRUCT,IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE] [x:IN_STRUCT,IN_CLASS,VAR_TYPE] [x:IN_STRUCT,IN_CLASS,VAR_TYPE,PUNCTUATOR] [x:IN_STRUCT,IN_CLASS,FORCE_SPACE,VAR_TYPE] [x:IN_STRUCT,IN_CLASS,VAR_DEF,VAR_ST] [x:IN_STRUCT,IN_CLASS,PUNCTUATOR] -[x:IN_STRUCT] [x:IN_STRUCT,IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE] [x:IN_STRUCT,IN_CLASS,FORCE_SPACE,VAR_TYPE] [x:IN_STRUCT,IN_CLASS,VAR_DEF,VAR_ST] [x:IN_STRUCT,IN_CLASS,PUNCTUATOR] -[x:IN_STRUCT] [x:IN_CLASS,PUNCTUATOR] [x:PUNCTUATOR] -[x:] indent_text(): orig_line is , orig_col is , column is , for 'struct' [x:IN_STRUCT,FORCE_SPACE,STMT_START,EXPR_START] indent_text(): frm.pse_tos is , ...indent_tmp is diff --git a/scripts/Output/36.txt b/scripts/Output/36.txt index 2e8d8030e5..ca03a6e9d6 100644 --- a/scripts/Output/36.txt +++ b/scripts/Output/36.txt @@ -1,14 +1,14 @@ -fix_fcn_def_params: ( [PAREN_OPEN] on line , level -fix_fcn_def_params: looking at const on line , level -fix_fcn_def_params: looking at char on line , level -fix_fcn_def_params: looking at * on line , level -fix_fcn_def_params: looking at pN on line , level -fix_fcn_def_params: looking at , on line , level +fix_fcn_def_params(): text() '(', type is [PAREN_OPEN], on orig_line , level is +fix_fcn_def_params(): looking at 'const' on orig_line , level +fix_fcn_def_params(): looking at 'char' on orig_line , level +fix_fcn_def_params(): looking at '*' on orig_line , level +fix_fcn_def_params(): looking at 'pN' on orig_line , level +fix_fcn_def_params(): looking at ',' on orig_line , level mark_variable_stack: parameter on line : [pN] -fix_fcn_def_params: looking at unsigned on line , level -fix_fcn_def_params: looking at long on line , level -fix_fcn_def_params: looking at nI on line , level -fix_fcn_def_params: bailed on ) on line +fix_fcn_def_params(): looking at 'unsigned' on orig_line , level +fix_fcn_def_params(): looking at 'long' on orig_line , level +fix_fcn_def_params(): looking at 'nI' on orig_line , level +fix_fcn_def_params(): bailed on ')', on orig_line mark_variable_stack: parameter on line : [nI] -fix_fcn_def_params: ( [PAREN_OPEN] on line , level -fix_fcn_def_params: bailed on ) on line +fix_fcn_def_params(): text() '(', type is [PAREN_OPEN], on orig_line , level is +fix_fcn_def_params(): bailed on ')', on orig_line diff --git a/scripts/Output/66.txt b/scripts/Output/66.txt index 3de8c3fad9..0ece39ffe5 100644 --- a/scripts/Output/66.txt +++ b/scripts/Output/66.txt @@ -230,174 +230,252 @@ space_col_align(): orig_line is , orig_col is , [FUNC_CLASS_DEF/NONE] 'TelegramI do_space(): orig_line is , orig_col is , first->text() 'TelegramIndex', type is FUNC_CLASS_DEF log_rule(): Spacing: first->orig_line is , first->text() is 'TelegramIndex', [FUNC_CLASS_DEF/NONE] <===> second->text() '(', [FPAREN_OPEN/FUNC_CLASS_DEF] : rule sp_func_class_paren[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [FPAREN_OPEN/FUNC_CLASS_DEF] '(' <==> orig_line is , orig_col is [QUALIFIER/NONE] 'const' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() '(', type is FPAREN_OPEN log_rule(): Spacing: first->orig_line is , first->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===> second->text() 'const', [QUALIFIER/NONE] : rule sp_inside_fparen[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [QUALIFIER/NONE] 'const' <==> orig_line is , orig_col is [TYPE/NONE] 'char' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'const', type is QUALIFIER log_rule(): Spacing: first->orig_line is , first->text() is 'const', [QUALIFIER/NONE] <===> second->text() 'char', [TYPE/NONE] : rule sp_after_type[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is force + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [TYPE/NONE] 'char' <==> orig_line is , orig_col is [PTR_TYPE/NONE] '*' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'char', type is TYPE log_rule(): Spacing: first->orig_line is , first->text() is 'char', [TYPE/NONE] <===> second->text() '*', [PTR_TYPE/NONE] : rule IGNORE[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [PTR_TYPE/NONE] '*' <==> orig_line is , orig_col is [WORD/NONE] 'pN' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() '*', type is PTR_TYPE log_rule(): Spacing: first->orig_line is , first->text() is '*', [PTR_TYPE/NONE] <===> second->text() 'pN', [WORD/NONE] : rule IGNORE[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [WORD/NONE] 'pN' <==> orig_line is , orig_col is [COMMA/NONE] ',' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'pN', type is WORD log_rule(): Spacing: first->orig_line is , first->text() is 'pN', [WORD/NONE] <===> second->text() ',', [COMMA/NONE] : rule sp_before_comma[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is remove + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [COMMA/NONE] ',' <==> orig_line is , orig_col is [TYPE/NONE] 'unsigned' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() ',', type is COMMA log_rule(): Spacing: first->orig_line is , first->text() is ',', [COMMA/NONE] <===> second->text() 'unsigned', [TYPE/NONE] : rule sp_after_comma[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [TYPE/NONE] 'unsigned' <==> orig_line is , orig_col is [TYPE/NONE] 'long' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'unsigned', type is TYPE log_rule(): Spacing: first->orig_line is , first->text() is 'unsigned', [TYPE/NONE] <===> second->text() 'long', [TYPE/NONE] : rule sp_after_type[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is force + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [TYPE/NONE] 'long' <==> orig_line is , orig_col is [WORD/NONE] 'nI' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'long', type is TYPE log_rule(): Spacing: first->orig_line is , first->text() is 'long', [TYPE/NONE] <===> second->text() 'nI', [WORD/NONE] : rule sp_after_type[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is force + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [WORD/NONE] 'nI' <==> orig_line is , orig_col is [FPAREN_CLOSE/FUNC_CLASS_DEF] ')' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'nI', type is WORD log_rule(): Spacing: first->orig_line is , first->text() is 'nI', [WORD/NONE] <===> second->text() ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] : rule sp_inside_fparen[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [FPAREN_CLOSE/FUNC_CLASS_DEF] ')' <==> orig_line is , orig_col is [CONSTR_COLON/NONE] ':' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() ')', type is FPAREN_CLOSE log_rule(): Spacing: first->orig_line is , first->text() is ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] <===> second->text() ':', [CONSTR_COLON/NONE] : rule ADD as default value[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is add + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [CONSTR_COLON/NONE] ':' <==> orig_line is , orig_col is [NEWLINE/NONE] '' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() ':', type is CONSTR_COLON -space_col_align(): av is , len is => coldiff is +space_col_align(): av is remove + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [FUNC_CTOR_VAR/NONE] 'pTelName' <==> orig_line is , orig_col is [FPAREN_OPEN/FUNC_CTOR_VAR] '(' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'pTelName', type is FUNC_CTOR_VAR log_rule(): Spacing: first->orig_line is , first->text() is 'pTelName', [FUNC_CTOR_VAR/NONE] <===> second->text() '(', [FPAREN_OPEN/FUNC_CTOR_VAR] : rule sp_func_call_paren[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [FPAREN_OPEN/FUNC_CTOR_VAR] '(' <==> orig_line is , orig_col is [WORD/NONE] 'pN' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() '(', type is FPAREN_OPEN log_rule(): Spacing: first->orig_line is , first->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===> second->text() 'pN', [WORD/NONE] : rule sp_inside_fparen[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [WORD/NONE] 'pN' <==> orig_line is , orig_col is [FPAREN_CLOSE/FUNC_CTOR_VAR] ')' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'pN', type is WORD log_rule(): Spacing: first->orig_line is , first->text() is 'pN', [WORD/NONE] <===> second->text() ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] : rule sp_inside_fparen[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [FPAREN_CLOSE/FUNC_CTOR_VAR] ')' <==> orig_line is , orig_col is [COMMA/NONE] ',' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() ')', type is FPAREN_CLOSE log_rule(): Spacing: first->orig_line is , first->text() is ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] <===> second->text() ',', [COMMA/NONE] : rule sp_before_comma[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is remove + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [COMMA/NONE] ',' <==> orig_line is , orig_col is [NEWLINE/NONE] '' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() ',', type is COMMA -space_col_align(): av is , len is => coldiff is +space_col_align(): av is remove + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [FUNC_CTOR_VAR/NONE] 'nTelIndex' <==> orig_line is , orig_col is [FPAREN_OPEN/FUNC_CTOR_VAR] '(' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'nTelIndex', type is FUNC_CTOR_VAR log_rule(): Spacing: first->orig_line is , first->text() is 'nTelIndex', [FUNC_CTOR_VAR/NONE] <===> second->text() '(', [FPAREN_OPEN/FUNC_CTOR_VAR] : rule sp_func_call_paren[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [FPAREN_OPEN/FUNC_CTOR_VAR] '(' <==> orig_line is , orig_col is [WORD/NONE] 'n' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() '(', type is FPAREN_OPEN log_rule(): Spacing: first->orig_line is , first->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===> second->text() 'n', [WORD/NONE] : rule sp_inside_fparen[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [WORD/NONE] 'n' <==> orig_line is , orig_col is [FPAREN_CLOSE/FUNC_CTOR_VAR] ')' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'n', type is WORD log_rule(): Spacing: first->orig_line is , first->text() is 'n', [WORD/NONE] <===> second->text() ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] : rule sp_inside_fparen[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [FPAREN_CLOSE/FUNC_CTOR_VAR] ')' <==> orig_line is , orig_col is [NEWLINE/NONE] '' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() ')', type is FPAREN_CLOSE -space_col_align(): av is , len is => coldiff is +space_col_align(): av is remove + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [BRACE_OPEN/FUNC_CLASS_DEF] '{' <==> orig_line is , orig_col is [NEWLINE/NONE] '' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() '{', type is BRACE_OPEN -space_col_align(): av is , len is => coldiff is +space_col_align(): av is remove + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [BRACE_CLOSE/FUNC_CLASS_DEF] '}' <==> orig_line is , orig_col is [NEWLINE/NONE] '' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() '}', type is BRACE_CLOSE -space_col_align(): av is , len is => coldiff is +space_col_align(): av is remove + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [DESTRUCTOR/NONE] '~' <==> orig_line is , orig_col is [FUNC_CLASS_DEF/DESTRUCTOR] 'TelegramIndex' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() '~', type is DESTRUCTOR log_rule(): Spacing: first->orig_line is , first->text() is '~', [DESTRUCTOR/NONE] <===> second->text() 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] : rule REMOVE[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is remove + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [FUNC_CLASS_DEF/DESTRUCTOR] 'TelegramIndex' <==> orig_line is , orig_col is [FPAREN_OPEN/FUNC_CLASS_DEF] '(' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'TelegramIndex', type is FUNC_CLASS_DEF log_rule(): Spacing: first->orig_line is , first->text() is 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] <===> second->text() '(', [FPAREN_OPEN/FUNC_CLASS_DEF] : rule sp_func_class_paren[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [FPAREN_OPEN/FUNC_CLASS_DEF] '(' <==> orig_line is , orig_col is [FPAREN_CLOSE/FUNC_CLASS_DEF] ')' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() '(', type is FPAREN_OPEN log_rule(): Spacing: first->orig_line is , first->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===> second->text() ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] : rule sp_inside_fparens[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [FPAREN_CLOSE/FUNC_CLASS_DEF] ')' <==> orig_line is , orig_col is [NEWLINE/NONE] '' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() ')', type is FPAREN_CLOSE -space_col_align(): av is , len is => coldiff is +space_col_align(): av is remove + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [BRACE_OPEN/FUNC_CLASS_DEF] '{' <==> orig_line is , orig_col is [NEWLINE/NONE] '' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() '{', type is BRACE_OPEN -space_col_align(): av is , len is => coldiff is +space_col_align(): av is remove + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [BRACE_CLOSE/FUNC_CLASS_DEF] '}' <==> orig_line is , orig_col is [NEWLINE/NONE] '' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() '}', type is BRACE_CLOSE -space_col_align(): av is , len is => coldiff is +space_col_align(): av is remove + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [QUALIFIER/NONE] 'const' <==> orig_line is , orig_col is [TYPE/NONE] 'char' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'const', type is QUALIFIER log_rule(): Spacing: first->orig_line is , first->text() is 'const', [QUALIFIER/NONE] <===> second->text() 'char', [TYPE/NONE] : rule sp_after_type[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is force + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [TYPE/NONE] 'char' <==> orig_line is , orig_col is [PTR_TYPE/NONE] '*' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'char', type is TYPE log_rule(): Spacing: first->orig_line is , first->text() is 'char', [TYPE/NONE] <===> second->text() '*', [PTR_TYPE/NONE] : rule IGNORE[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [PTR_TYPE/NONE] '*' <==> orig_line is , orig_col is [QUALIFIER/NONE] 'const' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() '*', type is PTR_TYPE log_rule(): Spacing: first->orig_line is , first->text() is '*', [PTR_TYPE/NONE] <===> second->text() 'const', [QUALIFIER/NONE] : rule IGNORE[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [QUALIFIER/NONE] 'const' <==> orig_line is , orig_col is [WORD/NONE] 'pTelName' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'const', type is QUALIFIER log_rule(): Spacing: first->orig_line is , first->text() is 'const', [QUALIFIER/NONE] <===> second->text() 'pTelName', [WORD/NONE] : rule sp_after_type[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is force + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [WORD/NONE] 'pTelName' <==> orig_line is , orig_col is [SEMICOLON/NONE] ';' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'pTelName', type is WORD log_rule(): Spacing: first->orig_line is , first->text() is 'pTelName', [WORD/NONE] <===> second->text() ';', [SEMICOLON/NONE] : rule sp_before_semi[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is remove + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [SEMICOLON/NONE] ';' <==> orig_line is , orig_col is [NEWLINE/NONE] '' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() ';', type is SEMICOLON -space_col_align(): av is , len is => coldiff is +space_col_align(): av is remove + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [TYPE/NONE] 'unsigned' <==> orig_line is , orig_col is [TYPE/NONE] 'long' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'unsigned', type is TYPE log_rule(): Spacing: first->orig_line is , first->text() is 'unsigned', [TYPE/NONE] <===> second->text() 'long', [TYPE/NONE] : rule sp_after_type[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is force + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [TYPE/NONE] 'long' <==> orig_line is , orig_col is [WORD/NONE] 'nTelIndex' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'long', type is TYPE log_rule(): Spacing: first->orig_line is , first->text() is 'long', [TYPE/NONE] <===> second->text() 'nTelIndex', [WORD/NONE] : rule sp_after_type[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is force + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [WORD/NONE] 'nTelIndex' <==> orig_line is , orig_col is [SEMICOLON/NONE] ';' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'nTelIndex', type is WORD log_rule(): Spacing: first->orig_line is , first->text() is 'nTelIndex', [WORD/NONE] <===> second->text() ';', [SEMICOLON/NONE] : rule sp_before_semi[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is remove + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [SEMICOLON/NONE] ';' <==> orig_line is , orig_col is [NEWLINE/NONE] '' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() ';', type is SEMICOLON -space_col_align(): av is , len is => coldiff is +space_col_align(): av is remove + len is + => coldiff is diff --git a/scripts/Output/I-842.txt b/scripts/Output/I-842.txt index eee065d0b1..71b5b7ddd3 100644 --- a/scripts/Output/I-842.txt +++ b/scripts/Output/I-842.txt @@ -1,3 +1,3 @@ Unmatched BRACE_CLOSE -at line=9, column=1 +at orig_line=9, orig_col=1 Try the option 'tok_split_gte = true' diff --git a/scripts/Output/unmatched_close_pp.txt b/scripts/Output/unmatched_close_pp.txt index 86441bb810..88a8cc713b 100644 --- a/scripts/Output/unmatched_close_pp.txt +++ b/scripts/Output/unmatched_close_pp.txt @@ -1,3 +1,3 @@ Unmatched BRACE_CLOSE -at line=11, column=1 +at orig_line=11, orig_col=1 Try the option 'tok_split_gte = true' diff --git a/src/align.cpp b/src/align.cpp index eb09e957c5..c619fd5fdb 100644 --- a/src/align.cpp +++ b/src/align.cpp @@ -708,7 +708,7 @@ chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_c } size_t my_level = first->level; - LOG_FMT(LALASS, "%s(%d): [%zu]: checking %s on line %zu - span=%zu thresh=%zu\n", + LOG_FMT(LALASS, "%s(%d): [my_level is %zu]: start checking with '%s', on orig_line %zu, span is %zu, thresh is %zu\n", __func__, __LINE__, my_level, first->text(), first->orig_line, span, thresh); // If we are aligning on a tabstop, we shouldn't right-align @@ -726,12 +726,16 @@ chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_c chunk_t *pc = first; while (pc != nullptr) { + LOG_FMT(LALASS, "%s(%d): orig_line is %zu, check pc->text() '%s'\n", + __func__, __LINE__, pc->orig_line, pc->text()); // Don't check inside PAREN or SQUARE groups if ( pc->type == CT_SPAREN_OPEN || pc->type == CT_FPAREN_OPEN || pc->type == CT_SQUARE_OPEN || pc->type == CT_PAREN_OPEN) { + LOG_FMT(LALASS, "%s(%d): Don't check inside PAREN or SQUARE groups, type is %s\n", + __func__, __LINE__, get_token_name(pc->type)); tmp = pc->orig_line; pc = chunk_skip_to_match(pc); if (pc != nullptr) @@ -825,7 +829,7 @@ chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_c if (pc != nullptr) { - LOG_FMT(LALASS, "%s(%d): done on %s on line %zu\n", + LOG_FMT(LALASS, "%s(%d): done on '%s' on orig_line %zu\n", __func__, __LINE__, pc->text(), pc->orig_line); } else @@ -1238,14 +1242,14 @@ static chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_co chunk_t *prev = chunk_get_prev_ncnl(start); if (prev != nullptr && prev->type == CT_ASSIGN) { - LOG_FMT(LAVDB, "%s(%d): start=%s [%s] on line %zu (abort due to assign)\n", + LOG_FMT(LAVDB, "%s(%d): start->text() '%s', type is %s, on orig_line %zu (abort due to assign)\n", __func__, __LINE__, start->text(), get_token_name(start->type), start->orig_line); chunk_t *pc = chunk_get_next_type(start, CT_BRACE_CLOSE, start->level); return(chunk_get_next_ncnl(pc)); } - LOG_FMT(LAVDB, "%s(%d): start=%s [%s] on line %zu\n", + LOG_FMT(LAVDB, "%s(%d): start->text() '%s', type is %s, on orig_line %zu\n", __func__, __LINE__, start->text(), get_token_name(start->type), start->orig_line); UINT64 align_mask = PCF_IN_FCN_DEF | PCF_VAR_1ST; @@ -1281,8 +1285,16 @@ static chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_co while ( pc != nullptr && (pc->level >= start->level || pc->level == 0)) { - LOG_FMT(LGUY, "%s(%d): %s orig_line is %zu, orig_col is %zu\n", - __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col); + if (pc->type == CT_NEWLINE) + { + LOG_FMT(LAVDB, "%s(%d): orig_line is %zu, orig_col is %zu, NEWLINE\n", + __func__, __LINE__, pc->orig_line, pc->orig_col); + } + else + { + LOG_FMT(LAVDB, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s'\n", + __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text()); + } if (chunk_is_comment(pc)) { if (pc->nl_count > 0) @@ -1361,10 +1373,14 @@ static chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_co } } + LOG_FMT(LAVDB, "%s(%d): pc->level is %zu, pc->brace_level is %zu\n", + __func__, __LINE__, pc->level, pc->brace_level); // don't align stuff inside parenthesis/squares/angles if (pc->level > pc->brace_level) { pc = chunk_get_next(pc); + LOG_FMT(LAVDB, "%s(%d): pc->orig_line is %zu, pc->orig_col is %zu, pc->text() '%s'\n", + __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text()); continue; } @@ -1374,7 +1390,7 @@ static chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_co && pc->type != CT_FUNC_CLASS_PROTO && ((pc->flags & align_mask) == PCF_VAR_1ST) && ((pc->level == (start->level + 1)) || pc->level == 0) - && pc->prev + && pc->prev != nullptr && pc->prev->type != CT_MEMBER) { if (!did_this_line) @@ -1393,7 +1409,7 @@ static chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_co } pc = prev_local->next; } - LOG_FMT(LAVDB, "%s(%d): add=[%s], orig_line is %zu, orig_col is %zu, level is %zu\n", + LOG_FMT(LAVDB, "%s(%d): add='%s', orig_line is %zu, orig_col is %zu, level is %zu\n", __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col, pc->level); as.Add(step_back_over_member(pc)); @@ -1932,9 +1948,16 @@ static void align_left_shift(void) chunk_t *pc = chunk_get_head(); while (pc != nullptr) { - LOG_FMT(LGUY, "%s(%d): pc->text() %s\n", - __func__, __LINE__, pc->text()); - log_pcf_flags(LINDLINE, pc->flags); + if (pc->type == CT_NEWLINE) + { + LOG_FMT(LAVDB, "%s(%d): NEWLINE\n", __func__, __LINE__); + } + else + { + LOG_FMT(LAVDB, "%s(%d): pc->text() '%s'\n", + __func__, __LINE__, pc->text()); + log_pcf_flags(LINDLINE, pc->flags); + } if ( start != nullptr && ((pc->flags & PCF_IN_PREPROC) != (start->flags & PCF_IN_PREPROC))) { @@ -1965,7 +1988,6 @@ static void align_left_shift(void) else if ( (!(pc->flags & PCF_IN_ENUM) && !(pc->flags & PCF_IN_TYPEDEF)) && chunk_is_str(pc, "<<", 2)) { - LOG_FMT(LGUY, "%s(%d): TEST GUY\n", __func__, __LINE__); log_pcf_flags(LINDLINE, pc->flags); if (pc->parent_type == CT_OPERATOR) { diff --git a/src/align_stack.cpp b/src/align_stack.cpp index c8bf309281..7ff4d51abd 100644 --- a/src/align_stack.cpp +++ b/src/align_stack.cpp @@ -297,14 +297,18 @@ void AlignStack::NewLines(size_t cnt) m_seqnum += cnt; if (m_seqnum > (m_nl_seqnum + m_span)) { - LOG_FMT(LAS, "Newlines<%zu>-", cnt); + LOG_FMT(LAS, "Newlines(%d): cnt is %zu, -\n", __LINE__, cnt); Flush(); } else { - LOG_FMT(LAS, "Newlines<%zu>\n", cnt); + LOG_FMT(LAS, "Newlines(%d): cnt is %zu\n", __LINE__, cnt); } } + else + { + LOG_FMT(LAS, "Newlines(%d): is empty\n", __LINE__); + } } @@ -314,8 +318,9 @@ void AlignStack::Flush() const ChunkStack::Entry *ce = nullptr; chunk_t *pc; - LOG_FMT(LAS, "%s: m_aligned.Len()=%zu\n", __func__, m_aligned.Len()); - LOG_FMT(LAS, "Flush (min=%zu, max=%zu)\n", m_min_col, m_max_col); + LOG_FMT(LAS, "%s(%d): m_aligned.Len() is %zu\n", __func__, __LINE__, m_aligned.Len()); + LOG_FMT(LAS, " (min is %zu, max is %zu)\n", m_min_col, m_max_col); + if (m_aligned.Len() == 1) { // check if we have *one* typedef in the line @@ -390,8 +395,8 @@ void AlignStack::Flush() m_max_col = align_tab_column(m_max_col); } - LOG_FMT(LAS, "%s: m_aligned.Len()=%zu\n", - __func__, m_aligned.Len()); + LOG_FMT(LAS, "%s(%d): m_aligned.Len() is %zu\n", + __func__, __LINE__, m_aligned.Len()); for (size_t idx = 0; idx < m_aligned.Len(); idx++) { ce = m_aligned.Get(idx); @@ -402,8 +407,8 @@ void AlignStack::Flush() { if (m_skip_first && pc->column != tmp_col) { - LOG_FMT(LAS, "%s: %zu:%zu dropping first item due to skip_first\n", - __func__, pc->orig_line, pc->orig_col); + LOG_FMT(LAS, "%s(%d): orig_line is %zu, orig_col is %zu, dropping first item due to skip_first\n", + __func__, __LINE__, pc->orig_line, pc->orig_col); m_skip_first = false; m_aligned.Pop_Front(); Flush(); @@ -420,8 +425,8 @@ void AlignStack::Flush() pc->align.next = m_aligned.GetChunk(idx + 1); // Indent the token, taking col_adj into account - LOG_FMT(LAS, "%s: line %zu: '%s' to col %zu (adj=%d)\n", - __func__, pc->orig_line, pc->text(), tmp_col, pc->align.col_adj); + LOG_FMT(LAS, "%s(%d): orig_line is %zu, text() '%s', to col %zu (adj is %d)\n", + __func__, __LINE__, pc->orig_line, pc->text(), tmp_col, pc->align.col_adj); align_to_column(pc, tmp_col); } diff --git a/src/brace_cleanup.cpp b/src/brace_cleanup.cpp index f5550fbe98..10c2f506ac 100644 --- a/src/brace_cleanup.cpp +++ b/src/brace_cleanup.cpp @@ -329,7 +329,7 @@ static void parse_cleanup(parse_frame_t *frm, chunk_t *pc) { LOG_FUNC_ENTRY(); - LOG_FMT(LTOK, "%s(%d): orig_line is %zu, type is %s, tos is %zu, type is %s, TOS.stage is %u\n", + LOG_FMT(LTOK, "%s(%d): orig_line is %zu, type is %s, tos is %zu, TOS.type is %s, TOS.stage is %u\n", __func__, __LINE__, pc->orig_line, get_token_name(pc->type), frm->pse_tos, get_token_name(frm->pse[frm->pse_tos].type), (unsigned int)frm->pse[frm->pse_tos].stage); @@ -343,7 +343,7 @@ static void parse_cleanup(parse_frame_t *frm, chunk_t *pc) && !chunk_is_str(pc, "]", 1)) { chunk_flags_set(pc, PCF_EXPR_START | ((frm->stmt_count == 0) ? PCF_STMT_START : 0)); - LOG_FMT(LSTMT, "%s(%d): orig_line is %zu, 1.marked %s as %s, start st is %d, ex is %d\n", + LOG_FMT(LSTMT, "%s(%d): orig_line is %zu, 1.marked '%s' as %s, start stmt_count is %d, expr_count is %d\n", __func__, __LINE__, pc->orig_line, pc->text(), (pc->flags & PCF_STMT_START) ? "stmt" : "expr", frm->stmt_count, frm->expr_count); } @@ -431,7 +431,7 @@ static void parse_cleanup(parse_frame_t *frm, chunk_t *pc) if ( (frm->pse[frm->pse_tos].type != CT_NONE) && (frm->pse[frm->pse_tos].type != CT_PP_DEFINE)) { - LOG_FMT(LWARN, "%s(%d): %s:%zu Error: Unexpected '%s' for '%s', which was on line %zu\n", + LOG_FMT(LWARN, "%s(%d): %s, orig_line is %zu, Error: Unexpected '%s' for '%s', which was on line %zu\n", __func__, __LINE__, cpd.filename, pc->orig_line, pc->text(), get_token_name(frm->pse[frm->pse_tos].pc->type), frm->pse[frm->pse_tos].pc->orig_line); @@ -652,7 +652,7 @@ static void parse_cleanup(parse_frame_t *frm, chunk_t *pc) && frm->pse[frm->pse_tos].type != CT_FPAREN_OPEN && frm->pse[frm->pse_tos].type != CT_SPAREN_OPEN)) { - LOG_FMT(LSTMT, "%s(%d): orig_line is %zu, reset1 stmt on %s\n", + LOG_FMT(LSTMT, "%s(%d): orig_line is %zu, reset1 stmt on '%s'\n", __func__, __LINE__, pc->orig_line, pc->text()); frm->stmt_count = 0; frm->expr_count = 0; @@ -688,7 +688,7 @@ static void parse_cleanup(parse_frame_t *frm, chunk_t *pc) || pc->type == CT_QUESTION) { frm->expr_count = 0; - LOG_FMT(LSTMT, "%s(%d): %zu> reset expr on %s\n", + LOG_FMT(LSTMT, "%s(%d): orig_line is %zu, reset expr on '%s'\n", __func__, __LINE__, pc->orig_line, pc->text()); } else if (pc->type == CT_BRACE_CLOSE) @@ -702,12 +702,12 @@ static void parse_cleanup(parse_frame_t *frm, chunk_t *pc) char *outputMessage; if (cpd.settings[UO_tok_split_gte].b) { - outputMessage = make_message("Unmatched BRACE_CLOSE\nat line=%zu, column=%zu\n", + outputMessage = make_message("Unmatched BRACE_CLOSE\nat orig_line=%zu, orig_col=%zu\n", pc->orig_line, pc->orig_col); } else { - outputMessage = make_message("Unmatched BRACE_CLOSE\nat line=%zu, column=%zu\nTry the option 'tok_split_gte = true'\n", + outputMessage = make_message("Unmatched BRACE_CLOSE\nat orig_line=%zu, orig_col=%zu\nTry the option 'tok_split_gte = true'\n", pc->orig_line, pc->orig_col); } fprintf(stderr, "%s", outputMessage); @@ -830,8 +830,8 @@ static bool check_complex_statements(parse_frame_t *frm, chunk_t *pc) return(true); } - LOG_FMT(LWARN, "%s:%zu Error: Expected 'while', got '%s'\n", - cpd.filename, pc->orig_line, pc->text()); + LOG_FMT(LWARN, "%s(%d): %s, orig_line is %zu, Error: Expected 'while', got '%s'\n", + __func__, __LINE__, cpd.filename, pc->orig_line, pc->text()); frm->pse_tos--; print_stack(LBCSPOP, "-Error ", frm, pc); cpd.error_count++; @@ -871,7 +871,8 @@ static bool check_complex_statements(parse_frame_t *frm, chunk_t *pc) pc->flags |= PCF_STMT_START | PCF_EXPR_START; frm->stmt_count = 1; frm->expr_count = 1; - LOG_FMT(LSTMT, "%zu] 2.marked %s as stmt start\n", pc->orig_line, pc->text()); + LOG_FMT(LSTMT, "%s(%d): orig_line is %zu, 2.marked '%s' as stmt start\n", + __func__, __LINE__, pc->orig_line, pc->text()); } } @@ -880,8 +881,8 @@ static bool check_complex_statements(parse_frame_t *frm, chunk_t *pc) && ( (frm->pse[frm->pse_tos].stage == brace_stage_e::PAREN1) || (frm->pse[frm->pse_tos].stage == brace_stage_e::WOD_PAREN))) { - LOG_FMT(LWARN, "%s:%zu Error: Expected '(', got '%s' for '%s'\n", - cpd.filename, pc->orig_line, pc->text(), + LOG_FMT(LWARN, "%s(%d): %s, orig_line is %zu, Error: Expected '(', got '%s' for '%s'\n", + __func__, __LINE__, cpd.filename, pc->orig_line, pc->text(), get_token_name(frm->pse[frm->pse_tos].type)); // Throw out the complex statement @@ -952,8 +953,8 @@ static bool handle_complex_close(parse_frame_t *frm, chunk_t *pc) } else { - LOG_FMT(LNOTE, "%s: close_statement on %s brace_stage_e::BRACE2\n", __func__, - get_token_name(frm->pse[frm->pse_tos].type)); + LOG_FMT(LNOTE, "%s(%d): close_statement on %s brace_stage_e::BRACE2\n", + __func__, __LINE__, get_token_name(frm->pse[frm->pse_tos].type)); frm->pse_tos--; print_stack(LBCSPOP, "-HCC B2 ", frm, pc); if (close_statement(frm, pc)) @@ -968,15 +969,15 @@ static bool handle_complex_close(parse_frame_t *frm, chunk_t *pc) } else if (frm->pse[frm->pse_tos].stage == brace_stage_e::WOD_PAREN) { - LOG_FMT(LNOTE, "%s: close_statement on %s brace_stage_e::WOD_PAREN\n", __func__, - get_token_name(frm->pse[frm->pse_tos].type)); + LOG_FMT(LNOTE, "%s(%d): close_statement on %s brace_stage_e::WOD_PAREN\n", + __func__, __LINE__, get_token_name(frm->pse[frm->pse_tos].type)); frm->pse[frm->pse_tos].stage = brace_stage_e::WOD_SEMI; print_stack(LBCSPOP, "-HCC WoDP ", frm, pc); } else if (frm->pse[frm->pse_tos].stage == brace_stage_e::WOD_SEMI) { - LOG_FMT(LNOTE, "%s: close_statement on %s brace_stage_e::WOD_SEMI\n", __func__, - get_token_name(frm->pse[frm->pse_tos].type)); + LOG_FMT(LNOTE, "%s(%d): close_statement on %s brace_stage_e::WOD_SEMI\n", + __func__, __LINE__, get_token_name(frm->pse[frm->pse_tos].type)); frm->pse_tos--; print_stack(LBCSPOP, "-HCC WoDS ", frm, pc); @@ -988,8 +989,8 @@ static bool handle_complex_close(parse_frame_t *frm, chunk_t *pc) else { // PROBLEM - LOG_FMT(LWARN, "%s:%zu Error: TOS.type='%s' TOS.stage=%u\n", - cpd.filename, pc->orig_line, + LOG_FMT(LWARN, "%s(%d): %s:%zu Error: TOS.type='%s' TOS.stage=%u\n", + __func__, __LINE__, cpd.filename, pc->orig_line, get_token_name(frm->pse[frm->pse_tos].type), (unsigned int)frm->pse[frm->pse_tos].stage); cpd.error_count++; @@ -1063,8 +1064,8 @@ bool close_statement(parse_frame_t *frm, chunk_t *pc) LOG_FUNC_ENTRY(); chunk_t *vbc = pc; - LOG_FMT(LTOK, "%s:%zu] %s '%s' type %s stage %u\n", __func__, - pc->orig_line, + LOG_FMT(LTOK, "%s(%d): orig_line is %zu, type is %s, '%s' type is %s, stage is %u\n", + __func__, __LINE__, pc->orig_line, get_token_name(pc->type), pc->text(), get_token_name(frm->pse[frm->pse_tos].type), (unsigned int)frm->pse[frm->pse_tos].stage); @@ -1073,8 +1074,8 @@ bool close_statement(parse_frame_t *frm, chunk_t *pc) { frm->stmt_count = 0; frm->expr_count = 0; - LOG_FMT(LSTMT, "%s: %zu> reset2 stmt on %s\n", - __func__, pc->orig_line, pc->text()); + LOG_FMT(LSTMT, "%s(%d): orig_line is %zu> reset2 stmt on '%s'\n", + __func__, __LINE__, pc->orig_line, pc->text()); } /* diff --git a/src/combine.cpp b/src/combine.cpp index 31d6ac8d2d..62f8ee188d 100644 --- a/src/combine.cpp +++ b/src/combine.cpp @@ -3333,8 +3333,8 @@ static void fix_fcn_def_params(chunk_t *start) return; } - LOG_FMT(LFCNP, "%s: %s [%s] on line %zu, level %zu\n", - __func__, start->text(), get_token_name(start->type), start->orig_line, start->level); + LOG_FMT(LFCNP, "%s(%d): text() '%s', type is [%s], on orig_line %zu, level is %zu\n", + __func__, __LINE__, start->text(), get_token_name(start->type), start->orig_line, start->level); while (start != nullptr && !chunk_is_paren_open(start)) { @@ -3357,13 +3357,13 @@ static void fix_fcn_def_params(chunk_t *start) if ( ((start->len() == 1) && (start->str[0] == ')')) || pc->level < level) { - LOG_FMT(LFCNP, "%s: bailed on %s on line %zu\n", - __func__, pc->text(), pc->orig_line); + LOG_FMT(LFCNP, "%s(%d): bailed on '%s', on orig_line %zu\n", + __func__, __LINE__, pc->text(), pc->orig_line); break; } - LOG_FMT(LFCNP, "%s: %s %s on line %zu, level %zu\n", - __func__, (pc->level > level) ? "skipping" : "looking at", + LOG_FMT(LFCNP, "%s(%d): %s '%s' on orig_line %zu, level %zu\n", + __func__, __LINE__, (pc->level > level) ? "skipping" : "looking at", pc->text(), pc->orig_line, pc->level); if (pc->level > level) @@ -3519,13 +3519,13 @@ static chunk_t *fix_var_def(chunk_t *start) return(skip_to_next_statement(end)); } - LOG_FMT(LFVD2, "%s:%zu TYPE : ", __func__, start->orig_line); + LOG_FMT(LFVD2, "%s(%d):%zu TYPE : ", __func__, __LINE__, start->orig_line); for (size_t idxForCs = 0; idxForCs < cs.Len() - 1; idxForCs++) { tmp_pc = cs.Get(idxForCs)->m_pc; make_type(tmp_pc); chunk_flags_set(tmp_pc, PCF_VAR_TYPE); - LOG_FMT(LFVD2, " %s[%s]", tmp_pc->text(), get_token_name(tmp_pc->type)); + LOG_FMT(LFVD2, " '%s'[%s]", tmp_pc->text(), get_token_name(tmp_pc->type)); } LOG_FMT(LFVD2, "\n"); @@ -3584,8 +3584,8 @@ static chunk_t *mark_variable_definition(chunk_t *start) chunk_t *pc = start; size_t flags = PCF_VAR_1ST_DEF; - LOG_FMT(LVARDEF, "%s: line %zu, col %zu '%s' type %s\n", - __func__, pc->orig_line, pc->orig_col, pc->text(), + LOG_FMT(LVARDEF, "%s(%d): orig_line %zu, orig_col %zu, text() '%s', type is %s\n", + __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type)); pc = start; @@ -3601,8 +3601,8 @@ static chunk_t *mark_variable_definition(chunk_t *start) } flags &= ~PCF_VAR_1ST; - LOG_FMT(LVARDEF, "%s:%zu marked '%s'[%s] in col %zu flags: %#" PRIx64 " -> %#" PRIx64 "\n", - __func__, pc->orig_line, pc->text(), + LOG_FMT(LVARDEF, "%s(%d): orig_line is %zu, marked text() '%s'[%s] in orig_col %zu, flags: %#" PRIx64 " -> %#" PRIx64 "\n", + __func__, __LINE__, pc->orig_line, pc->text(), get_token_name(pc->type), pc->orig_col, flg, pc->flags); } else if (chunk_is_star(pc) || chunk_is_msref(pc)) @@ -3938,9 +3938,9 @@ static void mark_function(chunk_t *pc) if (paren_open == nullptr || paren_close == nullptr) { #ifdef DEBUG - LOG_FMT(LFCN, "(%d) ", __LINE__); + LOG_FMT(LFCN, "%s(%d) ", __func__, __LINE__); #endif - LOG_FMT(LFCN, "No parens found for [%s] on line %zu col %zu\n", + LOG_FMT(LFCN, "No parens found for [%s] on orig_line %zu, orig_col %zu\n", pc->text(), pc->orig_line, pc->orig_col); return; } @@ -3994,26 +3994,26 @@ static void mark_function(chunk_t *pc) if (tmp2) { #ifdef DEBUG - LOG_FMT(LFCN, "(%d) ", __LINE__); + LOG_FMT(LFCN, "%s(%d): ", __func__, __LINE__); #endif - LOG_FMT(LFCN, "%s: [%zu/%zu] function variable [%s], changing [%s] into a type\n", - __func__, pc->orig_line, pc->orig_col, tmp2->text(), pc->text()); + LOG_FMT(LFCN, "[%zu/%zu] function variable [%s], changing [%s] into a type\n", + pc->orig_line, pc->orig_col, tmp2->text(), pc->text()); set_chunk_type(tmp2, CT_FUNC_VAR); flag_parens(paren_open, 0, CT_PAREN_OPEN, CT_FUNC_VAR, false); #ifdef DEBUG - LOG_FMT(LFCN, "(%d) ", __LINE__); + LOG_FMT(LFCN, "%s(%d): ", __func__, __LINE__); #endif - LOG_FMT(LFCN, "%s: paren open @ %zu:%zu\n", - __func__, paren_open->orig_line, paren_open->orig_col); + LOG_FMT(LFCN, "paren open @ %zu:%zu\n", + paren_open->orig_line, paren_open->orig_col); } else { #ifdef DEBUG - LOG_FMT(LFCN, "(%d) ", __LINE__); + LOG_FMT(LFCN, "%s(%d): ", __func__, __LINE__); #endif - LOG_FMT(LFCN, "%s: [%zu/%zu] function type, changing [%s] into a type\n", - __func__, pc->orig_line, pc->orig_col, pc->text()); + LOG_FMT(LFCN, "[%zu/%zu] function type, changing [%s] into a type\n", + pc->orig_line, pc->orig_col, pc->text()); if (tmp2) { set_chunk_type(tmp2, CT_FUNC_TYPE); @@ -4034,16 +4034,16 @@ static void mark_function(chunk_t *pc) } #ifdef DEBUG - LOG_FMT(LFCN, "(%d) ", __LINE__); + LOG_FMT(LFCN, "%s(%d): ", __func__, __LINE__); #endif - LOG_FMT(LFCN, "%s: chained function calls? [%zu.%zu] [%s]\n", - __func__, pc->orig_line, pc->orig_col, pc->text()); + LOG_FMT(LFCN, "chained function calls? [%zu.%zu] [%s]\n", + pc->orig_line, pc->orig_col, pc->text()); } // Assume it is a function call if not already labeled if (pc->type == CT_FUNCTION) { - LOG_FMT(LFCN, "%s(%d): examine [%zu.%zu] [%s], type %s\n", + LOG_FMT(LFCN, "%s(%d): examine [%zu.%zu] [%s], type is %s\n", __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type)); // look for an assigment. Issue 575 chunk_t *temp = chunk_get_next_type(pc, CT_ASSIGN, pc->level); @@ -4093,7 +4093,7 @@ static void mark_function(chunk_t *pc) if (pc->str.equals(prev->str)) { set_chunk_type(pc, CT_FUNC_CLASS_DEF); - LOG_FMT(LFCN, "%s(%d) %zu:%zu - FOUND %sSTRUCTOR for %s[%s]\n", + LOG_FMT(LFCN, "%s(%d): %zu:%zu - FOUND %sSTRUCTOR for %s[%s]\n", __func__, __LINE__, prev->orig_line, prev->orig_col, (destr != NULL) ? "DE" : "CON", @@ -4304,7 +4304,7 @@ static void mark_function(chunk_t *pc) if (pc->type != CT_FUNC_DEF) { #ifdef DEBUG - LOG_FMT(LFCN, "%s(%d) ", __func__, __LINE__); + LOG_FMT(LFCN, "%s(%d): ", __func__, __LINE__); #endif LOG_FMT(LFCN, " Detected %s '%s' on line %zu col %zu\n", get_token_name(pc->type), @@ -4354,7 +4354,7 @@ static void mark_function(chunk_t *pc) semi = tmp; set_chunk_type(pc, CT_FUNC_PROTO); #ifdef DEBUG - LOG_FMT(LFCN, "%s(%d) ", __func__, __LINE__); + LOG_FMT(LFCN, "%s(%d): ", __func__, __LINE__); #endif LOG_FMT(LFCN, " 2) Marked [%s] as FUNC_PROTO on line %zu col %zu\n", pc->text(), pc->orig_line, pc->orig_col); @@ -4364,7 +4364,7 @@ static void mark_function(chunk_t *pc) { set_chunk_type(pc, CT_FUNC_CTOR_VAR); #ifdef DEBUG - LOG_FMT(LFCN, "%s(%d) ", __func__, __LINE__); + LOG_FMT(LFCN, "%s(%d): ", __func__, __LINE__); #endif LOG_FMT(LFCN, " 2) Marked [%s] as FUNC_CTOR_VAR on line %zu col %zu\n", pc->text(), pc->orig_line, pc->orig_col); @@ -4430,7 +4430,7 @@ static void mark_function(chunk_t *pc) { set_chunk_type(pc, CT_FUNC_CTOR_VAR); #ifdef DEBUG - LOG_FMT(LFCN, "%s(%d) ", __func__, __LINE__); + LOG_FMT(LFCN, "%s(%d): ", __func__, __LINE__); #endif LOG_FMT(LFCN, " 3) Marked [%s] as FUNC_CTOR_VAR on line %zu col %zu\n", pc->text(), pc->orig_line, pc->orig_col); @@ -4535,7 +4535,7 @@ static void mark_cpp_constructor(chunk_t *pc) is_destr = true; } - LOG_FMT(LFTOR, "%s(%d): %zu:%zu FOUND %sSTRUCTOR for %s[%s] prev=%s[%s]", + LOG_FMT(LFTOR, "%s(%d): %zu:%zu FOUND %sSTRUCTOR for '%s'[%s] prev=%s[%s]", __func__, __LINE__, pc->orig_line, pc->orig_col, is_destr ? "DE" : "CON", pc->text(), get_token_name(pc->type), @@ -4626,8 +4626,8 @@ static void mark_class_ctor(chunk_t *start) if (pc == nullptr) { - LOG_FMT(LFTOR, "%s: Called on %s on line %zu. Bailed on NULL\n", - __func__, pclass->text(), pclass->orig_line); + LOG_FMT(LFTOR, "%s(%d): Called on %s on line %zu. Bailed on NULL\n", + __func__, __LINE__, pclass->text(), pclass->orig_line); return; } @@ -4635,8 +4635,8 @@ static void mark_class_ctor(chunk_t *start) ChunkStack cs; cs.Push_Back(pclass); - LOG_FMT(LFTOR, "%s: Called on %s on line %zu (next='%s')\n", - __func__, pclass->text(), pclass->orig_line, pc->text()); + LOG_FMT(LFTOR, "%s(%d): Called on %s on line %zu (next='%s')\n", + __func__, __LINE__, pclass->text(), pclass->orig_line, pc->text()); // detect D template class: "class foo(x) { ... }" if (next != nullptr) // Coverity CID 76004 @@ -4663,14 +4663,14 @@ static void mark_class_ctor(chunk_t *start) { set_chunk_type(pc, CT_CLASS_COLON); flags |= PCF_IN_CLASS_BASE; - LOG_FMT(LFTOR, "%s: class colon on line %zu\n", - __func__, pc->orig_line); + LOG_FMT(LFTOR, "%s(%d): class colon on line %zu\n", + __func__, __LINE__, pc->orig_line); } if (chunk_is_semicolon(pc)) { - LOG_FMT(LFTOR, "%s: bailed on semicolon on line %zu\n", - __func__, pc->orig_line); + LOG_FMT(LFTOR, "%s(%d): bailed on semicolon on line %zu\n", + __func__, __LINE__, pc->orig_line); return; } chunk_flags_set(pc, flags); @@ -4679,7 +4679,7 @@ static void mark_class_ctor(chunk_t *start) if (pc == nullptr) { - LOG_FMT(LFTOR, "%s: bailed on NULL\n", __func__); + LOG_FMT(LFTOR, "%s(%d): bailed on NULL\n", __func__, __LINE__); return; } @@ -4700,7 +4700,7 @@ static void mark_class_ctor(chunk_t *start) if (pc->type == CT_BRACE_CLOSE && pc->brace_level < level) { - LOG_FMT(LFTOR, "%s: %zu] Hit brace close\n", __func__, pc->orig_line); + LOG_FMT(LFTOR, "%s(%d): %zu] Hit brace close\n", __func__, __LINE__, pc->orig_line); pc = chunk_get_next_ncnl(pc, scope_e::PREPROC); if (pc && pc->type == CT_SEMICOLON) { @@ -4716,7 +4716,7 @@ static void mark_class_ctor(chunk_t *start) if (next != nullptr && next->type == CT_PAREN_OPEN) { set_chunk_type(pc, CT_FUNC_CLASS_DEF); - LOG_FMT(LFTOR, "%s(%d): type is %s, orig_line is %zu, orig_col is %zu, Marked CTor/DTor %s\n", + LOG_FMT(LFTOR, "%s(%d): type is %s, orig_line is %zu, orig_col is %zu, Marked CTor/DTor '%s'\n", __func__, __LINE__, get_token_name(pc->type), pc->orig_line, pc->orig_col, pc->text()); mark_cpp_constructor(pc); } @@ -5200,8 +5200,8 @@ static void mark_template_func(chunk_t *pc, chunk_t *pc_next) { if (angle_close->flags & PCF_IN_FCN_CALL) { - LOG_FMT(LTEMPFUNC, "%s: marking '%s' in line %zu as a FUNC_CALL\n", - __func__, pc->text(), pc->orig_line); + LOG_FMT(LTEMPFUNC, "%s(%d): marking '%s' in line %zu as a FUNC_CALL\n", + __func__, __LINE__, pc->text(), pc->orig_line); set_chunk_type(pc, CT_FUNC_CALL); flag_parens(after, PCF_IN_FCN_CALL, CT_FPAREN_OPEN, CT_FUNC_CALL, false); } @@ -5215,8 +5215,8 @@ static void mark_template_func(chunk_t *pc, chunk_t *pc_next) * std::pair(*it, double(*it) + 1.0)); */ - LOG_FMT(LTEMPFUNC, "%s: marking '%s' in line %zu as a FUNC_CALL 2\n", - __func__, pc->text(), pc->orig_line); + LOG_FMT(LTEMPFUNC, "%s(%d): marking '%s' in line %zu as a FUNC_CALL 2\n", + __func__, __LINE__, pc->text(), pc->orig_line); // its a function!!! set_chunk_type(pc, CT_FUNC_CALL); mark_function(pc); @@ -5346,8 +5346,8 @@ static void handle_oc_class(chunk_t *pc) int generic_level = 0; // level of depth of generic angle_state_e as = angle_state_e::NONE; - LOG_FMT(LOCCLASS, "%s: start [%s] [%s] line %zu\n", - __func__, pc->text(), get_token_name(pc->parent_type), pc->orig_line); + LOG_FMT(LOCCLASS, "%s(%d): start [%s] [%s] line %zu\n", + __func__, __LINE__, pc->text(), get_token_name(pc->parent_type), pc->orig_line); if (pc->parent_type == CT_OC_PROTOCOL) { @@ -5355,7 +5355,7 @@ static void handle_oc_class(chunk_t *pc) if (chunk_is_semicolon(tmp)) { set_chunk_parent(tmp, pc->parent_type); - LOG_FMT(LOCCLASS, "%s: bail on semicolon\n", __func__); + LOG_FMT(LOCCLASS, "%s(%d): bail on semicolon\n", __func__, __LINE__); return; } } @@ -5363,8 +5363,8 @@ static void handle_oc_class(chunk_t *pc) tmp = pc; while ((tmp = chunk_get_next_nnl(tmp)) != nullptr) { - LOG_FMT(LOCCLASS, "%s: %zu [%s]\n", - __func__, tmp->orig_line, tmp->text()); + LOG_FMT(LOCCLASS, "%s(%d): orig_line is %zu, [%s]\n", + __func__, __LINE__, tmp->orig_line, tmp->text()); if (tmp->type == CT_OC_END) { @@ -5490,17 +5490,18 @@ static void handle_oc_block_literal(chunk_t *pc) * block literal: '^ RTYPE ( ARGS ) { }' * RTYPE and ARGS are optional */ - LOG_FMT(LOCBLK, "%s: block literal @ %zu:%zu\n", __func__, pc->orig_line, pc->orig_col); + LOG_FMT(LOCBLK, "%s(%d): block literal @ orig_line is %zu, orig_col is %zu\n", + __func__, __LINE__, pc->orig_line, pc->orig_col); chunk_t *apo = nullptr; // arg paren open chunk_t *bbo = nullptr; // block brace open chunk_t *bbc; // block brace close - LOG_FMT(LOCBLK, "%s: + scan", __func__); + LOG_FMT(LOCBLK, "%s(%d): + scan", __func__, __LINE__); chunk_t *tmp; for (tmp = next; tmp; tmp = chunk_get_next_ncnl(tmp)) { - LOG_FMT(LOCBLK, " %s", tmp->text()); + LOG_FMT(LOCBLK, " '%s'", tmp->text()); if (tmp->level < pc->level || tmp->type == CT_SEMICOLON) { LOG_FMT(LOCBLK, "[DONE]"); @@ -5542,7 +5543,7 @@ static void handle_oc_block_literal(chunk_t *pc) chunk_t *apc = chunk_skip_to_match(apo); // arg parenthesis close if (chunk_is_paren_close(apc)) { - LOG_FMT(LOCBLK, " -- marking parens @ %zu:%zu and %zu:%zu\n", + LOG_FMT(LOCBLK, " -- marking parens @ apo->orig_line is %zu, apo->orig_col is %zu and apc->orig_line is %zu, apc->orig_col is %zu\n", apo->orig_line, apo->orig_col, apc->orig_line, apc->orig_col); flag_parens(apo, PCF_OC_ATYPE, CT_FPAREN_OPEN, CT_OC_BLOCK_EXPR, true); fix_fcn_def_params(apo); @@ -5579,8 +5580,8 @@ static void handle_oc_block_type(chunk_t *pc) if (pc->flags & PCF_IN_TYPEDEF) { - LOG_FMT(LOCBLK, "%s: skip block type @ %zu:%zu -- in typedef\n", - __func__, pc->orig_line, pc->orig_col); + LOG_FMT(LOCBLK, "%s(%d): skip block type @ orig_line is %zu, orig_col is %zu, -- in typedef\n", + __func__, __LINE__, pc->orig_line, pc->orig_col); return; } @@ -5628,8 +5629,8 @@ static void handle_oc_block_type(chunk_t *pc) set_chunk_type(nam, CT_FUNC_TYPE); pt = CT_FUNC_TYPE; } - LOG_FMT(LOCBLK, "%s: block type @ %zu:%zu (%s)[%s]\n", - __func__, pc->orig_line, pc->orig_col, nam->text(), get_token_name(nam->type)); + LOG_FMT(LOCBLK, "%s(%d): block type @ orig_line is %zu, orig_col is %zu, text() '%s'[%s]\n", + __func__, __LINE__, pc->orig_line, pc->orig_col, nam->text(), get_token_name(nam->type)); set_chunk_type(pc, CT_PTR_TYPE); set_chunk_parent(pc, pt); //CT_OC_BLOCK_TYPE; set_chunk_type(tpo, CT_TPAREN_OPEN); @@ -5711,7 +5712,8 @@ static void handle_oc_message_decl(chunk_t *pc) set_chunk_type(pc, CT_OC_SCOPE); set_chunk_parent(pc, pt); - LOG_FMT(LOCMSGD, "%s: %s @ %zu:%zu -", __func__, get_token_name(pt), pc->orig_line, pc->orig_col); + LOG_FMT(LOCMSGD, "%s(%d): %s @ orig_line is %zu, orig_col is %zu -", + __func__, __LINE__, get_token_name(pt), pc->orig_line, pc->orig_col); // format: -(TYPE) NAME [: (TYPE)NAME @@ -5764,7 +5766,8 @@ static void handle_oc_message_decl(chunk_t *pc) tmp = handle_oc_md_type(pc, pt, PCF_OC_ATYPE, did_it); if (!did_it) { - LOG_FMT(LWARN, "%s: %zu:%zu expected type\n", __func__, pc->orig_line, pc->orig_col); + LOG_FMT(LWARN, "%s(%d): orig_line is %zu, orig_col is %zu expected type\n", + __func__, __LINE__, pc->orig_line, pc->orig_col); break; } pc = tmp; @@ -5881,7 +5884,8 @@ static void handle_oc_message_send(chunk_t *os) return; } - LOG_FMT(LOCMSG, "%s: line %zu, col %zu\n", __func__, os->orig_line, os->orig_col); + LOG_FMT(LOCMSG, "%s(%d): orig_line is %zu, orig_col is %zu\n", + __func__, __LINE__, os->orig_line, os->orig_col); chunk_t *tmp = chunk_get_next_ncnl(cs); if (chunk_is_semicolon(tmp)) @@ -5904,8 +5908,8 @@ static void handle_oc_message_send(chunk_t *os) && tmp->type != CT_TYPE && tmp->type != CT_STRING) { - LOG_FMT(LOCMSG, "%s: %zu:%zu expected identifier, not '%s' [%s]\n", - __func__, tmp->orig_line, tmp->orig_col, + LOG_FMT(LOCMSG, "%s(%d): orig_line is %zu, orig_col is %zu, expected identifier, not '%s' [%s]\n", + __func__, __LINE__, tmp->orig_line, tmp->orig_col, tmp->text(), get_token_name(tmp->type)); return; } @@ -6318,7 +6322,8 @@ void remove_extra_returns(void) && ( cl_br->parent_type == CT_FUNC_DEF || cl_br->parent_type == CT_FUNC_CLASS_DEF)) { - LOG_FMT(LRMRETURN, "Removed 'return;' on line %zu\n", pc->orig_line); + LOG_FMT(LRMRETURN, "%s(%d): Removed 'return;' on orig_line %zu\n", + __func__, __LINE__, pc->orig_line); chunk_del(pc); chunk_del(semi); pc = cl_br; diff --git a/src/indent.cpp b/src/indent.cpp index 8722143a85..aabe667262 100644 --- a/src/indent.cpp +++ b/src/indent.cpp @@ -279,10 +279,11 @@ void align_to_column(chunk_t *pc, size_t column) ? pc->column + col_delta : 0; pc->column = max(pc->column, min_col); } - LOG_FMT(LINDLINED, " %s set column of %s on line %zu to col %zu (orig %zu)\n", + LOG_FMT(LINDLINED, "%s(%d): %s set column of '%s', type is %s, orig_line is %zu, to col %zu (orig_col was %zu)\n", + __func__, __LINE__, (almod == align_mode_e::KEEP_ABS) ? "abs" : (almod == align_mode_e::KEEP_REL) ? "rel" : "sft", - get_token_name(pc->type), pc->orig_line, pc->column, pc->orig_col); + pc->text(), get_token_name(pc->type), pc->orig_line, pc->column, pc->orig_col); } while (pc != nullptr && pc->nl_count == 0); } // align_to_column diff --git a/src/space.cpp b/src/space.cpp index 4e2ef7dc2f..8ecddb85da 100644 --- a/src/space.cpp +++ b/src/space.cpp @@ -2269,25 +2269,16 @@ size_t space_col_align(chunk_t *first, chunk_t *second) int min_sp; argval_t av = do_space(first, second, min_sp); - LOG_FMT(LSPACE, "%s(%d): av is %d, ", __func__, __LINE__, av); -#ifdef DEBUG - LOG_FMT(LSPACE, "\n"); -#endif + LOG_FMT(LSPACE, "%s(%d): av is %s\n", __func__, __LINE__, argval_to_string(av).c_str()); size_t coldiff; if (first->nl_count) { - LOG_FMT(LSPACE, " nl_count is %zu, orig_col_end is %zu", first->nl_count, first->orig_col_end); -#ifdef DEBUG - LOG_FMT(LSPACE, "\n"); -#endif + LOG_FMT(LSPACE, " nl_count is %zu, orig_col_end is %zu\n", first->nl_count, first->orig_col_end); coldiff = first->orig_col_end - 1; } else { - LOG_FMT(LSPACE, " len is %zu", first->len()); -#ifdef DEBUG - LOG_FMT(LSPACE, "\n"); -#endif + LOG_FMT(LSPACE, " len is %zu\n", first->len()); coldiff = first->len(); } diff --git a/src/tokenize.cpp b/src/tokenize.cpp index 47e789e2a1..dedb4b5541 100644 --- a/src/tokenize.cpp +++ b/src/tokenize.cpp @@ -2091,13 +2091,13 @@ void tokenize(const deque &data, chunk_t *ref) } if (pc->type == CT_NEWLINE) { - LOG_FMT(LGUY, "%s(%d): orig_line is %zu orig_col is %zu\n", + LOG_FMT(LGUY, "%s(%d): orig_line is %zu, orig_col is %zu, \n", __func__, __LINE__, pc->orig_line, pc->orig_col); } else { - LOG_FMT(LGUY, "%s(%d): orig_line is %zu %s, type is %s, orig_col is %zu, orig_col_end is %zu\n", - __func__, __LINE__, pc->orig_line, pc->text(), get_token_name(pc->type), pc->orig_col, pc->orig_col_end); + LOG_FMT(LGUY, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', type is %s, orig_col_end is %zu\n", + __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type), pc->orig_col_end); } } From a38a422316def5f5101ed6012cc94d78edf468a7 Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Wed, 11 Oct 2017 19:35:15 +0200 Subject: [PATCH 012/136] Prepare a better logging for #1342 --- scripts/Output/28.txt | 88 +++++++-------- scripts/Output/31.txt | 13 --- scripts/Output/36.txt | 24 ++-- scripts/Output/66.txt | 156 +++++++++++++++++++------- scripts/Output/I-842.txt | 2 +- scripts/Output/unmatched_close_pp.txt | 2 +- src/align.cpp | 46 ++++++-- src/align_stack.cpp | 25 +++-- src/brace_cleanup.cpp | 49 ++++---- src/combine.cpp | 139 ++++++++++++----------- src/indent.cpp | 5 +- src/space.cpp | 15 +-- src/tokenize.cpp | 6 +- 13 files changed, 330 insertions(+), 240 deletions(-) diff --git a/scripts/Output/28.txt b/scripts/Output/28.txt index f1d3b2fcca..b0fb9bfe38 100644 --- a/scripts/Output/28.txt +++ b/scripts/Output/28.txt @@ -1,44 +1,44 @@ -parse_cleanup(): orig_line is , type is STRUCT, tos is , type is NONE, TOS.stage is -parse_cleanup(): orig_line is , type is TYPE, tos is , type is NONE, TOS.stage is -parse_cleanup(): orig_line is , type is BRACE_OPEN, tos is , type is NONE, TOS.stage is -parse_cleanup(): orig_line is , type is WORD, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is PAREN_OPEN, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is QUALIFIER, tos is , type is PAREN_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is TYPE, tos is , type is PAREN_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is PTR_TYPE, tos is , type is PAREN_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is WORD, tos is , type is PAREN_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is COMMA, tos is , type is PAREN_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is TYPE, tos is , type is PAREN_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is TYPE, tos is , type is PAREN_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is WORD, tos is , type is PAREN_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is PAREN_CLOSE, tos is , type is PAREN_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is COLON, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is WORD, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is PAREN_OPEN, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is WORD, tos is , type is PAREN_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is PAREN_CLOSE, tos is , type is PAREN_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is COMMA, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is WORD, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is PAREN_OPEN, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is WORD, tos is , type is PAREN_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is PAREN_CLOSE, tos is , type is PAREN_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is BRACE_OPEN, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is BRACE_CLOSE, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is INV, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is WORD, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is PAREN_OPEN, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is PAREN_CLOSE, tos is , type is PAREN_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is BRACE_OPEN, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is BRACE_CLOSE, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is QUALIFIER, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is TYPE, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is PTR_TYPE, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is QUALIFIER, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is WORD, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is SEMICOLON, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is TYPE, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is TYPE, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is WORD, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is SEMICOLON, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is BRACE_CLOSE, tos is , type is BRACE_OPEN, TOS.stage is -parse_cleanup(): orig_line is , type is SEMICOLON, tos is , type is NONE, TOS.stage is +parse_cleanup(): orig_line is , type is STRUCT, tos is , TOS.type is NONE, TOS.stage is +parse_cleanup(): orig_line is , type is TYPE, tos is , TOS.type is NONE, TOS.stage is +parse_cleanup(): orig_line is , type is BRACE_OPEN, tos is , TOS.type is NONE, TOS.stage is +parse_cleanup(): orig_line is , type is WORD, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is PAREN_OPEN, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is QUALIFIER, tos is , TOS.type is PAREN_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is TYPE, tos is , TOS.type is PAREN_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is PTR_TYPE, tos is , TOS.type is PAREN_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is WORD, tos is , TOS.type is PAREN_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is COMMA, tos is , TOS.type is PAREN_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is TYPE, tos is , TOS.type is PAREN_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is TYPE, tos is , TOS.type is PAREN_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is WORD, tos is , TOS.type is PAREN_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is PAREN_CLOSE, tos is , TOS.type is PAREN_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is COLON, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is WORD, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is PAREN_OPEN, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is WORD, tos is , TOS.type is PAREN_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is PAREN_CLOSE, tos is , TOS.type is PAREN_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is COMMA, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is WORD, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is PAREN_OPEN, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is WORD, tos is , TOS.type is PAREN_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is PAREN_CLOSE, tos is , TOS.type is PAREN_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is BRACE_OPEN, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is BRACE_CLOSE, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is INV, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is WORD, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is PAREN_OPEN, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is PAREN_CLOSE, tos is , TOS.type is PAREN_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is BRACE_OPEN, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is BRACE_CLOSE, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is QUALIFIER, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is TYPE, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is PTR_TYPE, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is QUALIFIER, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is WORD, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is SEMICOLON, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is TYPE, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is TYPE, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is WORD, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is SEMICOLON, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is BRACE_CLOSE, tos is , TOS.type is BRACE_OPEN, TOS.stage is +parse_cleanup(): orig_line is , type is SEMICOLON, tos is , TOS.type is NONE, TOS.stage is diff --git a/scripts/Output/31.txt b/scripts/Output/31.txt index f4cecb72a5..76d22a1c1d 100644 --- a/scripts/Output/31.txt +++ b/scripts/Output/31.txt @@ -274,9 +274,7 @@ indent_text(): frm.pse_tos is , ...indent_tmp is indent_text(): frm.pse_tos is , ...indent_tmp is [x:IN_STRUCT,FORCE_SPACE,STMT_START,EXPR_START] [x:IN_STRUCT] -[x:IN_STRUCT] [x:IN_STRUCT,PUNCTUATOR] -[x:IN_STRUCT] [x:IN_STRUCT,IN_CLASS,STMT_START,EXPR_START] [x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] [x:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,FORCE_SPACE,EXPR_START] @@ -289,46 +287,35 @@ indent_text(): frm.pse_tos is , ...indent_tmp is [x:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,VAR_DEF] [x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] [x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] -[x:IN_STRUCT] [x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,STMT_START,EXPR_START] [x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] [x:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,EXPR_START] [x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] [x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] -[x:IN_STRUCT] [x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,EXPR_START] [x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] [x:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,EXPR_START] [x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] -[x:IN_STRUCT] [x:IN_STRUCT,IN_CLASS,EMPTY_BODY,PUNCTUATOR] -[x:IN_STRUCT] [x:IN_STRUCT,IN_CLASS,EMPTY_BODY,PUNCTUATOR] -[x:IN_STRUCT] [x:IN_STRUCT,IN_CLASS,STMT_START,EXPR_START,PUNCTUATOR] [x:IN_STRUCT,IN_CLASS,EXPR_START] [x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] [x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] -[x:IN_STRUCT] [x:IN_STRUCT,IN_CLASS,EMPTY_BODY,PUNCTUATOR] -[x:IN_STRUCT] [x:IN_STRUCT,IN_CLASS,EMPTY_BODY,PUNCTUATOR] -[x:IN_STRUCT] [x:IN_STRUCT,IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE] [x:IN_STRUCT,IN_CLASS,VAR_TYPE] [x:IN_STRUCT,IN_CLASS,VAR_TYPE,PUNCTUATOR] [x:IN_STRUCT,IN_CLASS,FORCE_SPACE,VAR_TYPE] [x:IN_STRUCT,IN_CLASS,VAR_DEF,VAR_ST] [x:IN_STRUCT,IN_CLASS,PUNCTUATOR] -[x:IN_STRUCT] [x:IN_STRUCT,IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE] [x:IN_STRUCT,IN_CLASS,FORCE_SPACE,VAR_TYPE] [x:IN_STRUCT,IN_CLASS,VAR_DEF,VAR_ST] [x:IN_STRUCT,IN_CLASS,PUNCTUATOR] -[x:IN_STRUCT] [x:IN_CLASS,PUNCTUATOR] [x:PUNCTUATOR] -[x:] indent_text(): orig_line is , orig_col is , column is , for 'struct' [x:IN_STRUCT,FORCE_SPACE,STMT_START,EXPR_START] indent_text(): frm.pse_tos is , ...indent_tmp is diff --git a/scripts/Output/36.txt b/scripts/Output/36.txt index 2e8d8030e5..ca03a6e9d6 100644 --- a/scripts/Output/36.txt +++ b/scripts/Output/36.txt @@ -1,14 +1,14 @@ -fix_fcn_def_params: ( [PAREN_OPEN] on line , level -fix_fcn_def_params: looking at const on line , level -fix_fcn_def_params: looking at char on line , level -fix_fcn_def_params: looking at * on line , level -fix_fcn_def_params: looking at pN on line , level -fix_fcn_def_params: looking at , on line , level +fix_fcn_def_params(): text() '(', type is [PAREN_OPEN], on orig_line , level is +fix_fcn_def_params(): looking at 'const' on orig_line , level +fix_fcn_def_params(): looking at 'char' on orig_line , level +fix_fcn_def_params(): looking at '*' on orig_line , level +fix_fcn_def_params(): looking at 'pN' on orig_line , level +fix_fcn_def_params(): looking at ',' on orig_line , level mark_variable_stack: parameter on line : [pN] -fix_fcn_def_params: looking at unsigned on line , level -fix_fcn_def_params: looking at long on line , level -fix_fcn_def_params: looking at nI on line , level -fix_fcn_def_params: bailed on ) on line +fix_fcn_def_params(): looking at 'unsigned' on orig_line , level +fix_fcn_def_params(): looking at 'long' on orig_line , level +fix_fcn_def_params(): looking at 'nI' on orig_line , level +fix_fcn_def_params(): bailed on ')', on orig_line mark_variable_stack: parameter on line : [nI] -fix_fcn_def_params: ( [PAREN_OPEN] on line , level -fix_fcn_def_params: bailed on ) on line +fix_fcn_def_params(): text() '(', type is [PAREN_OPEN], on orig_line , level is +fix_fcn_def_params(): bailed on ')', on orig_line diff --git a/scripts/Output/66.txt b/scripts/Output/66.txt index 3de8c3fad9..0ece39ffe5 100644 --- a/scripts/Output/66.txt +++ b/scripts/Output/66.txt @@ -230,174 +230,252 @@ space_col_align(): orig_line is , orig_col is , [FUNC_CLASS_DEF/NONE] 'TelegramI do_space(): orig_line is , orig_col is , first->text() 'TelegramIndex', type is FUNC_CLASS_DEF log_rule(): Spacing: first->orig_line is , first->text() is 'TelegramIndex', [FUNC_CLASS_DEF/NONE] <===> second->text() '(', [FPAREN_OPEN/FUNC_CLASS_DEF] : rule sp_func_class_paren[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [FPAREN_OPEN/FUNC_CLASS_DEF] '(' <==> orig_line is , orig_col is [QUALIFIER/NONE] 'const' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() '(', type is FPAREN_OPEN log_rule(): Spacing: first->orig_line is , first->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===> second->text() 'const', [QUALIFIER/NONE] : rule sp_inside_fparen[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [QUALIFIER/NONE] 'const' <==> orig_line is , orig_col is [TYPE/NONE] 'char' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'const', type is QUALIFIER log_rule(): Spacing: first->orig_line is , first->text() is 'const', [QUALIFIER/NONE] <===> second->text() 'char', [TYPE/NONE] : rule sp_after_type[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is force + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [TYPE/NONE] 'char' <==> orig_line is , orig_col is [PTR_TYPE/NONE] '*' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'char', type is TYPE log_rule(): Spacing: first->orig_line is , first->text() is 'char', [TYPE/NONE] <===> second->text() '*', [PTR_TYPE/NONE] : rule IGNORE[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [PTR_TYPE/NONE] '*' <==> orig_line is , orig_col is [WORD/NONE] 'pN' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() '*', type is PTR_TYPE log_rule(): Spacing: first->orig_line is , first->text() is '*', [PTR_TYPE/NONE] <===> second->text() 'pN', [WORD/NONE] : rule IGNORE[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [WORD/NONE] 'pN' <==> orig_line is , orig_col is [COMMA/NONE] ',' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'pN', type is WORD log_rule(): Spacing: first->orig_line is , first->text() is 'pN', [WORD/NONE] <===> second->text() ',', [COMMA/NONE] : rule sp_before_comma[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is remove + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [COMMA/NONE] ',' <==> orig_line is , orig_col is [TYPE/NONE] 'unsigned' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() ',', type is COMMA log_rule(): Spacing: first->orig_line is , first->text() is ',', [COMMA/NONE] <===> second->text() 'unsigned', [TYPE/NONE] : rule sp_after_comma[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [TYPE/NONE] 'unsigned' <==> orig_line is , orig_col is [TYPE/NONE] 'long' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'unsigned', type is TYPE log_rule(): Spacing: first->orig_line is , first->text() is 'unsigned', [TYPE/NONE] <===> second->text() 'long', [TYPE/NONE] : rule sp_after_type[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is force + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [TYPE/NONE] 'long' <==> orig_line is , orig_col is [WORD/NONE] 'nI' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'long', type is TYPE log_rule(): Spacing: first->orig_line is , first->text() is 'long', [TYPE/NONE] <===> second->text() 'nI', [WORD/NONE] : rule sp_after_type[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is force + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [WORD/NONE] 'nI' <==> orig_line is , orig_col is [FPAREN_CLOSE/FUNC_CLASS_DEF] ')' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'nI', type is WORD log_rule(): Spacing: first->orig_line is , first->text() is 'nI', [WORD/NONE] <===> second->text() ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] : rule sp_inside_fparen[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [FPAREN_CLOSE/FUNC_CLASS_DEF] ')' <==> orig_line is , orig_col is [CONSTR_COLON/NONE] ':' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() ')', type is FPAREN_CLOSE log_rule(): Spacing: first->orig_line is , first->text() is ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] <===> second->text() ':', [CONSTR_COLON/NONE] : rule ADD as default value[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is add + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [CONSTR_COLON/NONE] ':' <==> orig_line is , orig_col is [NEWLINE/NONE] '' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() ':', type is CONSTR_COLON -space_col_align(): av is , len is => coldiff is +space_col_align(): av is remove + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [FUNC_CTOR_VAR/NONE] 'pTelName' <==> orig_line is , orig_col is [FPAREN_OPEN/FUNC_CTOR_VAR] '(' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'pTelName', type is FUNC_CTOR_VAR log_rule(): Spacing: first->orig_line is , first->text() is 'pTelName', [FUNC_CTOR_VAR/NONE] <===> second->text() '(', [FPAREN_OPEN/FUNC_CTOR_VAR] : rule sp_func_call_paren[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [FPAREN_OPEN/FUNC_CTOR_VAR] '(' <==> orig_line is , orig_col is [WORD/NONE] 'pN' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() '(', type is FPAREN_OPEN log_rule(): Spacing: first->orig_line is , first->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===> second->text() 'pN', [WORD/NONE] : rule sp_inside_fparen[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [WORD/NONE] 'pN' <==> orig_line is , orig_col is [FPAREN_CLOSE/FUNC_CTOR_VAR] ')' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'pN', type is WORD log_rule(): Spacing: first->orig_line is , first->text() is 'pN', [WORD/NONE] <===> second->text() ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] : rule sp_inside_fparen[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [FPAREN_CLOSE/FUNC_CTOR_VAR] ')' <==> orig_line is , orig_col is [COMMA/NONE] ',' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() ')', type is FPAREN_CLOSE log_rule(): Spacing: first->orig_line is , first->text() is ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] <===> second->text() ',', [COMMA/NONE] : rule sp_before_comma[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is remove + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [COMMA/NONE] ',' <==> orig_line is , orig_col is [NEWLINE/NONE] '' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() ',', type is COMMA -space_col_align(): av is , len is => coldiff is +space_col_align(): av is remove + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [FUNC_CTOR_VAR/NONE] 'nTelIndex' <==> orig_line is , orig_col is [FPAREN_OPEN/FUNC_CTOR_VAR] '(' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'nTelIndex', type is FUNC_CTOR_VAR log_rule(): Spacing: first->orig_line is , first->text() is 'nTelIndex', [FUNC_CTOR_VAR/NONE] <===> second->text() '(', [FPAREN_OPEN/FUNC_CTOR_VAR] : rule sp_func_call_paren[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [FPAREN_OPEN/FUNC_CTOR_VAR] '(' <==> orig_line is , orig_col is [WORD/NONE] 'n' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() '(', type is FPAREN_OPEN log_rule(): Spacing: first->orig_line is , first->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===> second->text() 'n', [WORD/NONE] : rule sp_inside_fparen[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [WORD/NONE] 'n' <==> orig_line is , orig_col is [FPAREN_CLOSE/FUNC_CTOR_VAR] ')' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'n', type is WORD log_rule(): Spacing: first->orig_line is , first->text() is 'n', [WORD/NONE] <===> second->text() ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] : rule sp_inside_fparen[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [FPAREN_CLOSE/FUNC_CTOR_VAR] ')' <==> orig_line is , orig_col is [NEWLINE/NONE] '' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() ')', type is FPAREN_CLOSE -space_col_align(): av is , len is => coldiff is +space_col_align(): av is remove + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [BRACE_OPEN/FUNC_CLASS_DEF] '{' <==> orig_line is , orig_col is [NEWLINE/NONE] '' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() '{', type is BRACE_OPEN -space_col_align(): av is , len is => coldiff is +space_col_align(): av is remove + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [BRACE_CLOSE/FUNC_CLASS_DEF] '}' <==> orig_line is , orig_col is [NEWLINE/NONE] '' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() '}', type is BRACE_CLOSE -space_col_align(): av is , len is => coldiff is +space_col_align(): av is remove + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [DESTRUCTOR/NONE] '~' <==> orig_line is , orig_col is [FUNC_CLASS_DEF/DESTRUCTOR] 'TelegramIndex' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() '~', type is DESTRUCTOR log_rule(): Spacing: first->orig_line is , first->text() is '~', [DESTRUCTOR/NONE] <===> second->text() 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] : rule REMOVE[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is remove + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [FUNC_CLASS_DEF/DESTRUCTOR] 'TelegramIndex' <==> orig_line is , orig_col is [FPAREN_OPEN/FUNC_CLASS_DEF] '(' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'TelegramIndex', type is FUNC_CLASS_DEF log_rule(): Spacing: first->orig_line is , first->text() is 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] <===> second->text() '(', [FPAREN_OPEN/FUNC_CLASS_DEF] : rule sp_func_class_paren[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [FPAREN_OPEN/FUNC_CLASS_DEF] '(' <==> orig_line is , orig_col is [FPAREN_CLOSE/FUNC_CLASS_DEF] ')' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() '(', type is FPAREN_OPEN log_rule(): Spacing: first->orig_line is , first->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===> second->text() ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] : rule sp_inside_fparens[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [FPAREN_CLOSE/FUNC_CLASS_DEF] ')' <==> orig_line is , orig_col is [NEWLINE/NONE] '' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() ')', type is FPAREN_CLOSE -space_col_align(): av is , len is => coldiff is +space_col_align(): av is remove + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [BRACE_OPEN/FUNC_CLASS_DEF] '{' <==> orig_line is , orig_col is [NEWLINE/NONE] '' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() '{', type is BRACE_OPEN -space_col_align(): av is , len is => coldiff is +space_col_align(): av is remove + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [BRACE_CLOSE/FUNC_CLASS_DEF] '}' <==> orig_line is , orig_col is [NEWLINE/NONE] '' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() '}', type is BRACE_CLOSE -space_col_align(): av is , len is => coldiff is +space_col_align(): av is remove + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [QUALIFIER/NONE] 'const' <==> orig_line is , orig_col is [TYPE/NONE] 'char' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'const', type is QUALIFIER log_rule(): Spacing: first->orig_line is , first->text() is 'const', [QUALIFIER/NONE] <===> second->text() 'char', [TYPE/NONE] : rule sp_after_type[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is force + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [TYPE/NONE] 'char' <==> orig_line is , orig_col is [PTR_TYPE/NONE] '*' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'char', type is TYPE log_rule(): Spacing: first->orig_line is , first->text() is 'char', [TYPE/NONE] <===> second->text() '*', [PTR_TYPE/NONE] : rule IGNORE[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [PTR_TYPE/NONE] '*' <==> orig_line is , orig_col is [QUALIFIER/NONE] 'const' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() '*', type is PTR_TYPE log_rule(): Spacing: first->orig_line is , first->text() is '*', [PTR_TYPE/NONE] <===> second->text() 'const', [QUALIFIER/NONE] : rule IGNORE[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is ignore + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [QUALIFIER/NONE] 'const' <==> orig_line is , orig_col is [WORD/NONE] 'pTelName' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'const', type is QUALIFIER log_rule(): Spacing: first->orig_line is , first->text() is 'const', [QUALIFIER/NONE] <===> second->text() 'pTelName', [WORD/NONE] : rule sp_after_type[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is force + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [WORD/NONE] 'pTelName' <==> orig_line is , orig_col is [SEMICOLON/NONE] ';' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'pTelName', type is WORD log_rule(): Spacing: first->orig_line is , first->text() is 'pTelName', [WORD/NONE] <===> second->text() ';', [SEMICOLON/NONE] : rule sp_before_semi[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is remove + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [SEMICOLON/NONE] ';' <==> orig_line is , orig_col is [NEWLINE/NONE] '' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() ';', type is SEMICOLON -space_col_align(): av is , len is => coldiff is +space_col_align(): av is remove + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [TYPE/NONE] 'unsigned' <==> orig_line is , orig_col is [TYPE/NONE] 'long' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'unsigned', type is TYPE log_rule(): Spacing: first->orig_line is , first->text() is 'unsigned', [TYPE/NONE] <===> second->text() 'long', [TYPE/NONE] : rule sp_after_type[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is force + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [TYPE/NONE] 'long' <==> orig_line is , orig_col is [WORD/NONE] 'nTelIndex' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'long', type is TYPE log_rule(): Spacing: first->orig_line is , first->text() is 'long', [TYPE/NONE] <===> second->text() 'nTelIndex', [WORD/NONE] : rule sp_after_type[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is force + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [WORD/NONE] 'nTelIndex' <==> orig_line is , orig_col is [SEMICOLON/NONE] ';' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'nTelIndex', type is WORD log_rule(): Spacing: first->orig_line is , first->text() is 'nTelIndex', [WORD/NONE] <===> second->text() ';', [SEMICOLON/NONE] : rule sp_before_semi[line ] -space_col_align(): av is , len is => coldiff is +space_col_align(): av is remove + len is + => coldiff is space_col_align(): orig_line is , orig_col is , [SEMICOLON/NONE] ';' <==> orig_line is , orig_col is [NEWLINE/NONE] '' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() ';', type is SEMICOLON -space_col_align(): av is , len is => coldiff is +space_col_align(): av is remove + len is + => coldiff is diff --git a/scripts/Output/I-842.txt b/scripts/Output/I-842.txt index eee065d0b1..71b5b7ddd3 100644 --- a/scripts/Output/I-842.txt +++ b/scripts/Output/I-842.txt @@ -1,3 +1,3 @@ Unmatched BRACE_CLOSE -at line=9, column=1 +at orig_line=9, orig_col=1 Try the option 'tok_split_gte = true' diff --git a/scripts/Output/unmatched_close_pp.txt b/scripts/Output/unmatched_close_pp.txt index 86441bb810..88a8cc713b 100644 --- a/scripts/Output/unmatched_close_pp.txt +++ b/scripts/Output/unmatched_close_pp.txt @@ -1,3 +1,3 @@ Unmatched BRACE_CLOSE -at line=11, column=1 +at orig_line=11, orig_col=1 Try the option 'tok_split_gte = true' diff --git a/src/align.cpp b/src/align.cpp index eb09e957c5..c619fd5fdb 100644 --- a/src/align.cpp +++ b/src/align.cpp @@ -708,7 +708,7 @@ chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_c } size_t my_level = first->level; - LOG_FMT(LALASS, "%s(%d): [%zu]: checking %s on line %zu - span=%zu thresh=%zu\n", + LOG_FMT(LALASS, "%s(%d): [my_level is %zu]: start checking with '%s', on orig_line %zu, span is %zu, thresh is %zu\n", __func__, __LINE__, my_level, first->text(), first->orig_line, span, thresh); // If we are aligning on a tabstop, we shouldn't right-align @@ -726,12 +726,16 @@ chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_c chunk_t *pc = first; while (pc != nullptr) { + LOG_FMT(LALASS, "%s(%d): orig_line is %zu, check pc->text() '%s'\n", + __func__, __LINE__, pc->orig_line, pc->text()); // Don't check inside PAREN or SQUARE groups if ( pc->type == CT_SPAREN_OPEN || pc->type == CT_FPAREN_OPEN || pc->type == CT_SQUARE_OPEN || pc->type == CT_PAREN_OPEN) { + LOG_FMT(LALASS, "%s(%d): Don't check inside PAREN or SQUARE groups, type is %s\n", + __func__, __LINE__, get_token_name(pc->type)); tmp = pc->orig_line; pc = chunk_skip_to_match(pc); if (pc != nullptr) @@ -825,7 +829,7 @@ chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_c if (pc != nullptr) { - LOG_FMT(LALASS, "%s(%d): done on %s on line %zu\n", + LOG_FMT(LALASS, "%s(%d): done on '%s' on orig_line %zu\n", __func__, __LINE__, pc->text(), pc->orig_line); } else @@ -1238,14 +1242,14 @@ static chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_co chunk_t *prev = chunk_get_prev_ncnl(start); if (prev != nullptr && prev->type == CT_ASSIGN) { - LOG_FMT(LAVDB, "%s(%d): start=%s [%s] on line %zu (abort due to assign)\n", + LOG_FMT(LAVDB, "%s(%d): start->text() '%s', type is %s, on orig_line %zu (abort due to assign)\n", __func__, __LINE__, start->text(), get_token_name(start->type), start->orig_line); chunk_t *pc = chunk_get_next_type(start, CT_BRACE_CLOSE, start->level); return(chunk_get_next_ncnl(pc)); } - LOG_FMT(LAVDB, "%s(%d): start=%s [%s] on line %zu\n", + LOG_FMT(LAVDB, "%s(%d): start->text() '%s', type is %s, on orig_line %zu\n", __func__, __LINE__, start->text(), get_token_name(start->type), start->orig_line); UINT64 align_mask = PCF_IN_FCN_DEF | PCF_VAR_1ST; @@ -1281,8 +1285,16 @@ static chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_co while ( pc != nullptr && (pc->level >= start->level || pc->level == 0)) { - LOG_FMT(LGUY, "%s(%d): %s orig_line is %zu, orig_col is %zu\n", - __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col); + if (pc->type == CT_NEWLINE) + { + LOG_FMT(LAVDB, "%s(%d): orig_line is %zu, orig_col is %zu, NEWLINE\n", + __func__, __LINE__, pc->orig_line, pc->orig_col); + } + else + { + LOG_FMT(LAVDB, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s'\n", + __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text()); + } if (chunk_is_comment(pc)) { if (pc->nl_count > 0) @@ -1361,10 +1373,14 @@ static chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_co } } + LOG_FMT(LAVDB, "%s(%d): pc->level is %zu, pc->brace_level is %zu\n", + __func__, __LINE__, pc->level, pc->brace_level); // don't align stuff inside parenthesis/squares/angles if (pc->level > pc->brace_level) { pc = chunk_get_next(pc); + LOG_FMT(LAVDB, "%s(%d): pc->orig_line is %zu, pc->orig_col is %zu, pc->text() '%s'\n", + __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text()); continue; } @@ -1374,7 +1390,7 @@ static chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_co && pc->type != CT_FUNC_CLASS_PROTO && ((pc->flags & align_mask) == PCF_VAR_1ST) && ((pc->level == (start->level + 1)) || pc->level == 0) - && pc->prev + && pc->prev != nullptr && pc->prev->type != CT_MEMBER) { if (!did_this_line) @@ -1393,7 +1409,7 @@ static chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_co } pc = prev_local->next; } - LOG_FMT(LAVDB, "%s(%d): add=[%s], orig_line is %zu, orig_col is %zu, level is %zu\n", + LOG_FMT(LAVDB, "%s(%d): add='%s', orig_line is %zu, orig_col is %zu, level is %zu\n", __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col, pc->level); as.Add(step_back_over_member(pc)); @@ -1932,9 +1948,16 @@ static void align_left_shift(void) chunk_t *pc = chunk_get_head(); while (pc != nullptr) { - LOG_FMT(LGUY, "%s(%d): pc->text() %s\n", - __func__, __LINE__, pc->text()); - log_pcf_flags(LINDLINE, pc->flags); + if (pc->type == CT_NEWLINE) + { + LOG_FMT(LAVDB, "%s(%d): NEWLINE\n", __func__, __LINE__); + } + else + { + LOG_FMT(LAVDB, "%s(%d): pc->text() '%s'\n", + __func__, __LINE__, pc->text()); + log_pcf_flags(LINDLINE, pc->flags); + } if ( start != nullptr && ((pc->flags & PCF_IN_PREPROC) != (start->flags & PCF_IN_PREPROC))) { @@ -1965,7 +1988,6 @@ static void align_left_shift(void) else if ( (!(pc->flags & PCF_IN_ENUM) && !(pc->flags & PCF_IN_TYPEDEF)) && chunk_is_str(pc, "<<", 2)) { - LOG_FMT(LGUY, "%s(%d): TEST GUY\n", __func__, __LINE__); log_pcf_flags(LINDLINE, pc->flags); if (pc->parent_type == CT_OPERATOR) { diff --git a/src/align_stack.cpp b/src/align_stack.cpp index c8bf309281..7ff4d51abd 100644 --- a/src/align_stack.cpp +++ b/src/align_stack.cpp @@ -297,14 +297,18 @@ void AlignStack::NewLines(size_t cnt) m_seqnum += cnt; if (m_seqnum > (m_nl_seqnum + m_span)) { - LOG_FMT(LAS, "Newlines<%zu>-", cnt); + LOG_FMT(LAS, "Newlines(%d): cnt is %zu, -\n", __LINE__, cnt); Flush(); } else { - LOG_FMT(LAS, "Newlines<%zu>\n", cnt); + LOG_FMT(LAS, "Newlines(%d): cnt is %zu\n", __LINE__, cnt); } } + else + { + LOG_FMT(LAS, "Newlines(%d): is empty\n", __LINE__); + } } @@ -314,8 +318,9 @@ void AlignStack::Flush() const ChunkStack::Entry *ce = nullptr; chunk_t *pc; - LOG_FMT(LAS, "%s: m_aligned.Len()=%zu\n", __func__, m_aligned.Len()); - LOG_FMT(LAS, "Flush (min=%zu, max=%zu)\n", m_min_col, m_max_col); + LOG_FMT(LAS, "%s(%d): m_aligned.Len() is %zu\n", __func__, __LINE__, m_aligned.Len()); + LOG_FMT(LAS, " (min is %zu, max is %zu)\n", m_min_col, m_max_col); + if (m_aligned.Len() == 1) { // check if we have *one* typedef in the line @@ -390,8 +395,8 @@ void AlignStack::Flush() m_max_col = align_tab_column(m_max_col); } - LOG_FMT(LAS, "%s: m_aligned.Len()=%zu\n", - __func__, m_aligned.Len()); + LOG_FMT(LAS, "%s(%d): m_aligned.Len() is %zu\n", + __func__, __LINE__, m_aligned.Len()); for (size_t idx = 0; idx < m_aligned.Len(); idx++) { ce = m_aligned.Get(idx); @@ -402,8 +407,8 @@ void AlignStack::Flush() { if (m_skip_first && pc->column != tmp_col) { - LOG_FMT(LAS, "%s: %zu:%zu dropping first item due to skip_first\n", - __func__, pc->orig_line, pc->orig_col); + LOG_FMT(LAS, "%s(%d): orig_line is %zu, orig_col is %zu, dropping first item due to skip_first\n", + __func__, __LINE__, pc->orig_line, pc->orig_col); m_skip_first = false; m_aligned.Pop_Front(); Flush(); @@ -420,8 +425,8 @@ void AlignStack::Flush() pc->align.next = m_aligned.GetChunk(idx + 1); // Indent the token, taking col_adj into account - LOG_FMT(LAS, "%s: line %zu: '%s' to col %zu (adj=%d)\n", - __func__, pc->orig_line, pc->text(), tmp_col, pc->align.col_adj); + LOG_FMT(LAS, "%s(%d): orig_line is %zu, text() '%s', to col %zu (adj is %d)\n", + __func__, __LINE__, pc->orig_line, pc->text(), tmp_col, pc->align.col_adj); align_to_column(pc, tmp_col); } diff --git a/src/brace_cleanup.cpp b/src/brace_cleanup.cpp index f5550fbe98..10c2f506ac 100644 --- a/src/brace_cleanup.cpp +++ b/src/brace_cleanup.cpp @@ -329,7 +329,7 @@ static void parse_cleanup(parse_frame_t *frm, chunk_t *pc) { LOG_FUNC_ENTRY(); - LOG_FMT(LTOK, "%s(%d): orig_line is %zu, type is %s, tos is %zu, type is %s, TOS.stage is %u\n", + LOG_FMT(LTOK, "%s(%d): orig_line is %zu, type is %s, tos is %zu, TOS.type is %s, TOS.stage is %u\n", __func__, __LINE__, pc->orig_line, get_token_name(pc->type), frm->pse_tos, get_token_name(frm->pse[frm->pse_tos].type), (unsigned int)frm->pse[frm->pse_tos].stage); @@ -343,7 +343,7 @@ static void parse_cleanup(parse_frame_t *frm, chunk_t *pc) && !chunk_is_str(pc, "]", 1)) { chunk_flags_set(pc, PCF_EXPR_START | ((frm->stmt_count == 0) ? PCF_STMT_START : 0)); - LOG_FMT(LSTMT, "%s(%d): orig_line is %zu, 1.marked %s as %s, start st is %d, ex is %d\n", + LOG_FMT(LSTMT, "%s(%d): orig_line is %zu, 1.marked '%s' as %s, start stmt_count is %d, expr_count is %d\n", __func__, __LINE__, pc->orig_line, pc->text(), (pc->flags & PCF_STMT_START) ? "stmt" : "expr", frm->stmt_count, frm->expr_count); } @@ -431,7 +431,7 @@ static void parse_cleanup(parse_frame_t *frm, chunk_t *pc) if ( (frm->pse[frm->pse_tos].type != CT_NONE) && (frm->pse[frm->pse_tos].type != CT_PP_DEFINE)) { - LOG_FMT(LWARN, "%s(%d): %s:%zu Error: Unexpected '%s' for '%s', which was on line %zu\n", + LOG_FMT(LWARN, "%s(%d): %s, orig_line is %zu, Error: Unexpected '%s' for '%s', which was on line %zu\n", __func__, __LINE__, cpd.filename, pc->orig_line, pc->text(), get_token_name(frm->pse[frm->pse_tos].pc->type), frm->pse[frm->pse_tos].pc->orig_line); @@ -652,7 +652,7 @@ static void parse_cleanup(parse_frame_t *frm, chunk_t *pc) && frm->pse[frm->pse_tos].type != CT_FPAREN_OPEN && frm->pse[frm->pse_tos].type != CT_SPAREN_OPEN)) { - LOG_FMT(LSTMT, "%s(%d): orig_line is %zu, reset1 stmt on %s\n", + LOG_FMT(LSTMT, "%s(%d): orig_line is %zu, reset1 stmt on '%s'\n", __func__, __LINE__, pc->orig_line, pc->text()); frm->stmt_count = 0; frm->expr_count = 0; @@ -688,7 +688,7 @@ static void parse_cleanup(parse_frame_t *frm, chunk_t *pc) || pc->type == CT_QUESTION) { frm->expr_count = 0; - LOG_FMT(LSTMT, "%s(%d): %zu> reset expr on %s\n", + LOG_FMT(LSTMT, "%s(%d): orig_line is %zu, reset expr on '%s'\n", __func__, __LINE__, pc->orig_line, pc->text()); } else if (pc->type == CT_BRACE_CLOSE) @@ -702,12 +702,12 @@ static void parse_cleanup(parse_frame_t *frm, chunk_t *pc) char *outputMessage; if (cpd.settings[UO_tok_split_gte].b) { - outputMessage = make_message("Unmatched BRACE_CLOSE\nat line=%zu, column=%zu\n", + outputMessage = make_message("Unmatched BRACE_CLOSE\nat orig_line=%zu, orig_col=%zu\n", pc->orig_line, pc->orig_col); } else { - outputMessage = make_message("Unmatched BRACE_CLOSE\nat line=%zu, column=%zu\nTry the option 'tok_split_gte = true'\n", + outputMessage = make_message("Unmatched BRACE_CLOSE\nat orig_line=%zu, orig_col=%zu\nTry the option 'tok_split_gte = true'\n", pc->orig_line, pc->orig_col); } fprintf(stderr, "%s", outputMessage); @@ -830,8 +830,8 @@ static bool check_complex_statements(parse_frame_t *frm, chunk_t *pc) return(true); } - LOG_FMT(LWARN, "%s:%zu Error: Expected 'while', got '%s'\n", - cpd.filename, pc->orig_line, pc->text()); + LOG_FMT(LWARN, "%s(%d): %s, orig_line is %zu, Error: Expected 'while', got '%s'\n", + __func__, __LINE__, cpd.filename, pc->orig_line, pc->text()); frm->pse_tos--; print_stack(LBCSPOP, "-Error ", frm, pc); cpd.error_count++; @@ -871,7 +871,8 @@ static bool check_complex_statements(parse_frame_t *frm, chunk_t *pc) pc->flags |= PCF_STMT_START | PCF_EXPR_START; frm->stmt_count = 1; frm->expr_count = 1; - LOG_FMT(LSTMT, "%zu] 2.marked %s as stmt start\n", pc->orig_line, pc->text()); + LOG_FMT(LSTMT, "%s(%d): orig_line is %zu, 2.marked '%s' as stmt start\n", + __func__, __LINE__, pc->orig_line, pc->text()); } } @@ -880,8 +881,8 @@ static bool check_complex_statements(parse_frame_t *frm, chunk_t *pc) && ( (frm->pse[frm->pse_tos].stage == brace_stage_e::PAREN1) || (frm->pse[frm->pse_tos].stage == brace_stage_e::WOD_PAREN))) { - LOG_FMT(LWARN, "%s:%zu Error: Expected '(', got '%s' for '%s'\n", - cpd.filename, pc->orig_line, pc->text(), + LOG_FMT(LWARN, "%s(%d): %s, orig_line is %zu, Error: Expected '(', got '%s' for '%s'\n", + __func__, __LINE__, cpd.filename, pc->orig_line, pc->text(), get_token_name(frm->pse[frm->pse_tos].type)); // Throw out the complex statement @@ -952,8 +953,8 @@ static bool handle_complex_close(parse_frame_t *frm, chunk_t *pc) } else { - LOG_FMT(LNOTE, "%s: close_statement on %s brace_stage_e::BRACE2\n", __func__, - get_token_name(frm->pse[frm->pse_tos].type)); + LOG_FMT(LNOTE, "%s(%d): close_statement on %s brace_stage_e::BRACE2\n", + __func__, __LINE__, get_token_name(frm->pse[frm->pse_tos].type)); frm->pse_tos--; print_stack(LBCSPOP, "-HCC B2 ", frm, pc); if (close_statement(frm, pc)) @@ -968,15 +969,15 @@ static bool handle_complex_close(parse_frame_t *frm, chunk_t *pc) } else if (frm->pse[frm->pse_tos].stage == brace_stage_e::WOD_PAREN) { - LOG_FMT(LNOTE, "%s: close_statement on %s brace_stage_e::WOD_PAREN\n", __func__, - get_token_name(frm->pse[frm->pse_tos].type)); + LOG_FMT(LNOTE, "%s(%d): close_statement on %s brace_stage_e::WOD_PAREN\n", + __func__, __LINE__, get_token_name(frm->pse[frm->pse_tos].type)); frm->pse[frm->pse_tos].stage = brace_stage_e::WOD_SEMI; print_stack(LBCSPOP, "-HCC WoDP ", frm, pc); } else if (frm->pse[frm->pse_tos].stage == brace_stage_e::WOD_SEMI) { - LOG_FMT(LNOTE, "%s: close_statement on %s brace_stage_e::WOD_SEMI\n", __func__, - get_token_name(frm->pse[frm->pse_tos].type)); + LOG_FMT(LNOTE, "%s(%d): close_statement on %s brace_stage_e::WOD_SEMI\n", + __func__, __LINE__, get_token_name(frm->pse[frm->pse_tos].type)); frm->pse_tos--; print_stack(LBCSPOP, "-HCC WoDS ", frm, pc); @@ -988,8 +989,8 @@ static bool handle_complex_close(parse_frame_t *frm, chunk_t *pc) else { // PROBLEM - LOG_FMT(LWARN, "%s:%zu Error: TOS.type='%s' TOS.stage=%u\n", - cpd.filename, pc->orig_line, + LOG_FMT(LWARN, "%s(%d): %s:%zu Error: TOS.type='%s' TOS.stage=%u\n", + __func__, __LINE__, cpd.filename, pc->orig_line, get_token_name(frm->pse[frm->pse_tos].type), (unsigned int)frm->pse[frm->pse_tos].stage); cpd.error_count++; @@ -1063,8 +1064,8 @@ bool close_statement(parse_frame_t *frm, chunk_t *pc) LOG_FUNC_ENTRY(); chunk_t *vbc = pc; - LOG_FMT(LTOK, "%s:%zu] %s '%s' type %s stage %u\n", __func__, - pc->orig_line, + LOG_FMT(LTOK, "%s(%d): orig_line is %zu, type is %s, '%s' type is %s, stage is %u\n", + __func__, __LINE__, pc->orig_line, get_token_name(pc->type), pc->text(), get_token_name(frm->pse[frm->pse_tos].type), (unsigned int)frm->pse[frm->pse_tos].stage); @@ -1073,8 +1074,8 @@ bool close_statement(parse_frame_t *frm, chunk_t *pc) { frm->stmt_count = 0; frm->expr_count = 0; - LOG_FMT(LSTMT, "%s: %zu> reset2 stmt on %s\n", - __func__, pc->orig_line, pc->text()); + LOG_FMT(LSTMT, "%s(%d): orig_line is %zu> reset2 stmt on '%s'\n", + __func__, __LINE__, pc->orig_line, pc->text()); } /* diff --git a/src/combine.cpp b/src/combine.cpp index 31d6ac8d2d..62f8ee188d 100644 --- a/src/combine.cpp +++ b/src/combine.cpp @@ -3333,8 +3333,8 @@ static void fix_fcn_def_params(chunk_t *start) return; } - LOG_FMT(LFCNP, "%s: %s [%s] on line %zu, level %zu\n", - __func__, start->text(), get_token_name(start->type), start->orig_line, start->level); + LOG_FMT(LFCNP, "%s(%d): text() '%s', type is [%s], on orig_line %zu, level is %zu\n", + __func__, __LINE__, start->text(), get_token_name(start->type), start->orig_line, start->level); while (start != nullptr && !chunk_is_paren_open(start)) { @@ -3357,13 +3357,13 @@ static void fix_fcn_def_params(chunk_t *start) if ( ((start->len() == 1) && (start->str[0] == ')')) || pc->level < level) { - LOG_FMT(LFCNP, "%s: bailed on %s on line %zu\n", - __func__, pc->text(), pc->orig_line); + LOG_FMT(LFCNP, "%s(%d): bailed on '%s', on orig_line %zu\n", + __func__, __LINE__, pc->text(), pc->orig_line); break; } - LOG_FMT(LFCNP, "%s: %s %s on line %zu, level %zu\n", - __func__, (pc->level > level) ? "skipping" : "looking at", + LOG_FMT(LFCNP, "%s(%d): %s '%s' on orig_line %zu, level %zu\n", + __func__, __LINE__, (pc->level > level) ? "skipping" : "looking at", pc->text(), pc->orig_line, pc->level); if (pc->level > level) @@ -3519,13 +3519,13 @@ static chunk_t *fix_var_def(chunk_t *start) return(skip_to_next_statement(end)); } - LOG_FMT(LFVD2, "%s:%zu TYPE : ", __func__, start->orig_line); + LOG_FMT(LFVD2, "%s(%d):%zu TYPE : ", __func__, __LINE__, start->orig_line); for (size_t idxForCs = 0; idxForCs < cs.Len() - 1; idxForCs++) { tmp_pc = cs.Get(idxForCs)->m_pc; make_type(tmp_pc); chunk_flags_set(tmp_pc, PCF_VAR_TYPE); - LOG_FMT(LFVD2, " %s[%s]", tmp_pc->text(), get_token_name(tmp_pc->type)); + LOG_FMT(LFVD2, " '%s'[%s]", tmp_pc->text(), get_token_name(tmp_pc->type)); } LOG_FMT(LFVD2, "\n"); @@ -3584,8 +3584,8 @@ static chunk_t *mark_variable_definition(chunk_t *start) chunk_t *pc = start; size_t flags = PCF_VAR_1ST_DEF; - LOG_FMT(LVARDEF, "%s: line %zu, col %zu '%s' type %s\n", - __func__, pc->orig_line, pc->orig_col, pc->text(), + LOG_FMT(LVARDEF, "%s(%d): orig_line %zu, orig_col %zu, text() '%s', type is %s\n", + __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type)); pc = start; @@ -3601,8 +3601,8 @@ static chunk_t *mark_variable_definition(chunk_t *start) } flags &= ~PCF_VAR_1ST; - LOG_FMT(LVARDEF, "%s:%zu marked '%s'[%s] in col %zu flags: %#" PRIx64 " -> %#" PRIx64 "\n", - __func__, pc->orig_line, pc->text(), + LOG_FMT(LVARDEF, "%s(%d): orig_line is %zu, marked text() '%s'[%s] in orig_col %zu, flags: %#" PRIx64 " -> %#" PRIx64 "\n", + __func__, __LINE__, pc->orig_line, pc->text(), get_token_name(pc->type), pc->orig_col, flg, pc->flags); } else if (chunk_is_star(pc) || chunk_is_msref(pc)) @@ -3938,9 +3938,9 @@ static void mark_function(chunk_t *pc) if (paren_open == nullptr || paren_close == nullptr) { #ifdef DEBUG - LOG_FMT(LFCN, "(%d) ", __LINE__); + LOG_FMT(LFCN, "%s(%d) ", __func__, __LINE__); #endif - LOG_FMT(LFCN, "No parens found for [%s] on line %zu col %zu\n", + LOG_FMT(LFCN, "No parens found for [%s] on orig_line %zu, orig_col %zu\n", pc->text(), pc->orig_line, pc->orig_col); return; } @@ -3994,26 +3994,26 @@ static void mark_function(chunk_t *pc) if (tmp2) { #ifdef DEBUG - LOG_FMT(LFCN, "(%d) ", __LINE__); + LOG_FMT(LFCN, "%s(%d): ", __func__, __LINE__); #endif - LOG_FMT(LFCN, "%s: [%zu/%zu] function variable [%s], changing [%s] into a type\n", - __func__, pc->orig_line, pc->orig_col, tmp2->text(), pc->text()); + LOG_FMT(LFCN, "[%zu/%zu] function variable [%s], changing [%s] into a type\n", + pc->orig_line, pc->orig_col, tmp2->text(), pc->text()); set_chunk_type(tmp2, CT_FUNC_VAR); flag_parens(paren_open, 0, CT_PAREN_OPEN, CT_FUNC_VAR, false); #ifdef DEBUG - LOG_FMT(LFCN, "(%d) ", __LINE__); + LOG_FMT(LFCN, "%s(%d): ", __func__, __LINE__); #endif - LOG_FMT(LFCN, "%s: paren open @ %zu:%zu\n", - __func__, paren_open->orig_line, paren_open->orig_col); + LOG_FMT(LFCN, "paren open @ %zu:%zu\n", + paren_open->orig_line, paren_open->orig_col); } else { #ifdef DEBUG - LOG_FMT(LFCN, "(%d) ", __LINE__); + LOG_FMT(LFCN, "%s(%d): ", __func__, __LINE__); #endif - LOG_FMT(LFCN, "%s: [%zu/%zu] function type, changing [%s] into a type\n", - __func__, pc->orig_line, pc->orig_col, pc->text()); + LOG_FMT(LFCN, "[%zu/%zu] function type, changing [%s] into a type\n", + pc->orig_line, pc->orig_col, pc->text()); if (tmp2) { set_chunk_type(tmp2, CT_FUNC_TYPE); @@ -4034,16 +4034,16 @@ static void mark_function(chunk_t *pc) } #ifdef DEBUG - LOG_FMT(LFCN, "(%d) ", __LINE__); + LOG_FMT(LFCN, "%s(%d): ", __func__, __LINE__); #endif - LOG_FMT(LFCN, "%s: chained function calls? [%zu.%zu] [%s]\n", - __func__, pc->orig_line, pc->orig_col, pc->text()); + LOG_FMT(LFCN, "chained function calls? [%zu.%zu] [%s]\n", + pc->orig_line, pc->orig_col, pc->text()); } // Assume it is a function call if not already labeled if (pc->type == CT_FUNCTION) { - LOG_FMT(LFCN, "%s(%d): examine [%zu.%zu] [%s], type %s\n", + LOG_FMT(LFCN, "%s(%d): examine [%zu.%zu] [%s], type is %s\n", __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type)); // look for an assigment. Issue 575 chunk_t *temp = chunk_get_next_type(pc, CT_ASSIGN, pc->level); @@ -4093,7 +4093,7 @@ static void mark_function(chunk_t *pc) if (pc->str.equals(prev->str)) { set_chunk_type(pc, CT_FUNC_CLASS_DEF); - LOG_FMT(LFCN, "%s(%d) %zu:%zu - FOUND %sSTRUCTOR for %s[%s]\n", + LOG_FMT(LFCN, "%s(%d): %zu:%zu - FOUND %sSTRUCTOR for %s[%s]\n", __func__, __LINE__, prev->orig_line, prev->orig_col, (destr != NULL) ? "DE" : "CON", @@ -4304,7 +4304,7 @@ static void mark_function(chunk_t *pc) if (pc->type != CT_FUNC_DEF) { #ifdef DEBUG - LOG_FMT(LFCN, "%s(%d) ", __func__, __LINE__); + LOG_FMT(LFCN, "%s(%d): ", __func__, __LINE__); #endif LOG_FMT(LFCN, " Detected %s '%s' on line %zu col %zu\n", get_token_name(pc->type), @@ -4354,7 +4354,7 @@ static void mark_function(chunk_t *pc) semi = tmp; set_chunk_type(pc, CT_FUNC_PROTO); #ifdef DEBUG - LOG_FMT(LFCN, "%s(%d) ", __func__, __LINE__); + LOG_FMT(LFCN, "%s(%d): ", __func__, __LINE__); #endif LOG_FMT(LFCN, " 2) Marked [%s] as FUNC_PROTO on line %zu col %zu\n", pc->text(), pc->orig_line, pc->orig_col); @@ -4364,7 +4364,7 @@ static void mark_function(chunk_t *pc) { set_chunk_type(pc, CT_FUNC_CTOR_VAR); #ifdef DEBUG - LOG_FMT(LFCN, "%s(%d) ", __func__, __LINE__); + LOG_FMT(LFCN, "%s(%d): ", __func__, __LINE__); #endif LOG_FMT(LFCN, " 2) Marked [%s] as FUNC_CTOR_VAR on line %zu col %zu\n", pc->text(), pc->orig_line, pc->orig_col); @@ -4430,7 +4430,7 @@ static void mark_function(chunk_t *pc) { set_chunk_type(pc, CT_FUNC_CTOR_VAR); #ifdef DEBUG - LOG_FMT(LFCN, "%s(%d) ", __func__, __LINE__); + LOG_FMT(LFCN, "%s(%d): ", __func__, __LINE__); #endif LOG_FMT(LFCN, " 3) Marked [%s] as FUNC_CTOR_VAR on line %zu col %zu\n", pc->text(), pc->orig_line, pc->orig_col); @@ -4535,7 +4535,7 @@ static void mark_cpp_constructor(chunk_t *pc) is_destr = true; } - LOG_FMT(LFTOR, "%s(%d): %zu:%zu FOUND %sSTRUCTOR for %s[%s] prev=%s[%s]", + LOG_FMT(LFTOR, "%s(%d): %zu:%zu FOUND %sSTRUCTOR for '%s'[%s] prev=%s[%s]", __func__, __LINE__, pc->orig_line, pc->orig_col, is_destr ? "DE" : "CON", pc->text(), get_token_name(pc->type), @@ -4626,8 +4626,8 @@ static void mark_class_ctor(chunk_t *start) if (pc == nullptr) { - LOG_FMT(LFTOR, "%s: Called on %s on line %zu. Bailed on NULL\n", - __func__, pclass->text(), pclass->orig_line); + LOG_FMT(LFTOR, "%s(%d): Called on %s on line %zu. Bailed on NULL\n", + __func__, __LINE__, pclass->text(), pclass->orig_line); return; } @@ -4635,8 +4635,8 @@ static void mark_class_ctor(chunk_t *start) ChunkStack cs; cs.Push_Back(pclass); - LOG_FMT(LFTOR, "%s: Called on %s on line %zu (next='%s')\n", - __func__, pclass->text(), pclass->orig_line, pc->text()); + LOG_FMT(LFTOR, "%s(%d): Called on %s on line %zu (next='%s')\n", + __func__, __LINE__, pclass->text(), pclass->orig_line, pc->text()); // detect D template class: "class foo(x) { ... }" if (next != nullptr) // Coverity CID 76004 @@ -4663,14 +4663,14 @@ static void mark_class_ctor(chunk_t *start) { set_chunk_type(pc, CT_CLASS_COLON); flags |= PCF_IN_CLASS_BASE; - LOG_FMT(LFTOR, "%s: class colon on line %zu\n", - __func__, pc->orig_line); + LOG_FMT(LFTOR, "%s(%d): class colon on line %zu\n", + __func__, __LINE__, pc->orig_line); } if (chunk_is_semicolon(pc)) { - LOG_FMT(LFTOR, "%s: bailed on semicolon on line %zu\n", - __func__, pc->orig_line); + LOG_FMT(LFTOR, "%s(%d): bailed on semicolon on line %zu\n", + __func__, __LINE__, pc->orig_line); return; } chunk_flags_set(pc, flags); @@ -4679,7 +4679,7 @@ static void mark_class_ctor(chunk_t *start) if (pc == nullptr) { - LOG_FMT(LFTOR, "%s: bailed on NULL\n", __func__); + LOG_FMT(LFTOR, "%s(%d): bailed on NULL\n", __func__, __LINE__); return; } @@ -4700,7 +4700,7 @@ static void mark_class_ctor(chunk_t *start) if (pc->type == CT_BRACE_CLOSE && pc->brace_level < level) { - LOG_FMT(LFTOR, "%s: %zu] Hit brace close\n", __func__, pc->orig_line); + LOG_FMT(LFTOR, "%s(%d): %zu] Hit brace close\n", __func__, __LINE__, pc->orig_line); pc = chunk_get_next_ncnl(pc, scope_e::PREPROC); if (pc && pc->type == CT_SEMICOLON) { @@ -4716,7 +4716,7 @@ static void mark_class_ctor(chunk_t *start) if (next != nullptr && next->type == CT_PAREN_OPEN) { set_chunk_type(pc, CT_FUNC_CLASS_DEF); - LOG_FMT(LFTOR, "%s(%d): type is %s, orig_line is %zu, orig_col is %zu, Marked CTor/DTor %s\n", + LOG_FMT(LFTOR, "%s(%d): type is %s, orig_line is %zu, orig_col is %zu, Marked CTor/DTor '%s'\n", __func__, __LINE__, get_token_name(pc->type), pc->orig_line, pc->orig_col, pc->text()); mark_cpp_constructor(pc); } @@ -5200,8 +5200,8 @@ static void mark_template_func(chunk_t *pc, chunk_t *pc_next) { if (angle_close->flags & PCF_IN_FCN_CALL) { - LOG_FMT(LTEMPFUNC, "%s: marking '%s' in line %zu as a FUNC_CALL\n", - __func__, pc->text(), pc->orig_line); + LOG_FMT(LTEMPFUNC, "%s(%d): marking '%s' in line %zu as a FUNC_CALL\n", + __func__, __LINE__, pc->text(), pc->orig_line); set_chunk_type(pc, CT_FUNC_CALL); flag_parens(after, PCF_IN_FCN_CALL, CT_FPAREN_OPEN, CT_FUNC_CALL, false); } @@ -5215,8 +5215,8 @@ static void mark_template_func(chunk_t *pc, chunk_t *pc_next) * std::pair(*it, double(*it) + 1.0)); */ - LOG_FMT(LTEMPFUNC, "%s: marking '%s' in line %zu as a FUNC_CALL 2\n", - __func__, pc->text(), pc->orig_line); + LOG_FMT(LTEMPFUNC, "%s(%d): marking '%s' in line %zu as a FUNC_CALL 2\n", + __func__, __LINE__, pc->text(), pc->orig_line); // its a function!!! set_chunk_type(pc, CT_FUNC_CALL); mark_function(pc); @@ -5346,8 +5346,8 @@ static void handle_oc_class(chunk_t *pc) int generic_level = 0; // level of depth of generic angle_state_e as = angle_state_e::NONE; - LOG_FMT(LOCCLASS, "%s: start [%s] [%s] line %zu\n", - __func__, pc->text(), get_token_name(pc->parent_type), pc->orig_line); + LOG_FMT(LOCCLASS, "%s(%d): start [%s] [%s] line %zu\n", + __func__, __LINE__, pc->text(), get_token_name(pc->parent_type), pc->orig_line); if (pc->parent_type == CT_OC_PROTOCOL) { @@ -5355,7 +5355,7 @@ static void handle_oc_class(chunk_t *pc) if (chunk_is_semicolon(tmp)) { set_chunk_parent(tmp, pc->parent_type); - LOG_FMT(LOCCLASS, "%s: bail on semicolon\n", __func__); + LOG_FMT(LOCCLASS, "%s(%d): bail on semicolon\n", __func__, __LINE__); return; } } @@ -5363,8 +5363,8 @@ static void handle_oc_class(chunk_t *pc) tmp = pc; while ((tmp = chunk_get_next_nnl(tmp)) != nullptr) { - LOG_FMT(LOCCLASS, "%s: %zu [%s]\n", - __func__, tmp->orig_line, tmp->text()); + LOG_FMT(LOCCLASS, "%s(%d): orig_line is %zu, [%s]\n", + __func__, __LINE__, tmp->orig_line, tmp->text()); if (tmp->type == CT_OC_END) { @@ -5490,17 +5490,18 @@ static void handle_oc_block_literal(chunk_t *pc) * block literal: '^ RTYPE ( ARGS ) { }' * RTYPE and ARGS are optional */ - LOG_FMT(LOCBLK, "%s: block literal @ %zu:%zu\n", __func__, pc->orig_line, pc->orig_col); + LOG_FMT(LOCBLK, "%s(%d): block literal @ orig_line is %zu, orig_col is %zu\n", + __func__, __LINE__, pc->orig_line, pc->orig_col); chunk_t *apo = nullptr; // arg paren open chunk_t *bbo = nullptr; // block brace open chunk_t *bbc; // block brace close - LOG_FMT(LOCBLK, "%s: + scan", __func__); + LOG_FMT(LOCBLK, "%s(%d): + scan", __func__, __LINE__); chunk_t *tmp; for (tmp = next; tmp; tmp = chunk_get_next_ncnl(tmp)) { - LOG_FMT(LOCBLK, " %s", tmp->text()); + LOG_FMT(LOCBLK, " '%s'", tmp->text()); if (tmp->level < pc->level || tmp->type == CT_SEMICOLON) { LOG_FMT(LOCBLK, "[DONE]"); @@ -5542,7 +5543,7 @@ static void handle_oc_block_literal(chunk_t *pc) chunk_t *apc = chunk_skip_to_match(apo); // arg parenthesis close if (chunk_is_paren_close(apc)) { - LOG_FMT(LOCBLK, " -- marking parens @ %zu:%zu and %zu:%zu\n", + LOG_FMT(LOCBLK, " -- marking parens @ apo->orig_line is %zu, apo->orig_col is %zu and apc->orig_line is %zu, apc->orig_col is %zu\n", apo->orig_line, apo->orig_col, apc->orig_line, apc->orig_col); flag_parens(apo, PCF_OC_ATYPE, CT_FPAREN_OPEN, CT_OC_BLOCK_EXPR, true); fix_fcn_def_params(apo); @@ -5579,8 +5580,8 @@ static void handle_oc_block_type(chunk_t *pc) if (pc->flags & PCF_IN_TYPEDEF) { - LOG_FMT(LOCBLK, "%s: skip block type @ %zu:%zu -- in typedef\n", - __func__, pc->orig_line, pc->orig_col); + LOG_FMT(LOCBLK, "%s(%d): skip block type @ orig_line is %zu, orig_col is %zu, -- in typedef\n", + __func__, __LINE__, pc->orig_line, pc->orig_col); return; } @@ -5628,8 +5629,8 @@ static void handle_oc_block_type(chunk_t *pc) set_chunk_type(nam, CT_FUNC_TYPE); pt = CT_FUNC_TYPE; } - LOG_FMT(LOCBLK, "%s: block type @ %zu:%zu (%s)[%s]\n", - __func__, pc->orig_line, pc->orig_col, nam->text(), get_token_name(nam->type)); + LOG_FMT(LOCBLK, "%s(%d): block type @ orig_line is %zu, orig_col is %zu, text() '%s'[%s]\n", + __func__, __LINE__, pc->orig_line, pc->orig_col, nam->text(), get_token_name(nam->type)); set_chunk_type(pc, CT_PTR_TYPE); set_chunk_parent(pc, pt); //CT_OC_BLOCK_TYPE; set_chunk_type(tpo, CT_TPAREN_OPEN); @@ -5711,7 +5712,8 @@ static void handle_oc_message_decl(chunk_t *pc) set_chunk_type(pc, CT_OC_SCOPE); set_chunk_parent(pc, pt); - LOG_FMT(LOCMSGD, "%s: %s @ %zu:%zu -", __func__, get_token_name(pt), pc->orig_line, pc->orig_col); + LOG_FMT(LOCMSGD, "%s(%d): %s @ orig_line is %zu, orig_col is %zu -", + __func__, __LINE__, get_token_name(pt), pc->orig_line, pc->orig_col); // format: -(TYPE) NAME [: (TYPE)NAME @@ -5764,7 +5766,8 @@ static void handle_oc_message_decl(chunk_t *pc) tmp = handle_oc_md_type(pc, pt, PCF_OC_ATYPE, did_it); if (!did_it) { - LOG_FMT(LWARN, "%s: %zu:%zu expected type\n", __func__, pc->orig_line, pc->orig_col); + LOG_FMT(LWARN, "%s(%d): orig_line is %zu, orig_col is %zu expected type\n", + __func__, __LINE__, pc->orig_line, pc->orig_col); break; } pc = tmp; @@ -5881,7 +5884,8 @@ static void handle_oc_message_send(chunk_t *os) return; } - LOG_FMT(LOCMSG, "%s: line %zu, col %zu\n", __func__, os->orig_line, os->orig_col); + LOG_FMT(LOCMSG, "%s(%d): orig_line is %zu, orig_col is %zu\n", + __func__, __LINE__, os->orig_line, os->orig_col); chunk_t *tmp = chunk_get_next_ncnl(cs); if (chunk_is_semicolon(tmp)) @@ -5904,8 +5908,8 @@ static void handle_oc_message_send(chunk_t *os) && tmp->type != CT_TYPE && tmp->type != CT_STRING) { - LOG_FMT(LOCMSG, "%s: %zu:%zu expected identifier, not '%s' [%s]\n", - __func__, tmp->orig_line, tmp->orig_col, + LOG_FMT(LOCMSG, "%s(%d): orig_line is %zu, orig_col is %zu, expected identifier, not '%s' [%s]\n", + __func__, __LINE__, tmp->orig_line, tmp->orig_col, tmp->text(), get_token_name(tmp->type)); return; } @@ -6318,7 +6322,8 @@ void remove_extra_returns(void) && ( cl_br->parent_type == CT_FUNC_DEF || cl_br->parent_type == CT_FUNC_CLASS_DEF)) { - LOG_FMT(LRMRETURN, "Removed 'return;' on line %zu\n", pc->orig_line); + LOG_FMT(LRMRETURN, "%s(%d): Removed 'return;' on orig_line %zu\n", + __func__, __LINE__, pc->orig_line); chunk_del(pc); chunk_del(semi); pc = cl_br; diff --git a/src/indent.cpp b/src/indent.cpp index 8722143a85..aabe667262 100644 --- a/src/indent.cpp +++ b/src/indent.cpp @@ -279,10 +279,11 @@ void align_to_column(chunk_t *pc, size_t column) ? pc->column + col_delta : 0; pc->column = max(pc->column, min_col); } - LOG_FMT(LINDLINED, " %s set column of %s on line %zu to col %zu (orig %zu)\n", + LOG_FMT(LINDLINED, "%s(%d): %s set column of '%s', type is %s, orig_line is %zu, to col %zu (orig_col was %zu)\n", + __func__, __LINE__, (almod == align_mode_e::KEEP_ABS) ? "abs" : (almod == align_mode_e::KEEP_REL) ? "rel" : "sft", - get_token_name(pc->type), pc->orig_line, pc->column, pc->orig_col); + pc->text(), get_token_name(pc->type), pc->orig_line, pc->column, pc->orig_col); } while (pc != nullptr && pc->nl_count == 0); } // align_to_column diff --git a/src/space.cpp b/src/space.cpp index 4e2ef7dc2f..8ecddb85da 100644 --- a/src/space.cpp +++ b/src/space.cpp @@ -2269,25 +2269,16 @@ size_t space_col_align(chunk_t *first, chunk_t *second) int min_sp; argval_t av = do_space(first, second, min_sp); - LOG_FMT(LSPACE, "%s(%d): av is %d, ", __func__, __LINE__, av); -#ifdef DEBUG - LOG_FMT(LSPACE, "\n"); -#endif + LOG_FMT(LSPACE, "%s(%d): av is %s\n", __func__, __LINE__, argval_to_string(av).c_str()); size_t coldiff; if (first->nl_count) { - LOG_FMT(LSPACE, " nl_count is %zu, orig_col_end is %zu", first->nl_count, first->orig_col_end); -#ifdef DEBUG - LOG_FMT(LSPACE, "\n"); -#endif + LOG_FMT(LSPACE, " nl_count is %zu, orig_col_end is %zu\n", first->nl_count, first->orig_col_end); coldiff = first->orig_col_end - 1; } else { - LOG_FMT(LSPACE, " len is %zu", first->len()); -#ifdef DEBUG - LOG_FMT(LSPACE, "\n"); -#endif + LOG_FMT(LSPACE, " len is %zu\n", first->len()); coldiff = first->len(); } diff --git a/src/tokenize.cpp b/src/tokenize.cpp index 47e789e2a1..dedb4b5541 100644 --- a/src/tokenize.cpp +++ b/src/tokenize.cpp @@ -2091,13 +2091,13 @@ void tokenize(const deque &data, chunk_t *ref) } if (pc->type == CT_NEWLINE) { - LOG_FMT(LGUY, "%s(%d): orig_line is %zu orig_col is %zu\n", + LOG_FMT(LGUY, "%s(%d): orig_line is %zu, orig_col is %zu, \n", __func__, __LINE__, pc->orig_line, pc->orig_col); } else { - LOG_FMT(LGUY, "%s(%d): orig_line is %zu %s, type is %s, orig_col is %zu, orig_col_end is %zu\n", - __func__, __LINE__, pc->orig_line, pc->text(), get_token_name(pc->type), pc->orig_col, pc->orig_col_end); + LOG_FMT(LGUY, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', type is %s, orig_col_end is %zu\n", + __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type), pc->orig_col_end); } } From 059898e80d55dbe8d5c5eca6e6c1b10668553f92 Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Thu, 12 Oct 2017 17:09:34 +0200 Subject: [PATCH 013/136] A bugfix proposal for #1340 --- src/align.cpp | 2 +- tests/config/bug_1340.cfg | 6 ++++++ tests/cpp.test | 2 ++ tests/input/cpp/bug_1340.cpp | 20 ++++++++++++++++++++ tests/output/cpp/30023-templates.cpp | 4 ++-- tests/output/cpp/30220-bug_1340.cpp | 20 ++++++++++++++++++++ 6 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 tests/config/bug_1340.cfg create mode 100644 tests/input/cpp/bug_1340.cpp create mode 100644 tests/output/cpp/30220-bug_1340.cpp diff --git a/src/align.cpp b/src/align.cpp index c619fd5fdb..6de22898aa 100644 --- a/src/align.cpp +++ b/src/align.cpp @@ -730,7 +730,7 @@ chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_c __func__, __LINE__, pc->orig_line, pc->text()); // Don't check inside PAREN or SQUARE groups if ( pc->type == CT_SPAREN_OPEN - || pc->type == CT_FPAREN_OPEN + // || pc->type == CT_FPAREN_OPEN Issue #1340 || pc->type == CT_SQUARE_OPEN || pc->type == CT_PAREN_OPEN) { diff --git a/tests/config/bug_1340.cfg b/tests/config/bug_1340.cfg new file mode 100644 index 0000000000..6f651f6a17 --- /dev/null +++ b/tests/config/bug_1340.cfg @@ -0,0 +1,6 @@ +output_tab_size = 4 +indent_columns = 4 +indent_with_tabs = 0 +indent_align_string = true +indent_cpp_lambda_body = true +align_assign_span = 1 diff --git a/tests/cpp.test b/tests/cpp.test index 8e4379c4c6..504010ea60 100644 --- a/tests/cpp.test +++ b/tests/cpp.test @@ -111,6 +111,8 @@ 30209 empty.cfg cpp/bug_1134.cpp 30210 bug_1338.cfg cpp/bug_1338.cpp +30220 bug_1340.cfg cpp/bug_1340.cpp + 30240 align_func_params.cfg cpp/align_func_params.cpp 30241 align_func_params_span.cfg cpp/align_func_params.cpp 30242 align_func_params_gap.cfg cpp/align_func_params.cpp diff --git a/tests/input/cpp/bug_1340.cpp b/tests/input/cpp/bug_1340.cpp new file mode 100644 index 0000000000..680d6d5189 --- /dev/null +++ b/tests/input/cpp/bug_1340.cpp @@ -0,0 +1,20 @@ +double t = 111; +double t1 = 222; +double t123 = 333; + + +auto f = [](double x) -> double + { + double t = 1111; + double t1 = 1222; + double t123 = 1333; + }; + + +std::transform(v1.begin(), v1.end(), v2.begin(), + [](double x) -> double + { + double t = 2111; + double t1 = 2222; + double t123 = 2333; + }; ); diff --git a/tests/output/cpp/30023-templates.cpp b/tests/output/cpp/30023-templates.cpp index 1d480f071c..f244caefd2 100644 --- a/tests/output/cpp/30023-templates.cpp +++ b/tests/output/cpp/30023-templates.cpp @@ -163,8 +163,8 @@ void g(X<>& x); typedef std::vector > Table; // OK typedef std::vector > Flags; // Error -void func(List =default_val1); -void func(List > =default_val2); +void func(List =default_val1); +void func(List >=default_val2); BLAH<(3.14 >= 42)> blah; bool X = j<3> > 1; diff --git a/tests/output/cpp/30220-bug_1340.cpp b/tests/output/cpp/30220-bug_1340.cpp new file mode 100644 index 0000000000..f64bc6a031 --- /dev/null +++ b/tests/output/cpp/30220-bug_1340.cpp @@ -0,0 +1,20 @@ +double t = 111; +double t1 = 222; +double t123 = 333; + + +auto f = [](double x) -> double + { + double t = 1111; + double t1 = 1222; + double t123 = 1333; + }; + + +std::transform(v1.begin(), v1.end(), v2.begin(), + [](double x) -> double + { + double t = 2111; + double t1 = 2222; + double t123 = 2333; + }; ); From ec1c4760e70b07cfd7da6d471522607a51bb6f8b Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Thu, 12 Oct 2017 17:28:28 +0200 Subject: [PATCH 014/136] a little indent more --- src/align.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/align.cpp b/src/align.cpp index 6de22898aa..eb9e334ca0 100644 --- a/src/align.cpp +++ b/src/align.cpp @@ -730,7 +730,7 @@ chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_c __func__, __LINE__, pc->orig_line, pc->text()); // Don't check inside PAREN or SQUARE groups if ( pc->type == CT_SPAREN_OPEN - // || pc->type == CT_FPAREN_OPEN Issue #1340 + // || pc->type == CT_FPAREN_OPEN Issue #1340 || pc->type == CT_SQUARE_OPEN || pc->type == CT_PAREN_OPEN) { From e5ce3cc664ae058857e660d3a43bdaaf821214fa Mon Sep 17 00:00:00 2001 From: Ben Mayo Date: Wed, 27 Sep 2017 17:09:05 -0500 Subject: [PATCH 015/136] Standardize option descriptions to "override" These options have similar descriptions: *sp_after_operator_sym_empty - Have precedence of... *nl_typedef_blk_start - takes preference over... *nl_func_paren_empty - Overrides... This change modifies these descriptions to use the "override" wording. This doesn't make any changes to the options like sp_before_unnamed_ptr_star, where if it's set to ignore, another options is used, and isn't really overridden. Change-Id: I47ecd54c4ed3f3950a15052ef86f4caabe8ffbdf Type: Code Improvement --- scripts/More_Options_to_Test/show_config.txt | 14 ++++++-------- scripts/Output/mini_d_ucwd.txt | 14 ++++++-------- scripts/Output/mini_nd_ucwd.txt | 14 ++++++-------- src/options.cpp | 14 ++++++-------- 4 files changed, 24 insertions(+), 32 deletions(-) diff --git a/scripts/More_Options_to_Test/show_config.txt b/scripts/More_Options_to_Test/show_config.txt index 5ff2b58263..5178bf5995 100644 --- a/scripts/More_Options_to_Test/show_config.txt +++ b/scripts/More_Options_to_Test/show_config.txt @@ -288,9 +288,7 @@ sp_after_operator_sym { Ignore, Add, Remove, Force } Add or remove space between the operator symbol and the open paren, as in 'operator ++('. sp_after_operator_sym_empty { Ignore, Add, Remove, Force } - Add or remove space between the operator symbol and the open paren when the operator - has no arguments, as in 'operator *()'. - Have precedence of sp_after_operator_sym. + Overrides sp_after_operator_sym when the operator has no arguments, as in 'operator *()'. sp_after_cast { Ignore, Add, Remove, Force } Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a'. @@ -618,11 +616,11 @@ sp_inside_newop_paren { Ignore, Add, Remove, Force } sp_inside_newop_paren_open { Ignore, Add, Remove, Force } Controls the space after open paren of the new operator: 'new(foo) BAR'. - Have precedence of sp_inside_newop_paren. + Overrides sp_inside_newop_paren. sp_inside_newop_paren_close { Ignore, Add, Remove, Force } Controls the space before close paren of the new operator: 'new(foo) BAR'. - Have precedence of sp_inside_newop_paren. + Overrides sp_inside_newop_paren. sp_before_tr_emb_cmt { Ignore, Add, Remove, Force } Controls the spaces before a trailing or embedded comment. @@ -976,7 +974,7 @@ nl_func_var_def_blk Unsigned Number nl_typedef_blk_start Unsigned Number The number of newlines before a block of typedefs 0 = No change (default) - the option 'nl_after_access_spec' takes preference over 'nl_typedef_blk_start'. + is overridden by the option 'nl_after_access_spec'. nl_typedef_blk_end Unsigned Number The number of newlines after a block of typedefs @@ -989,7 +987,7 @@ nl_typedef_blk_in Unsigned Number nl_var_def_blk_start Unsigned Number The number of newlines before a block of variable definitions not at the top of a function body 0 = No change (default) - the option 'nl_after_access_spec' takes preference over 'nl_var_def_blk_start'. + is overridden by the option 'nl_after_access_spec'. nl_var_def_blk_end Unsigned Number The number of newlines after a block of variable definitions not at the top of a function body @@ -1455,7 +1453,7 @@ nl_before_access_spec Unsigned Number nl_after_access_spec Unsigned Number The number of newlines after a 'private:', 'public:', 'protected:', 'signals:' or 'slots:' label. 0 = No change. - the option 'nl_after_access_spec' takes preference over 'nl_typedef_blk_start' and 'nl_var_def_blk_start'. + Overrides 'nl_typedef_blk_start' and 'nl_var_def_blk_start'. nl_comment_func_def Unsigned Number The number of newlines between a function def and the function comment. diff --git a/scripts/Output/mini_d_ucwd.txt b/scripts/Output/mini_d_ucwd.txt index a10a1181d8..d35926467b 100644 --- a/scripts/Output/mini_d_ucwd.txt +++ b/scripts/Output/mini_d_ucwd.txt @@ -289,9 +289,7 @@ sp_after_operator = ignore # ignore/add/remove/force # Add or remove space between the operator symbol and the open paren, as in 'operator ++('. sp_after_operator_sym = ignore # ignore/add/remove/force -# Add or remove space between the operator symbol and the open paren when the operator -# has no arguments, as in 'operator *()'. -# Have precedence of sp_after_operator_sym. +# Overrides sp_after_operator_sym when the operator has no arguments, as in 'operator *()'. sp_after_operator_sym_empty = ignore # ignore/add/remove/force # Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a'. @@ -619,11 +617,11 @@ sp_after_newop_paren = ignore # ignore/add/remove/force sp_inside_newop_paren = ignore # ignore/add/remove/force # Controls the space after open paren of the new operator: 'new(foo) BAR'. -# Have precedence of sp_inside_newop_paren. +# Overrides sp_inside_newop_paren. sp_inside_newop_paren_open = ignore # ignore/add/remove/force # Controls the space before close paren of the new operator: 'new(foo) BAR'. -# Have precedence of sp_inside_newop_paren. +# Overrides sp_inside_newop_paren. sp_inside_newop_paren_close = ignore # ignore/add/remove/force # Controls the spaces before a trailing or embedded comment. @@ -977,7 +975,7 @@ nl_func_var_def_blk = 0 # unsigned number # The number of newlines before a block of typedefs # 0 = No change (default) -# the option 'nl_after_access_spec' takes preference over 'nl_typedef_blk_start'. +# is overridden by the option 'nl_after_access_spec'. nl_typedef_blk_start = 0 # unsigned number # The number of newlines after a block of typedefs @@ -990,7 +988,7 @@ nl_typedef_blk_in = 0 # unsigned number # The number of newlines before a block of variable definitions not at the top of a function body # 0 = No change (default) -# the option 'nl_after_access_spec' takes preference over 'nl_var_def_blk_start'. +# is overridden by the option 'nl_after_access_spec'. nl_var_def_blk_start = 0 # unsigned number # The number of newlines after a block of variable definitions not at the top of a function body @@ -1456,7 +1454,7 @@ nl_before_access_spec = 0 # unsigned number # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:' or 'slots:' label. # 0 = No change. -# the option 'nl_after_access_spec' takes preference over 'nl_typedef_blk_start' and 'nl_var_def_blk_start'. +# Overrides 'nl_typedef_blk_start' and 'nl_var_def_blk_start'. nl_after_access_spec = 0 # unsigned number # The number of newlines between a function def and the function comment. diff --git a/scripts/Output/mini_nd_ucwd.txt b/scripts/Output/mini_nd_ucwd.txt index de1d9431be..8cad3753f4 100644 --- a/scripts/Output/mini_nd_ucwd.txt +++ b/scripts/Output/mini_nd_ucwd.txt @@ -289,9 +289,7 @@ sp_after_operator = ignore # ignore/add/remove/force # Add or remove space between the operator symbol and the open paren, as in 'operator ++('. sp_after_operator_sym = ignore # ignore/add/remove/force -# Add or remove space between the operator symbol and the open paren when the operator -# has no arguments, as in 'operator *()'. -# Have precedence of sp_after_operator_sym. +# Overrides sp_after_operator_sym when the operator has no arguments, as in 'operator *()'. sp_after_operator_sym_empty = ignore # ignore/add/remove/force # Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a'. @@ -619,11 +617,11 @@ sp_after_newop_paren = ignore # ignore/add/remove/force sp_inside_newop_paren = ignore # ignore/add/remove/force # Controls the space after open paren of the new operator: 'new(foo) BAR'. -# Have precedence of sp_inside_newop_paren. +# Overrides sp_inside_newop_paren. sp_inside_newop_paren_open = ignore # ignore/add/remove/force # Controls the space before close paren of the new operator: 'new(foo) BAR'. -# Have precedence of sp_inside_newop_paren. +# Overrides sp_inside_newop_paren. sp_inside_newop_paren_close = ignore # ignore/add/remove/force # Controls the spaces before a trailing or embedded comment. @@ -977,7 +975,7 @@ nl_func_var_def_blk = 0 # unsigned number # The number of newlines before a block of typedefs # 0 = No change (default) -# the option 'nl_after_access_spec' takes preference over 'nl_typedef_blk_start'. +# is overridden by the option 'nl_after_access_spec'. nl_typedef_blk_start = 0 # unsigned number # The number of newlines after a block of typedefs @@ -990,7 +988,7 @@ nl_typedef_blk_in = 0 # unsigned number # The number of newlines before a block of variable definitions not at the top of a function body # 0 = No change (default) -# the option 'nl_after_access_spec' takes preference over 'nl_var_def_blk_start'. +# is overridden by the option 'nl_after_access_spec'. nl_var_def_blk_start = 0 # unsigned number # The number of newlines after a block of variable definitions not at the top of a function body @@ -1456,7 +1454,7 @@ nl_before_access_spec = 0 # unsigned number # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:' or 'slots:' label. # 0 = No change. -# the option 'nl_after_access_spec' takes preference over 'nl_typedef_blk_start' and 'nl_var_def_blk_start'. +# Overrides 'nl_typedef_blk_start' and 'nl_var_def_blk_start'. nl_after_access_spec = 0 # unsigned number # The number of newlines between a function def and the function comment. diff --git a/src/options.cpp b/src/options.cpp index 728708d774..a8645a9984 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -473,9 +473,7 @@ void register_options(void) unc_add_option("sp_after_operator_sym", UO_sp_after_operator_sym, AT_IARF, "Add or remove space between the operator symbol and the open paren, as in 'operator ++('."); unc_add_option("sp_after_operator_sym_empty", UO_sp_after_operator_sym_empty, AT_IARF, - "Add or remove space between the operator symbol and the open paren when the operator\n" - "has no arguments, as in 'operator *()'.\n" - "Have precedence of sp_after_operator_sym."); + "Overrides sp_after_operator_sym when the operator has no arguments, as in 'operator *()'."); unc_add_option("sp_after_cast", UO_sp_after_cast, AT_IARF, "Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a'."); unc_add_option("sp_inside_paren_cast", UO_sp_inside_paren_cast, AT_IARF, @@ -702,10 +700,10 @@ void register_options(void) "Controls the spaces inside paren of the new operator: 'new(foo) BAR'."); unc_add_option("sp_inside_newop_paren_open", UO_sp_inside_newop_paren_open, AT_IARF, "Controls the space after open paren of the new operator: 'new(foo) BAR'.\n" - "Have precedence of sp_inside_newop_paren."); + "Overrides sp_inside_newop_paren."); unc_add_option("sp_inside_newop_paren_close", UO_sp_inside_newop_paren_close, AT_IARF, "Controls the space before close paren of the new operator: 'new(foo) BAR'.\n" - "Have precedence of sp_inside_newop_paren."); + "Overrides sp_inside_newop_paren."); unc_add_option("sp_before_tr_emb_cmt", UO_sp_before_tr_emb_cmt, AT_IARF, "Controls the spaces before a trailing or embedded comment."); unc_add_option("sp_num_before_tr_emb_cmt", UO_sp_num_before_tr_emb_cmt, AT_UNUM, @@ -963,7 +961,7 @@ void register_options(void) unc_add_option("nl_typedef_blk_start", UO_nl_typedef_blk_start, AT_UNUM, "The number of newlines before a block of typedefs\n" "0 = No change (default)\n" - "the option 'nl_after_access_spec' takes preference over 'nl_typedef_blk_start'."); + "is overridden by the option 'nl_after_access_spec'."); unc_add_option("nl_typedef_blk_end", UO_nl_typedef_blk_end, AT_UNUM, "The number of newlines after a block of typedefs\n" "0 = No change (default)."); @@ -973,7 +971,7 @@ void register_options(void) unc_add_option("nl_var_def_blk_start", UO_nl_var_def_blk_start, AT_UNUM, "The number of newlines before a block of variable definitions not at the top of a function body\n" "0 = No change (default)\n" - "the option 'nl_after_access_spec' takes preference over 'nl_var_def_blk_start'."); + "is overridden by the option 'nl_after_access_spec'."); unc_add_option("nl_var_def_blk_end", UO_nl_var_def_blk_end, AT_UNUM, "The number of newlines after a block of variable definitions not at the top of a function body\n" "0 = No change (default)."); @@ -1299,7 +1297,7 @@ void register_options(void) unc_add_option("nl_after_access_spec", UO_nl_after_access_spec, AT_UNUM, "The number of newlines after a 'private:', 'public:', 'protected:', 'signals:' or 'slots:' label.\n" "0 = No change.\n" - "the option 'nl_after_access_spec' takes preference over 'nl_typedef_blk_start' and 'nl_var_def_blk_start'."); + "Overrides 'nl_typedef_blk_start' and 'nl_var_def_blk_start'."); unc_add_option("nl_comment_func_def", UO_nl_comment_func_def, AT_UNUM, "The number of newlines between a function def and the function comment.\n" "0 = No change."); From fb86da25af7e9ada977f4953b496bab48a99b524 Mon Sep 17 00:00:00 2001 From: Viktor Kireev Date: Sat, 14 Oct 2017 14:11:41 +0300 Subject: [PATCH 016/136] Fix log output in Windows with GCC Checking '_MSC_VER' sets '__func__' to "???", which is incorrect for GCC. --- src/windows_compat.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/windows_compat.h b/src/windows_compat.h index 0cbfe5ba59..567453486a 100644 --- a/src/windows_compat.h +++ b/src/windows_compat.h @@ -48,8 +48,10 @@ typedef unsigned long long UINT64; #define __func__ __FUNCTION__ #endif #else // _MSC_VER +#ifndef __GNUC__ #define __func__ "???" -#endif +#endif // __GNUC__ +#endif // _MSC_VER #include "stdio.h" #include "string.h" From 4f60ddd1ea70bfc59b83fc3a308a35cfc0d5646e Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Sat, 14 Oct 2017 18:08:04 +0200 Subject: [PATCH 017/136] A proposal for 2nd part of issue #1349 The use of cpd.pass_count is not necessary. --- src/indent.cpp | 2 +- src/uncrustify.cpp | 5 +- src/width.cpp | 7 +- tests/config/bug_1349.cfg | 5 ++ tests/cpp.test | 2 + tests/input/cpp/bug_1349.cpp | 6 ++ tests/output/cpp/33057-bug_1349.cpp | 122 ++++++++++++++++++++++++++++ 7 files changed, 143 insertions(+), 6 deletions(-) create mode 100644 tests/config/bug_1349.cfg create mode 100644 tests/input/cpp/bug_1349.cpp create mode 100644 tests/output/cpp/33057-bug_1349.cpp diff --git a/src/indent.cpp b/src/indent.cpp index 78e83730c3..477515c624 100644 --- a/src/indent.cpp +++ b/src/indent.cpp @@ -2714,7 +2714,7 @@ static void indent_comment(chunk_t *pc, size_t col) || next_col_diff == 5000) // FIXME: Max thresh magic number 5000 { reindent_line(pc, prev->column); - LOG_FMT(LCMTIND, "rule 3 - prev comment, coldiff = %d, now in %zu\n", + LOG_FMT(LCMTIND, "rule 3 - prev comment, coldiff = %zu, now in %zu\n", prev_col_diff, pc->column); return; } diff --git a/src/uncrustify.cpp b/src/uncrustify.cpp index 150483e353..d7d7aa05ca 100644 --- a/src/uncrustify.cpp +++ b/src/uncrustify.cpp @@ -1887,8 +1887,7 @@ void uncrustify_file(const file_mem &fm, FILE *pfout, } // Align everything else, reindent and break at code_width - first = true; - cpd.pass_count = 3; + first = true; do { align_all(); @@ -1907,7 +1906,7 @@ void uncrustify_file(const file_mem &fm, FILE *pfout, first = false; } } - } while (old_changes != cpd.changes && cpd.pass_count-- > 0); + } while (old_changes != cpd.changes); // And finally, align the backslash newline stuff align_right_comments(); diff --git a/src/width.cpp b/src/width.cpp index 5127ea5af0..ba82bc004b 100644 --- a/src/width.cpp +++ b/src/width.cpp @@ -240,8 +240,11 @@ static void try_split_here(cw_entry &ent, chunk_t *pc) if ( prev == nullptr || (chunk_is_newline(prev) && pc->type != CT_STRING)) { - LOG_FMT(LSPLIT, "%s(%d): Can't split after a newline, orig_line=%zu, return\n", - __func__, __LINE__, prev->orig_line); + if (prev != nullptr) + { + LOG_FMT(LSPLIT, "%s(%d): Can't split after a newline, orig_line=%zu, return\n", + __func__, __LINE__, prev->orig_line); + } return; } diff --git a/tests/config/bug_1349.cfg b/tests/config/bug_1349.cfg new file mode 100644 index 0000000000..a97ecf7943 --- /dev/null +++ b/tests/config/bug_1349.cfg @@ -0,0 +1,5 @@ +code_width = 115 +indent_columns = 4 +indent_with_tabs = 0 +nl_after_semicolon = true +align_struct_init_span = 5 diff --git a/tests/cpp.test b/tests/cpp.test index c12bd325b2..6a7d51cc25 100644 --- a/tests/cpp.test +++ b/tests/cpp.test @@ -361,6 +361,8 @@ 33053 for_auto.cfg cpp/for_auto.cpp 33054 bug_i_825.cfg cpp/bug_i_825.cpp 33056 empty.cfg cpp/bug_33056.cpp +33057 bug_1349.cfg cpp/bug_1349.cpp + 33061 empty.cfg cpp/if_chain_braces.cpp 33062 if_chain_braces_0.cfg cpp/if_chain_braces.cpp 33063 if_chain_braces_1.cfg cpp/if_chain_braces.cpp diff --git a/tests/input/cpp/bug_1349.cpp b/tests/input/cpp/bug_1349.cpp new file mode 100644 index 0000000000..aa1938e865 --- /dev/null +++ b/tests/input/cpp/bug_1349.cpp @@ -0,0 +1,6 @@ +uint8_t a[][8]={{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}; +uint8_t b[][8]={{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}; +uint8_t c[][8]={{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}; +uint8_t d[][8]={{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}; +uint8_t e[][8]={{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}; +uint8_t f[][8]={{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}; diff --git a/tests/output/cpp/33057-bug_1349.cpp b/tests/output/cpp/33057-bug_1349.cpp new file mode 100644 index 0000000000..fcc2e567f9 --- /dev/null +++ b/tests/output/cpp/33057-bug_1349.cpp @@ -0,0 +1,122 @@ +uint8_t a[][8]= +{ {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}; +uint8_t b[][8]= +{ {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}; +uint8_t c[][8]= +{ {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}; +uint8_t d[][8]= +{ {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}; +uint8_t e[][8]= +{ {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}; +uint8_t f[][8]= +{ {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}; From 0a834035eb42f5254f36f7b7b463a9922106112c Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Thu, 13 Jul 2017 02:27:51 +0200 Subject: [PATCH 018/136] Move CLI tests into the tests/cli directory --- .travis.yml | 2 +- README.md | 8 +-- release-steps.txt | 2 +- {scripts => tests/cli}/Config/I-842.cfg | 0 {scripts => tests/cli}/Config/mini_d.cfg | 0 {scripts => tests/cli}/Config/mini_nd.cfg | 0 .../cli}/Config/unmatched_close_pp.cfg | 0 {scripts => tests/cli}/Input/21.cpp | 0 {scripts => tests/cli}/Input/25.cpp | 0 {scripts => tests/cli}/Input/28.cpp | 0 {scripts => tests/cli}/Input/31.cpp | 0 {scripts => tests/cli}/Input/36.cpp | 0 {scripts => tests/cli}/Input/66.cpp | 0 {scripts => tests/cli}/Input/9.cpp | 0 {scripts => tests/cli}/Input/92.cpp | 0 {scripts => tests/cli}/Input/I-842.cpp | 0 .../cli}/Input/unmatched_close_pp.cpp | 0 {scripts => tests/cli}/Output/21.txt | 0 {scripts => tests/cli}/Output/25.txt | 0 {scripts => tests/cli}/Output/28.txt | 0 {scripts => tests/cli}/Output/31.txt | 0 {scripts => tests/cli}/Output/36.txt | 0 {scripts => tests/cli}/Output/66.txt | 0 {scripts => tests/cli}/Output/9.txt | 0 {scripts => tests/cli}/Output/92.txt | 0 {scripts => tests/cli}/Output/I-842.txt | 0 .../cli/Output}/help.txt | 0 {scripts => tests/cli}/Output/mini_d_uc.txt | 2 +- {scripts => tests/cli}/Output/mini_d_ucwd.txt | 2 +- {scripts => tests/cli}/Output/mini_nd_uc.txt | 2 +- .../cli}/Output/mini_nd_ucwd.txt | 2 +- {scripts => tests/cli}/Output/p.txt | 0 .../cli/Output}/show_config.txt | 0 .../cli}/Output/unmatched_close_pp.txt | 0 .../cli/test_cli_options.sh | 65 +++++++++++-------- 35 files changed, 47 insertions(+), 38 deletions(-) rename {scripts => tests/cli}/Config/I-842.cfg (100%) rename {scripts => tests/cli}/Config/mini_d.cfg (100%) rename {scripts => tests/cli}/Config/mini_nd.cfg (100%) rename {scripts => tests/cli}/Config/unmatched_close_pp.cfg (100%) rename {scripts => tests/cli}/Input/21.cpp (100%) rename {scripts => tests/cli}/Input/25.cpp (100%) rename {scripts => tests/cli}/Input/28.cpp (100%) rename {scripts => tests/cli}/Input/31.cpp (100%) rename {scripts => tests/cli}/Input/36.cpp (100%) rename {scripts => tests/cli}/Input/66.cpp (100%) rename {scripts => tests/cli}/Input/9.cpp (100%) rename {scripts => tests/cli}/Input/92.cpp (100%) rename {scripts => tests/cli}/Input/I-842.cpp (100%) rename {scripts => tests/cli}/Input/unmatched_close_pp.cpp (100%) rename {scripts => tests/cli}/Output/21.txt (100%) rename {scripts => tests/cli}/Output/25.txt (100%) rename {scripts => tests/cli}/Output/28.txt (100%) rename {scripts => tests/cli}/Output/31.txt (100%) rename {scripts => tests/cli}/Output/36.txt (100%) rename {scripts => tests/cli}/Output/66.txt (100%) rename {scripts => tests/cli}/Output/9.txt (100%) rename {scripts => tests/cli}/Output/92.txt (100%) rename {scripts => tests/cli}/Output/I-842.txt (100%) rename {scripts/More_Options_to_Test => tests/cli/Output}/help.txt (100%) rename {scripts => tests/cli}/Output/mini_d_uc.txt (99%) rename {scripts => tests/cli}/Output/mini_d_ucwd.txt (99%) rename {scripts => tests/cli}/Output/mini_nd_uc.txt (99%) rename {scripts => tests/cli}/Output/mini_nd_ucwd.txt (99%) rename {scripts => tests/cli}/Output/p.txt (100%) rename {scripts/More_Options_to_Test => tests/cli/Output}/show_config.txt (100%) rename {scripts => tests/cli}/Output/unmatched_close_pp.txt (100%) rename scripts/Test_more_Options.sh => tests/cli/test_cli_options.sh (74%) diff --git a/.travis.yml b/.travis.yml index ebe4d30da2..bcc7f766b6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -87,5 +87,5 @@ script: # test if all the sources are conform to the forUncrustifySources.cfg config file - if [ "x${BUILD_TYPE}" == "xrelease" ]; then cd ../; ./scripts/Run_uncrustify_for_sources.sh; fi # test if uncrustify runs for (some) command line options - - if [ "x${BUILD_TYPE}" == "xrelease" ]; then ./scripts/Test_more_Options.sh; fi + - if [ "x${BUILD_TYPE}" == "xrelease" ]; then ./tests/cli/test_cli_options.sh; fi # - /home/travis/build/uncrustify/uncrustify/build/uncrustify -c /home/travis/build/uncrustify/uncrustify/tests/config/mono.cfg -f /home/travis/build/uncrustify/uncrustify/tests/input/cs/simple.cs -L A diff --git a/README.md b/README.md index 534856d0d4..84c3a9a494 100644 --- a/README.md +++ b/README.md @@ -177,12 +177,8 @@ The codebase has to be formatted by the options set up in cause TravisCI build failures. The Command line interface (CLI) output is tested by the -`scripts/Test_more_Options.sh` script. It operates on the files inside -this directories: -- `scripts/Config/` -- `scripts/Output/` -- `scripts/Input/` -- `scripts/More_Options_to_Test/` +`test_cli_options.sh` script. It is located inside of `tests/cli/` and operates +on the subdirectories of that folder. If a PR is altering the CLI output, files inside those directories might need to be manually updated. This often happens when options are diff --git a/release-steps.txt b/release-steps.txt index 45591b4a03..0affe4b175 100644 --- a/release-steps.txt +++ b/release-steps.txt @@ -26,7 +26,7 @@ Just in case I don't do a release for a while and forget what to do... =) 2b. Update the option count in documentation/htdocs/index.html Use script/count_the_options.sh to count the options. - Check the number of options at ./scripts/More_Options_to_Test/help.txt + Check the number of options at ./tests/cli/Output/help.txt 2c. Update the config files $ scripts/update-defaults.sh diff --git a/scripts/Config/I-842.cfg b/tests/cli/Config/I-842.cfg similarity index 100% rename from scripts/Config/I-842.cfg rename to tests/cli/Config/I-842.cfg diff --git a/scripts/Config/mini_d.cfg b/tests/cli/Config/mini_d.cfg similarity index 100% rename from scripts/Config/mini_d.cfg rename to tests/cli/Config/mini_d.cfg diff --git a/scripts/Config/mini_nd.cfg b/tests/cli/Config/mini_nd.cfg similarity index 100% rename from scripts/Config/mini_nd.cfg rename to tests/cli/Config/mini_nd.cfg diff --git a/scripts/Config/unmatched_close_pp.cfg b/tests/cli/Config/unmatched_close_pp.cfg similarity index 100% rename from scripts/Config/unmatched_close_pp.cfg rename to tests/cli/Config/unmatched_close_pp.cfg diff --git a/scripts/Input/21.cpp b/tests/cli/Input/21.cpp similarity index 100% rename from scripts/Input/21.cpp rename to tests/cli/Input/21.cpp diff --git a/scripts/Input/25.cpp b/tests/cli/Input/25.cpp similarity index 100% rename from scripts/Input/25.cpp rename to tests/cli/Input/25.cpp diff --git a/scripts/Input/28.cpp b/tests/cli/Input/28.cpp similarity index 100% rename from scripts/Input/28.cpp rename to tests/cli/Input/28.cpp diff --git a/scripts/Input/31.cpp b/tests/cli/Input/31.cpp similarity index 100% rename from scripts/Input/31.cpp rename to tests/cli/Input/31.cpp diff --git a/scripts/Input/36.cpp b/tests/cli/Input/36.cpp similarity index 100% rename from scripts/Input/36.cpp rename to tests/cli/Input/36.cpp diff --git a/scripts/Input/66.cpp b/tests/cli/Input/66.cpp similarity index 100% rename from scripts/Input/66.cpp rename to tests/cli/Input/66.cpp diff --git a/scripts/Input/9.cpp b/tests/cli/Input/9.cpp similarity index 100% rename from scripts/Input/9.cpp rename to tests/cli/Input/9.cpp diff --git a/scripts/Input/92.cpp b/tests/cli/Input/92.cpp similarity index 100% rename from scripts/Input/92.cpp rename to tests/cli/Input/92.cpp diff --git a/scripts/Input/I-842.cpp b/tests/cli/Input/I-842.cpp similarity index 100% rename from scripts/Input/I-842.cpp rename to tests/cli/Input/I-842.cpp diff --git a/scripts/Input/unmatched_close_pp.cpp b/tests/cli/Input/unmatched_close_pp.cpp similarity index 100% rename from scripts/Input/unmatched_close_pp.cpp rename to tests/cli/Input/unmatched_close_pp.cpp diff --git a/scripts/Output/21.txt b/tests/cli/Output/21.txt similarity index 100% rename from scripts/Output/21.txt rename to tests/cli/Output/21.txt diff --git a/scripts/Output/25.txt b/tests/cli/Output/25.txt similarity index 100% rename from scripts/Output/25.txt rename to tests/cli/Output/25.txt diff --git a/scripts/Output/28.txt b/tests/cli/Output/28.txt similarity index 100% rename from scripts/Output/28.txt rename to tests/cli/Output/28.txt diff --git a/scripts/Output/31.txt b/tests/cli/Output/31.txt similarity index 100% rename from scripts/Output/31.txt rename to tests/cli/Output/31.txt diff --git a/scripts/Output/36.txt b/tests/cli/Output/36.txt similarity index 100% rename from scripts/Output/36.txt rename to tests/cli/Output/36.txt diff --git a/scripts/Output/66.txt b/tests/cli/Output/66.txt similarity index 100% rename from scripts/Output/66.txt rename to tests/cli/Output/66.txt diff --git a/scripts/Output/9.txt b/tests/cli/Output/9.txt similarity index 100% rename from scripts/Output/9.txt rename to tests/cli/Output/9.txt diff --git a/scripts/Output/92.txt b/tests/cli/Output/92.txt similarity index 100% rename from scripts/Output/92.txt rename to tests/cli/Output/92.txt diff --git a/scripts/Output/I-842.txt b/tests/cli/Output/I-842.txt similarity index 100% rename from scripts/Output/I-842.txt rename to tests/cli/Output/I-842.txt diff --git a/scripts/More_Options_to_Test/help.txt b/tests/cli/Output/help.txt similarity index 100% rename from scripts/More_Options_to_Test/help.txt rename to tests/cli/Output/help.txt diff --git a/scripts/Output/mini_d_uc.txt b/tests/cli/Output/mini_d_uc.txt similarity index 99% rename from scripts/Output/mini_d_uc.txt rename to tests/cli/Output/mini_d_uc.txt index ca897a7a41..7778634930 100644 --- a/scripts/Output/mini_d_uc.txt +++ b/tests/cli/Output/mini_d_uc.txt @@ -1,4 +1,4 @@ -scripts/Config/mini_d.cfg:2 Unknown symbol 'not_existing_option' +./Config/mini_d.cfg:2 Unknown symbol 'not_existing_option' newlines = auto input_tab_size = 8 diff --git a/scripts/Output/mini_d_ucwd.txt b/tests/cli/Output/mini_d_ucwd.txt similarity index 99% rename from scripts/Output/mini_d_ucwd.txt rename to tests/cli/Output/mini_d_ucwd.txt index 98955734b4..51565002b1 100644 --- a/scripts/Output/mini_d_ucwd.txt +++ b/tests/cli/Output/mini_d_ucwd.txt @@ -1,4 +1,4 @@ -scripts/Config/mini_d.cfg:2 Unknown symbol 'not_existing_option' +./Config/mini_d.cfg:2 Unknown symbol 'not_existing_option' # diff --git a/scripts/Output/mini_nd_uc.txt b/tests/cli/Output/mini_nd_uc.txt similarity index 99% rename from scripts/Output/mini_nd_uc.txt rename to tests/cli/Output/mini_nd_uc.txt index ebbf5fb616..863eff87fa 100644 --- a/scripts/Output/mini_nd_uc.txt +++ b/tests/cli/Output/mini_nd_uc.txt @@ -1,4 +1,4 @@ -scripts/Config/mini_d.cfg:2 Unknown symbol 'not_existing_option' +./Config/mini_d.cfg:2 Unknown symbol 'not_existing_option' newlines = crlf input_tab_size = 8 diff --git a/scripts/Output/mini_nd_ucwd.txt b/tests/cli/Output/mini_nd_ucwd.txt similarity index 99% rename from scripts/Output/mini_nd_ucwd.txt rename to tests/cli/Output/mini_nd_ucwd.txt index b77a78a7c6..dbab3b859d 100644 --- a/scripts/Output/mini_nd_ucwd.txt +++ b/tests/cli/Output/mini_nd_ucwd.txt @@ -1,4 +1,4 @@ -scripts/Config/mini_d.cfg:2 Unknown symbol 'not_existing_option' +./Config/mini_d.cfg:2 Unknown symbol 'not_existing_option' # diff --git a/scripts/Output/p.txt b/tests/cli/Output/p.txt similarity index 100% rename from scripts/Output/p.txt rename to tests/cli/Output/p.txt diff --git a/scripts/More_Options_to_Test/show_config.txt b/tests/cli/Output/show_config.txt similarity index 100% rename from scripts/More_Options_to_Test/show_config.txt rename to tests/cli/Output/show_config.txt diff --git a/scripts/Output/unmatched_close_pp.txt b/tests/cli/Output/unmatched_close_pp.txt similarity index 100% rename from scripts/Output/unmatched_close_pp.txt rename to tests/cli/Output/unmatched_close_pp.txt diff --git a/scripts/Test_more_Options.sh b/tests/cli/test_cli_options.sh similarity index 74% rename from scripts/Test_more_Options.sh rename to tests/cli/test_cli_options.sh index 2d16210c57..e4e6484f92 100755 --- a/scripts/Test_more_Options.sh +++ b/tests/cli/test_cli_options.sh @@ -9,13 +9,16 @@ # So it is necessary to test some more. # It might be usefull to complete the list below. # + + +# jump into the script dir so that printed paths are always the same +script_dir=$(dirname "$(readlink -f "$0")") +cd $script_dir + #set -x #exit 0 -SCRIPTS="./scripts" -RESULTS="./results" -# # control the CMAKE_BUILD_TYPE -CMAKE_BUILD_TYPE=`grep -i CMAKE_BUILD_TYPE:STRING=release ./build/CMakeCache.txt` +CMAKE_BUILD_TYPE=`grep -i CMAKE_BUILD_TYPE:STRING=release ../../build/CMakeCache.txt` how_different=${?} if [ ${how_different} == "0" ] ; then @@ -24,30 +27,34 @@ else echo "CMAKE_BUILD_TYPE must be 'Release' to test" exit 1 fi -# + + +INPUT="./Input" +OUTPUT="./Output" +CONFIG="./Config" +RESULTS="./Results" + rm -rf ${RESULTS} mkdir ${RESULTS} -INPUT="scripts/Input" -OUTPUT="scripts/Output" -CONFIG="scripts/Config" # # Test help # -h -? --help --usage file="help.txt" -./build/uncrustify > "${RESULTS}/${file}" -cmp -s "${RESULTS}/${file}" "${SCRIPTS}/More_Options_to_Test/${file}" +../../build/uncrustify > "${RESULTS}/${file}" +cmp -s "${RESULTS}/${file}" "${OUTPUT}/${file}" how_different=${?} if [ ${how_different} != "0" ] ; then echo echo "Problem with "${file} - echo "use: diff ${RESULTS}/${file} ${SCRIPTS}/More_Options_to_Test/${file} to find why" - diff --unified=5 "${RESULTS}/${file}" "${SCRIPTS}/More_Options_to_Test/${file}" + echo "use: diff ${RESULTS}/${file} ${OUTPUT}/${file} to find why" + diff --unified=5 "${RESULTS}/${file}" "${OUTPUT}/${file}" + echo else - rm "results/${file}" + rm "${RESULTS}/${file}" fi # @@ -55,19 +62,20 @@ fi # file="show_config.txt" -./build/uncrustify --show-config > "${RESULTS}/${file}" +../../build/uncrustify --show-config > "${RESULTS}/${file}" sed 's/# Uncrustify.*//g' "${RESULTS}/${file}" > "${RESULTS}/${file}.sed" -cmp -s "${RESULTS}/${file}.sed" "${SCRIPTS}/More_Options_to_Test/${file}" +cmp -s "${RESULTS}/${file}.sed" "${OUTPUT}/${file}" how_different=${?} if [ ${how_different} != "0" ] ; then echo echo "Problem with ${RESULTS}/${file}.sed" - echo "use: diff ${RESULTS}/${file}.sed ${SCRIPTS}/More_Options_to_Test/${file} to find why" - diff "${RESULTS}/${file}.sed" "${SCRIPTS}/More_Options_to_Test/${file}" + echo "use: diff ${RESULTS}/${file}.sed ${OUTPUT}/${file} to find why" + diff "${RESULTS}/${file}.sed" "${OUTPUT}/${file}" + echo else - rm "results/${file}" - rm "results/${file}.sed" + rm "${RESULTS}/${file}" + rm "${RESULTS}/${file}.sed" fi # @@ -80,7 +88,7 @@ do OutputFile="${OUTPUT}/${ConfigFileName}_uc.txt" ConfigFile="${CONFIG}/${ConfigFileName}.cfg" - ./build/uncrustify -c "${ConfigFile}" --update-config &> "${ResultsFile}" + ../../build/uncrustify -c "${ConfigFile}" --update-config &> "${ResultsFile}" sed 's/# Uncrustify.*//g' "${ResultsFile}" > "${ResultsFile}.sed" cmp -s "${ResultsFile}.sed" "${OutputFile}" how_different=${?} @@ -90,6 +98,7 @@ do echo "Problem with ${ResultsFile}.sed" echo "use: diff ${ResultsFile}.sed ${OutputFile} to find why" diff "${ResultsFile}.sed" "${OutputFile}" + echo else rm "${ResultsFile}" rm "${ResultsFile}.sed" @@ -106,7 +115,7 @@ do OutputFile="${OUTPUT}/${ConfigFileName}_ucwd.txt" ConfigFile="${CONFIG}/${ConfigFileName}.cfg" - ./build/uncrustify -c "${ConfigFile}" --update-config-with-doc &> "${ResultsFile}" + ../../build/uncrustify -c "${ConfigFile}" --update-config-with-doc &> "${ResultsFile}" sed 's/# Uncrustify.*//g' "${ResultsFile}" > "${ResultsFile}.sed" cmp -s "${ResultsFile}.sed" "${OutputFile}" how_different=${?} @@ -115,6 +124,7 @@ do echo "Problem with ${ResultsFile}.sed" echo "use: diff ${ResultsFile}.sed ${OutputFile} to find why" diff "${ResultsFile}.sed" "${OutputFile}" + echo else rm "${ResultsFile}" rm "${ResultsFile}.sed" @@ -129,7 +139,7 @@ InputFile="${INPUT}/28.cpp" OutputFile="${OUTPUT}/p.txt" ConfigFile="${CONFIG}/mini_nd.cfg" -./build/uncrustify -c "${ConfigFile}" -f "${InputFile}" -p "${ResultsFile}" &> /dev/null +../../build/uncrustify -c "${ConfigFile}" -f "${InputFile}" -p "${ResultsFile}" &> /dev/null sed 's/# Uncrustify.*//g' "${ResultsFile}" > "${ResultsFile}.sed" cmp -s "${ResultsFile}.sed" "${OutputFile}" how_different=${?} @@ -138,6 +148,7 @@ then echo "Problem with ${ResultsFile}.sed" echo "use: diff ${ResultsFile}.sed ${OutputFile} to find why" diff "${ResultsFile}.sed" "${OutputFile}" + echo else rm "${ResultsFile}" rm "${ResultsFile}.sed" @@ -154,7 +165,7 @@ do InputFile="${INPUT}/${L_Value}.cpp" OutputFile="${OUTPUT}/${L_Value}.txt" LFile="${RESULTS}/${L_Value}.txt" - ./build/uncrustify -c /dev/null -f "${InputFile}" -o /dev/null -L "${L_Value}" 2> "${LFile}" + ../../build/uncrustify -c /dev/null -f "${InputFile}" -o /dev/null -L "${L_Value}" 2> "${LFile}" sed 's/[0-9]//g' "${LFile}" > "${LFile}.sed" cmp -s "${LFile}.sed" "${OutputFile}" how_different=${?} @@ -166,6 +177,7 @@ do echo "use: diff ${LFile}.sed ${OutputFile} to find why" diff "${LFile}.sed" "${OutputFile}" diff "${LFile}" "${OutputFile}" + echo break else rm "${LFile}" @@ -180,7 +192,7 @@ do InputFile="${INPUT}/${Error_T}.cpp" OutputFile="${OUTPUT}/${Error_T}.txt" ErrFile="${RESULTS}/${Error_T}.txt" - ./build/uncrustify -q -c "${ConfigFile}" -f "${InputFile}" -o /dev/null 2> "${ErrFile}" + ../../build/uncrustify -q -c "${ConfigFile}" -f "${InputFile}" -o /dev/null 2> "${ErrFile}" cmp -s "${ErrFile}" "${OutputFile}" how_different=${?} if [ ${how_different} != "0" ] ; @@ -189,14 +201,15 @@ do echo "Problem with "${Error_T} echo "use: diff ${ErrFile} ${OutputFile} to find why" diff "${ErrFile}" "${OutputFile}" + echo break else rm "${ErrFile}" fi done -rmdir --ignore-fail-on-non-empty results -if [[ -d results ]] +rmdir --ignore-fail-on-non-empty ${RESULTS} +if [[ -d ${RESULTS} ]] then echo echo "some problem(s) are still present" From aa6952d40bd552992679337e9459dd79e794ffc9 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Tue, 4 Apr 2017 17:57:08 +0200 Subject: [PATCH 019/136] Add test_cli_options.py --- tests/cli/test_cli_options.py | 526 ++++++++++++++++++++++++++++++++++ 1 file changed, 526 insertions(+) create mode 100644 tests/cli/test_cli_options.py diff --git a/tests/cli/test_cli_options.py b/tests/cli/test_cli_options.py new file mode 100644 index 0000000000..8215cf670e --- /dev/null +++ b/tests/cli/test_cli_options.py @@ -0,0 +1,526 @@ +""" +test_cli_options.py + +Tests output generated by Uncrustifys commandline options +(excluding actual source code formatting) + +:author: Daniel Chumak +:license: GPL v2+ +""" + +from __future__ import print_function +from sys import stderr, argv, version_info, exit as sys_exit +from os import chdir, mkdir, remove, name as os_name +from os.path import dirname, abspath, isdir, isfile +from shutil import rmtree +from subprocess import Popen, PIPE, STDOUT +from io import open +import re + +if os_name == 'nt': + EX_OK = 0 + EX_USAGE = 64 + EX_SOFTWARE = 70 + NULL_DEVICE = 'nul' +else: + from os import EX_OK, EX_USAGE, EX_SOFTWARE + NULL_DEVICE = '/dev/null' + + +def eprint(*args, **kwargs): + """ + print() wraper that sets file=stderr + """ + print(*args, file=stderr, **kwargs) + + +def proc(bin_path, args_arr=(), combine=True): + """ + simple Popen wrapper to return std out/err utf8 strings + + + Parameters + ---------------------------------------------------------------------------- + :param bin_path: string + path to the binary that is going to be called + + args_arr : list/tuple + all needed arguments + + :param combine: bool + whether or not to merge stderr into stdout + + + :return: string, string + ---------------------------------------------------------------------------- + generated output of both stdout and stderr + + >>> proc("echo", "test") + 'test' + """ + if not isfile(bin_path): + eprint("bin is not a file: %s" % bin_path) + return False + + # call uncrustify, hold output in memory + stdout_f = PIPE + stderr_f = PIPE if not combine else STDOUT + + call_arr = [bin_path] + call_arr.extend(args_arr) + proc = Popen(call_arr, stdout=stdout_f, stderr=stderr_f) + + out_b, err_b = proc.communicate() + out_txt = out_b.decode("UTF-8") + err_txt = err_b.decode("UTF-8") if not combine else None + + return out_txt, err_txt + + +def get_file_content(fp): + """ + returns file content as an utf8 string or None if fp is not a file + + + Parameters + ---------------------------------------------------------------------------- + :param fp: string + path of the file that will be read + + + :return: string or None + ---------------------------------------------------------------------------- + the file content + + """ + out = None + + if isfile(fp): + with open(fp, encoding="utf-8") as f: + out = f.read() + else: + eprint("is not a file: %s" % fp) + + return out + + +def check_generated_output(gen_expected_path, gen_result_path, result_manip=None): + """ + compares the content of two files, + + is intended to compare a file that was generated during a call of Uncrustify + with a file that has the expected content + + + Parameters + ---------------------------------------------------------------------------- + :param gen_expected_path: string + path to a file that will be compared with the generated file + + :param gen_result_path: string + path to the file that will be generated by Uncrustify + + :param result_manip: lambda + optional lambda function that will be applied (before the comparison) + on the content of the generated file, + the lambda function should accept one string parameter + + + :return: bool + ---------------------------------------------------------------------------- + True or False depending on whether both files have the same content + + >>> check_generated_output("/dev/null", "/dev/null") + True + """ + + gen_exp_txt = get_file_content(gen_expected_path) + if gen_exp_txt is None: + return False + + gen_res_txt = get_file_content(gen_result_path) + if gen_res_txt is None: + return False + + if result_manip is not None: + gen_res_txt = result_manip(gen_res_txt) + + if gen_res_txt != gen_exp_txt: + + with open(gen_result_path, 'w', encoding="utf-8") as f: + f.write(gen_res_txt) + + print("\nProblem with %s" % gen_result_path) + print("use: 'diff %s %s' to find why" % (gen_result_path, + gen_expected_path)) + return False + + remove(gen_result_path) + + return True + + +def check_std_output(expected_path, result_path, result_str, result_manip=None): + """ + compares output generated by Uncrustify (std out/err) with a the content of + a file + + Parameters + ---------------------------------------------------------------------------- + :param expected_path: string + path of the file that will be compared with the output of Uncrustify + + :param result_path: string + path to which the Uncrustifys output will be saved in case of a mismatch + + :param result_str: string (utf8) + the output string generated by Uncrustify + + :param result_manip: lambda + see result_manip for check_generated_output + + + :return: bool + ---------------------------------------------------------------------------- + True or False depending on whether both files have the same content + + """ + exp_txt = get_file_content(expected_path) + if exp_txt is None: + return False + + if result_manip is not None: + result_str = result_manip(result_str) + + if result_str != exp_txt: + with open(result_path, 'w', encoding="utf-8") as f: + f.write(result_str) + + print("\nProblem with %s" % result_path) + print("use: 'diff %s %s' to find why" % (result_path, expected_path)) + return False + return True + + +def check_output( + uncr_bin, args_arr=(), combine=True, + out_expected_path=None, out_result_manip=None, out_result_path=None, + err_expected_path=None, err_result_manip=None, err_result_path=None, + gen_expected_path=None, gen_result_path=None, gen_result_manip=None): + """ + compares outputs generated by Uncrustify with files + + Paramerters + ---------------------------------------------------------------------------- + :param uncr_bin: string + path to the Uncrustify binary + + :param args_arr: list/tuple + Uncrustify commandline arguments + + :param combine: bool + whether or not to merge stderr into stdout, (use ony if + out_expected_path) is set + + :param out_expected_path: string + file that will be compared with Uncrustifys stdout output + (or combined with stderr if combine is True) + + :param out_result_manip: string + lambda function that will be applied to Uncrustifys stdout output + (before the comparison with out_expected_path), + the lambda function should accept one string parameter + + :param out_result_path: string + path where Uncrustifys stdout output will be saved to in case of a + mismatch + + :param err_expected_path: string + path to a file that will be compared with Uncrustifys stderr output + + :param err_result_manip: string + see out_result_manip (is applied to Uncrustifys stderr instead) + + :param err_result_path: string + see out_result_path (is applied to Uncrustifys stderr instead) + + :param gen_expected_path: string + path to a file that will be compared with a file generated by Uncrustify + + :param gen_result_path: string + path to a file that will be generated by Uncrustify + + :param gen_result_manip: + see out_result_path (is applied, in memory, to the file content of the + file generated by Uncrustify insted) + + + :return: bool + ---------------------------------------------------------------------------- + True if all specifed files match up, False otherwise + """ + # check param sanity + if not out_expected_path and not err_expected_path and not gen_expected_path: + eprint("No expected comparison file provided") + return False + + if combine and (err_result_path or err_expected_path): + eprint("If combine=True don't set either of err_result_path or " + "err_expected_path") + return False + + if bool(gen_expected_path) != bool(gen_result_path): + eprint("'gen_expected_path' and 'gen_result_path' must be used in " + "combination") + return False + + if gen_result_manip and not gen_result_path: + eprint("Set up 'gen_result_path' if 'gen_result_manip' is used") + + out_res_txt, err_res_txt = proc(uncr_bin, args_arr, combine=combine) + + ret_flag = True + + if out_expected_path and not check_std_output( + out_expected_path, out_result_path, out_res_txt, + result_manip=out_result_manip): + ret_flag = False + + if not combine and err_expected_path and not check_std_output( + err_expected_path, err_result_path, err_res_txt, + result_manip=err_result_manip): + ret_flag = False + + if gen_expected_path and not check_generated_output( + gen_expected_path, gen_result_path, + result_manip=gen_result_manip): + ret_flag = False + + return ret_flag + + +def clear_dir(path): + """ + clears a directory by deleting and creating it again + + + Parameters + ---------------------------------------------------------------------------- + :param path: + path of the directory + + + :return: void + """ + if isdir(path): + rmtree(path) + mkdir(path) + + +def file_find_string(search_string, file_path): + """ + checks if a strings appears in a file + + + Paramerters + ---------------------------------------------------------------------------- + :param search_string: string + string that is going to be searched + + :param file_path: string + file in which the string is going to be searched + + :return: bool + ---------------------------------------------------------------------------- + True if found, False otherwise + """ + if isfile(file_path): + with open(file_path, encoding="utf-8") as f: + if search_string.lower() in f.read().lower(): + return True + else: + eprint("file_path is not a file: %s" % file_path) + + return False + + +def check_build_type(build_type, cmake_cache_path): + """ + checks if a cmake build was of a certain single-configuration type + + + Parameters: + ---------------------------------------------------------------------------- + :param build_type: string + the build type that is going to be expected + + :param cmake_cache_path: string + the path of the to be checked CMakeCache.txt file + + + :return: bool + ---------------------------------------------------------------------------- + True if the right build type was used, False if not + + """ + + check_string = "CMAKE_BUILD_TYPE:STRING=%s" % build_type + + if file_find_string(check_string, cmake_cache_path): + print("CMAKE_BUILD_TYPE is correct") + return True + + eprint("CMAKE_BUILD_TYPE must be '%s'" % build_type) + return False + + +""" Regex replacement lambda function, simplistic sed replacement """ +reg_replace = lambda pattern, replacement: \ + lambda text: re.sub(pattern, replacement, text) + + +def main(args): + # set working dir to script dir + script_dir = dirname(abspath(__file__)) + chdir(script_dir) + + # find the uncrustify binary (keep Debug dir excluded) + bin_found = False + uncr_bin = '' + uncr_bin_locations = ['../../build/uncrustify', + '../../build/Release/uncrustify', + '../../build/Release/uncrustify.exe'] + for uncr_bin in uncr_bin_locations: + if not isfile(uncr_bin): + eprint("is not a file: %s" % uncr_bin) + else: + print("Uncrustify binary found: %s" % uncr_bin) + bin_found = True + break + if not bin_found: + eprint("No Uncrustify binary found") + sys_exit(EX_USAGE) + + ''' + Check if the binary was build as Release-type + + TODO: find a check for Windows, + for now rely on the ../../build/Release/ location + ''' + if os_name != 'nt' \ + and not check_build_type('release', '../../build/CMakeCache.txt'): + sys_exit(EX_USAGE) + + clear_dir("./Results") + + return_flag = True + + # + # Test help + # -h -? --help --usage + stdout, stderr = proc(uncr_bin) + if not check_output(uncr_bin, + out_expected_path='./Output/help.txt', + out_result_path='./Results/help.txt'): + return_flag = False + + # + # Test --show-config + # + if not check_output(uncr_bin, + args_arr=['--show-config'], + out_expected_path='./Output/show_config.txt', + out_result_path='./Results/show_config.txt', + out_result_manip=reg_replace(r'\# Uncrustify.+', '')): + return_flag = False + + # + # Test --update-config + # + if not check_output(uncr_bin, + args_arr=['-c', './Config/mini_d.cfg', + '--update-config'], + out_expected_path='./Output/mini_d_uc.txt', + out_result_path='./Results/mini_d_uc.txt', + out_result_manip=reg_replace(r'\# Uncrustify.+', '')): + return_flag = False + + if not check_output(uncr_bin, + args_arr=['-c', './Config/mini_nd.cfg', + '--update-config'], + out_expected_path='./Output/mini_nd_uc.txt', + out_result_path='./Results/mini_nd_uc.txt', + out_result_manip=reg_replace(r'\# Uncrustify.+', '')): + return_flag = False + + # + # Test --update-config-with-doc + # + if not check_output(uncr_bin, + args_arr=['-c', './Config/mini_d.cfg', + '--update-config-with-doc'], + out_expected_path='./Output/mini_d_ucwd.txt', + out_result_path='./Results/mini_d_ucwd.txt', + out_result_manip=reg_replace(r'\# Uncrustify.+', '')): + return_flag = False + + if not check_output(uncr_bin, + args_arr=['-c', './Config/mini_nd.cfg', + '--update-config-with-doc'], + out_expected_path='./Output/mini_nd_ucwd.txt', + out_result_path='./Results/mini_nd_ucwd.txt', + out_result_manip=reg_replace(r'\# Uncrustify.+', '')): + return_flag = False + + # + # Test -p + # + if not check_output(uncr_bin, + args_arr=['-c', './Config/mini_nd.cfg', + '-f', './Input/28.cpp', + '-p', "./Results/p.txt"], + gen_expected_path='./Output/p.txt', + gen_result_path='./Results/p.txt', + gen_result_manip=reg_replace(r'\# Uncrustify.+', '')): + return_flag = False + + # Debug Options: + # -L + # look at src/log_levels.h + Ls_A = ['9', '21', '25', '28', '31', '36', '66', '92'] + for L in Ls_A: + if not check_output(uncr_bin, + args_arr=[ + '-c', NULL_DEVICE, + '-f', './Input/%s.cpp' % L, + '-o', NULL_DEVICE, + '-L', L], + combine=False, + err_expected_path='./Output/%s.txt' % L, + err_result_path='./Results/%s.txt' % L, + err_result_manip=reg_replace(r'[0-9]', '')): + return_flag = False + + error_tests = ["I-842", "unmatched_close_pp"] + for test in error_tests: + if not check_output(uncr_bin, + args_arr=[ + '-q', + '-c', './Config/%s.cfg' % test, + '-f', './Input/%s.cpp' % test, + '-o', NULL_DEVICE], + combine=False, + err_expected_path='./Output/%s.txt' % test, + err_result_path='./Results/%s.txt' % test): + return_flag = False + + if return_flag: + print("all tests are OK") + sys_exit(EX_OK) + else: + print("some problem(s) are still present") + sys_exit(EX_SOFTWARE) + + +if __name__ == "__main__": + main(argv[1:]) From fb022522ecced47c1f9fec6c6aab87ef1cc2e1ba Mon Sep 17 00:00:00 2001 From: Maxim Mikityanskiy Date: Mon, 16 Oct 2017 16:53:34 +0300 Subject: [PATCH 020/136] Fix keywords for Objective-C and C Add missing Objective-C nullability keywords. Make nullable, nonnull and null_unspecified of type CT_TYPE because they are used before parameter types in method declarations. Handle them in properties correctly by changing CT_TYPE to CT_OC_PROPERTY_ATTR where necessary. Remove LANG_C flag from C++-only keywords. Add Objective-C BOOL type. --- src/keywords.cpp | 143 +++++++++++++++++++++------------------ src/tokenize_cleanup.cpp | 4 +- 2 files changed, 79 insertions(+), 68 deletions(-) diff --git a/src/keywords.cpp b/src/keywords.cpp index effeda3dcb..b6ae05b443 100644 --- a/src/keywords.cpp +++ b/src/keywords.cpp @@ -56,20 +56,21 @@ static const chunk_tag_t *kw_static_match(const chunk_tag_t *tag); static const chunk_tag_t keywords[] = { // TODO: it might be useful if users could add there custom keywords to this list - { "@catch", CT_CATCH, LANG_OC | LANG_CPP | LANG_C }, - { "@dynamic", CT_OC_DYNAMIC, LANG_OC | LANG_CPP | LANG_C }, - { "@end", CT_OC_END, LANG_OC | LANG_CPP | LANG_C }, - { "@finally", CT_FINALLY, LANG_OC | LANG_CPP | LANG_C }, - { "@implementation", CT_OC_IMPL, LANG_OC | LANG_CPP | LANG_C }, - { "@interface", CT_OC_INTF, LANG_OC | LANG_CPP | LANG_C }, + { "@catch", CT_CATCH, LANG_OC }, + { "@dynamic", CT_OC_DYNAMIC, LANG_OC }, + { "@end", CT_OC_END, LANG_OC }, + { "@finally", CT_FINALLY, LANG_OC }, + { "@implementation", CT_OC_IMPL, LANG_OC }, + { "@interface", CT_OC_INTF, LANG_OC }, { "@interface", CT_CLASS, LANG_JAVA }, - { "@private", CT_PRIVATE, LANG_OC | LANG_CPP | LANG_C }, - { "@property", CT_OC_PROPERTY, LANG_OC | LANG_CPP | LANG_C }, - { "@protocol", CT_OC_PROTOCOL, LANG_OC | LANG_CPP | LANG_C }, - { "@selector", CT_OC_SEL, LANG_OC | LANG_CPP | LANG_C }, - { "@synthesize", CT_OC_DYNAMIC, LANG_OC | LANG_CPP | LANG_C }, + { "@private", CT_PRIVATE, LANG_OC }, + { "@property", CT_OC_PROPERTY, LANG_OC }, + { "@protocol", CT_OC_PROTOCOL, LANG_OC }, + { "@selector", CT_OC_SEL, LANG_OC }, + { "@synthesize", CT_OC_DYNAMIC, LANG_OC }, { "@throw", CT_THROW, LANG_OC }, - { "@try", CT_TRY, LANG_OC | LANG_CPP | LANG_C }, + { "@try", CT_TRY, LANG_OC }, + { "BOOL", CT_TYPE, LANG_OC }, { "NS_ENUM", CT_ENUM, LANG_OC }, { "NS_OPTIONS", CT_ENUM, LANG_OC }, { "Q_EMIT", CT_Q_EMIT, LANG_CPP }, // guy 2015-10-16 @@ -77,49 +78,55 @@ static const chunk_tag_t keywords[] = { "Q_FOREVER", CT_Q_FOREVER, LANG_CPP }, // guy 2015-10-18 { "Q_GADGET", CT_Q_GADGET, LANG_CPP }, // guy 2016-05-04 { "Q_OBJECT", CT_COMMENT_EMBED, LANG_CPP }, - { "_Bool", CT_TYPE, LANG_CPP }, - { "_Complex", CT_TYPE, LANG_CPP }, - { "_Imaginary", CT_TYPE, LANG_CPP }, - { "__DI__", CT_DI, LANG_C | LANG_CPP }, // guy 2016-03-11 - { "__HI__", CT_HI, LANG_C | LANG_CPP }, // guy 2016-03-11 - { "__QI__", CT_QI, LANG_C | LANG_CPP }, // guy 2016-03-11 - { "__SI__", CT_SI, LANG_C | LANG_CPP }, // guy 2016-03-11 - { "__asm__", CT_ASM, LANG_C | LANG_CPP }, - { "__attribute__", CT_ATTRIBUTE, LANG_C | LANG_CPP }, + { "_Bool", CT_TYPE, LANG_C | LANG_OC }, + { "_Complex", CT_TYPE, LANG_C | LANG_CPP | LANG_OC }, + { "_Imaginary", CT_TYPE, LANG_C | LANG_CPP | LANG_OC }, + { "_Nonnull", CT_QUALIFIER, LANG_OC }, + { "_Null_unspecified", CT_QUALIFIER, LANG_OC }, + { "_Nullable", CT_QUALIFIER, LANG_OC }, + { "__DI__", CT_DI, LANG_C | LANG_CPP | LANG_OC }, + { "__HI__", CT_HI, LANG_C | LANG_CPP | LANG_OC }, + { "__QI__", CT_QI, LANG_C | LANG_CPP | LANG_OC }, + { "__SI__", CT_SI, LANG_C | LANG_CPP | LANG_OC }, + { "__asm__", CT_ASM, LANG_C | LANG_CPP | LANG_OC }, + { "__attribute__", CT_ATTRIBUTE, LANG_C | LANG_CPP | LANG_OC }, { "__block", CT_QUALIFIER, LANG_OC }, - { "__const__", CT_QUALIFIER, LANG_C | LANG_CPP }, + { "__const__", CT_QUALIFIER, LANG_C | LANG_CPP | LANG_OC }, { "__except", CT_CATCH, LANG_C | LANG_CPP }, { "__finally", CT_FINALLY, LANG_C | LANG_CPP }, - { "__inline__", CT_QUALIFIER, LANG_C | LANG_CPP }, - { "__nothrow__", CT_NOTHROW, LANG_C | LANG_CPP }, // guy 2016-03-11 - { "__restrict", CT_QUALIFIER, LANG_C | LANG_CPP }, - { "__signed__", CT_TYPE, LANG_C | LANG_CPP }, - { "__thread", CT_QUALIFIER, LANG_C | LANG_CPP }, + { "__inline__", CT_QUALIFIER, LANG_C | LANG_CPP | LANG_OC }, + { "__nonnull", CT_QUALIFIER, LANG_OC }, + { "__nothrow__", CT_NOTHROW, LANG_C | LANG_CPP | LANG_OC }, + { "__null_unspecified", CT_QUALIFIER, LANG_OC }, + { "__nullable", CT_QUALIFIER, LANG_OC }, + { "__restrict", CT_QUALIFIER, LANG_C | LANG_CPP | LANG_OC }, + { "__signed__", CT_TYPE, LANG_C | LANG_CPP | LANG_OC }, + { "__thread", CT_QUALIFIER, LANG_C | LANG_CPP | LANG_OC }, { "__traits", CT_QUALIFIER, LANG_D }, { "__try", CT_TRY, LANG_C | LANG_CPP }, - { "__typeof__", CT_SIZEOF, LANG_C | LANG_CPP }, - { "__volatile__", CT_QUALIFIER, LANG_C | LANG_CPP }, - { "__word__", CT_WORD_, LANG_C | LANG_CPP }, // guy 2016-03-11 + { "__typeof__", CT_SIZEOF, LANG_C | LANG_CPP | LANG_OC }, + { "__volatile__", CT_QUALIFIER, LANG_C | LANG_CPP | LANG_OC }, + { "__word__", CT_WORD_, LANG_C | LANG_CPP | LANG_OC }, { "abstract", CT_QUALIFIER, LANG_CS | LANG_D | LANG_JAVA | LANG_VALA | LANG_ECMA }, { "add", CT_GETSET, LANG_CS }, { "alias", CT_QUALIFIER, LANG_D }, { "align", CT_ALIGN, LANG_D }, - { "alignof", CT_SIZEOF, LANG_C | LANG_CPP }, - { "and", CT_SBOOL, LANG_C | LANG_CPP | FLAG_PP }, - { "and_eq", CT_SASSIGN, LANG_C | LANG_CPP }, + { "alignof", CT_SIZEOF, LANG_CPP }, + { "and", CT_SBOOL, LANG_CPP }, + { "and_eq", CT_SASSIGN, LANG_CPP }, { "as", CT_AS, LANG_CS | LANG_VALA }, - { "asm", CT_ASM, LANG_C | LANG_CPP | LANG_D }, + { "asm", CT_ASM, LANG_C | LANG_CPP | LANG_OC | LANG_D }, { "asm", CT_PP_ASM, LANG_ALL | FLAG_PP }, { "assert", CT_ASSERT, LANG_JAVA }, { "assert", CT_FUNCTION, LANG_D | LANG_PAWN }, // PAWN { "assert", CT_PP_ASSERT, LANG_PAWN | FLAG_PP }, // PAWN - { "auto", CT_TYPE, LANG_C | LANG_CPP | LANG_D }, + { "auto", CT_TYPE, LANG_C | LANG_CPP | LANG_OC | LANG_D }, { "base", CT_BASE, LANG_CS | LANG_VALA }, { "bit", CT_TYPE, LANG_D }, - { "bitand", CT_ARITH, LANG_C | LANG_CPP }, - { "bitor", CT_ARITH, LANG_C | LANG_CPP }, + { "bitand", CT_ARITH, LANG_C | LANG_CPP | LANG_OC }, + { "bitor", CT_ARITH, LANG_C | LANG_CPP | LANG_OC }, { "body", CT_BODY, LANG_D }, - { "bool", CT_TYPE, LANG_CPP | LANG_CS | LANG_VALA }, + { "bool", CT_TYPE, LANG_C | LANG_CPP | LANG_OC | LANG_CS | LANG_VALA }, { "boolean", CT_TYPE, LANG_JAVA | LANG_ECMA }, { "break", CT_BREAK, LANG_ALL }, // PAWN { "byte", CT_TYPE, LANG_CS | LANG_D | LANG_JAVA | LANG_ECMA }, @@ -134,7 +141,7 @@ static const chunk_tag_t keywords[] = { "char", CT_TYPE, LANG_ALLC }, { "checked", CT_QUALIFIER, LANG_CS }, { "class", CT_CLASS, LANG_CPP | LANG_CS | LANG_D | LANG_JAVA | LANG_VALA | LANG_ECMA }, - { "compl", CT_ARITH, LANG_C | LANG_CPP }, + { "compl", CT_ARITH, LANG_CPP }, { "const", CT_QUALIFIER, LANG_ALL }, // PAWN { "const_cast", CT_TYPE_CAST, LANG_CPP }, { "constexpr", CT_QUALIFIER, LANG_CPP }, @@ -168,11 +175,11 @@ static const chunk_tag_t keywords[] = { "error", CT_PP_ERROR, LANG_PAWN | FLAG_PP }, // PAWN { "event", CT_TYPE, LANG_CS }, { "exit", CT_FUNCTION, LANG_PAWN }, // PAWN - { "explicit", CT_TYPE, LANG_C | LANG_CPP | LANG_CS }, - { "export", CT_EXPORT, LANG_C | LANG_CPP | LANG_D | LANG_ECMA }, + { "explicit", CT_TYPE, LANG_CPP | LANG_CS }, + { "export", CT_EXPORT, LANG_CPP | LANG_D | LANG_ECMA }, { "extends", CT_QUALIFIER, LANG_JAVA | LANG_ECMA }, - { "extern", CT_EXTERN, LANG_C | LANG_CPP | LANG_CS | LANG_D | LANG_VALA }, - { "false", CT_WORD, LANG_CPP | LANG_CS | LANG_D | LANG_JAVA | LANG_VALA }, + { "extern", CT_EXTERN, LANG_C | LANG_CPP | LANG_OC | LANG_CS | LANG_D | LANG_VALA }, + { "false", CT_WORD, LANG_ALL }, { "file", CT_PP_FILE, LANG_PAWN | FLAG_PP }, // PAWN { "final", CT_QUALIFIER, LANG_CPP | LANG_D | LANG_ECMA }, { "finally", CT_FINALLY, LANG_D | LANG_CS | LANG_VALA | LANG_ECMA | LANG_JAVA }, @@ -197,12 +204,12 @@ static const chunk_tag_t keywords[] = { "import", CT_IMPORT, LANG_D | LANG_JAVA | LANG_ECMA }, // fudged to get indenting { "import", CT_PP_INCLUDE, LANG_OC | FLAG_PP }, // ObjectiveC version of include { "in", CT_IN, LANG_D | LANG_CS | LANG_VALA | LANG_ECMA | LANG_OC }, - { "include", CT_PP_INCLUDE, LANG_C | LANG_CPP | LANG_PAWN | FLAG_PP }, // PAWN - { "inline", CT_QUALIFIER, LANG_C | LANG_CPP }, + { "include", CT_PP_INCLUDE, LANG_C | LANG_CPP | LANG_OC | LANG_PAWN | FLAG_PP }, // PAWN + { "inline", CT_QUALIFIER, LANG_C | LANG_CPP | LANG_OC }, { "inout", CT_QUALIFIER, LANG_D }, { "instanceof", CT_SIZEOF, LANG_JAVA | LANG_ECMA }, { "int", CT_TYPE, LANG_ALLC }, - { "interface", CT_CLASS, LANG_C | LANG_CPP | LANG_CS | LANG_D | LANG_JAVA | LANG_VALA | LANG_ECMA }, + { "interface", CT_CLASS, LANG_CPP | LANG_CS | LANG_D | LANG_JAVA | LANG_VALA | LANG_ECMA }, { "internal", CT_QUALIFIER, LANG_CS }, { "invariant", CT_INVARIANT, LANG_D }, { "ireal", CT_TYPE, LANG_D }, @@ -214,19 +221,23 @@ static const chunk_tag_t keywords[] = { "macro", CT_D_MACRO, LANG_D }, { "mixin", CT_CLASS, LANG_D }, // may need special handling { "module", CT_D_MODULE, LANG_D }, - { "mutable", CT_QUALIFIER, LANG_C | LANG_CPP }, + { "mutable", CT_QUALIFIER, LANG_CPP }, { "namespace", CT_NAMESPACE, LANG_CPP | LANG_CS | LANG_VALA }, { "native", CT_NATIVE, LANG_PAWN }, // PAWN { "native", CT_QUALIFIER, LANG_JAVA | LANG_ECMA }, { "new", CT_NEW, LANG_CPP | LANG_CS | LANG_D | LANG_JAVA | LANG_PAWN | LANG_VALA | LANG_ECMA }, // PAWN { "noexcept", CT_NOEXCEPT, LANG_CPP }, - { "not", CT_SARITH, LANG_C | LANG_CPP }, - { "not_eq", CT_SCOMPARE, LANG_C | LANG_CPP }, + { "nonnull", CT_TYPE, LANG_OC }, + { "not", CT_SARITH, LANG_CPP }, + { "not_eq", CT_SCOMPARE, LANG_CPP }, { "null", CT_TYPE, LANG_CS | LANG_D | LANG_JAVA | LANG_VALA }, + { "null_resettable", CT_OC_PROPERTY_ATTR, LANG_OC }, + { "null_unspecified", CT_TYPE, LANG_OC }, + { "nullable", CT_TYPE, LANG_OC }, { "object", CT_TYPE, LANG_CS }, { "operator", CT_OPERATOR, LANG_CPP | LANG_CS | LANG_PAWN }, // PAWN - { "or", CT_SBOOL, LANG_C | LANG_CPP | FLAG_PP }, - { "or_eq", CT_SASSIGN, LANG_C | LANG_CPP }, + { "or", CT_SBOOL, LANG_CPP }, + { "or_eq", CT_SASSIGN, LANG_CPP }, { "out", CT_QUALIFIER, LANG_CS | LANG_D | LANG_VALA }, { "override", CT_QUALIFIER, LANG_CS | LANG_D | LANG_VALA }, { "package", CT_PRIVATE, LANG_D }, @@ -241,10 +252,10 @@ static const chunk_tag_t keywords[] = { "real", CT_TYPE, LANG_D }, { "ref", CT_QUALIFIER, LANG_CS | LANG_VALA }, { "region", CT_PP_REGION, LANG_ALL | FLAG_PP }, - { "register", CT_QUALIFIER, LANG_C | LANG_CPP }, - { "reinterpret_cast", CT_TYPE_CAST, LANG_C | LANG_CPP }, + { "register", CT_QUALIFIER, LANG_C | LANG_CPP | LANG_OC }, + { "reinterpret_cast", CT_TYPE_CAST, LANG_CPP }, { "remove", CT_GETSET, LANG_CS }, - { "restrict", CT_QUALIFIER, LANG_C | LANG_CPP }, + { "restrict", CT_QUALIFIER, LANG_C | LANG_OC }, { "return", CT_RETURN, LANG_ALL }, // PAWN { "sbyte", CT_TYPE, LANG_CS }, { "scope", CT_D_SCOPE, LANG_D }, @@ -254,8 +265,8 @@ static const chunk_tag_t keywords[] = { "short", CT_TYPE, LANG_ALLC }, { "signal", CT_PRIVATE, LANG_VALA }, { "signals", CT_PRIVATE, LANG_CPP }, - { "signed", CT_TYPE, LANG_C | LANG_CPP }, - { "sizeof", CT_SIZEOF, LANG_C | LANG_CPP | LANG_CS | LANG_VALA | LANG_PAWN }, // PAWN + { "signed", CT_TYPE, LANG_C | LANG_CPP | LANG_OC }, + { "sizeof", CT_SIZEOF, LANG_C | LANG_CPP | LANG_OC | LANG_CS | LANG_VALA | LANG_PAWN }, // PAWN { "sleep", CT_SIZEOF, LANG_PAWN }, // PAWN { "stackalloc", CT_NEW, LANG_CS }, { "state", CT_STATE, LANG_PAWN }, // PAWN @@ -264,7 +275,7 @@ static const chunk_tag_t keywords[] = { "stock", CT_STOCK, LANG_PAWN }, // PAWN { "strictfp", CT_QUALIFIER, LANG_JAVA }, { "string", CT_TYPE, LANG_CS | LANG_VALA }, - { "struct", CT_STRUCT, LANG_C | LANG_CPP | LANG_CS | LANG_D | LANG_VALA }, + { "struct", CT_STRUCT, LANG_C | LANG_CPP | LANG_OC | LANG_CS | LANG_D | LANG_VALA }, { "super", CT_SUPER, LANG_D | LANG_JAVA | LANG_ECMA }, { "switch", CT_SWITCH, LANG_ALL }, // PAWN { "synchronized", CT_QUALIFIER, LANG_D | LANG_ECMA }, @@ -275,39 +286,39 @@ static const chunk_tag_t keywords[] = { "throw", CT_THROW, LANG_CPP | LANG_CS | LANG_VALA | LANG_D | LANG_JAVA | LANG_ECMA }, { "throws", CT_QUALIFIER, LANG_JAVA | LANG_ECMA | LANG_VALA }, { "transient", CT_QUALIFIER, LANG_JAVA | LANG_ECMA }, - { "true", CT_WORD, LANG_CPP | LANG_CS | LANG_D | LANG_JAVA | LANG_VALA }, + { "true", CT_WORD, LANG_ALL }, { "try", CT_TRY, LANG_CPP | LANG_CS | LANG_D | LANG_JAVA | LANG_ECMA | LANG_VALA }, { "tryinclude", CT_PP_INCLUDE, LANG_PAWN | FLAG_PP }, // PAWN { "typedef", CT_TYPEDEF, LANG_C | LANG_CPP | LANG_D | LANG_OC }, - { "typeid", CT_SIZEOF, LANG_C | LANG_CPP | LANG_D }, + { "typeid", CT_SIZEOF, LANG_CPP | LANG_D }, { "typename", CT_TYPENAME, LANG_CPP }, - { "typeof", CT_SIZEOF, LANG_C | LANG_CPP | LANG_CS | LANG_D | LANG_VALA | LANG_ECMA }, + { "typeof", CT_SIZEOF, LANG_C | LANG_CPP | LANG_OC | LANG_CS | LANG_D | LANG_VALA | LANG_ECMA }, { "ubyte", CT_TYPE, LANG_D }, { "ucent", CT_TYPE, LANG_D }, { "uint", CT_TYPE, LANG_CS | LANG_VALA | LANG_D }, { "ulong", CT_TYPE, LANG_CS | LANG_VALA | LANG_D }, { "unchecked", CT_QUALIFIER, LANG_CS }, { "undef", CT_PP_UNDEF, LANG_ALL | FLAG_PP }, // PAWN - { "union", CT_UNION, LANG_C | LANG_CPP | LANG_D }, + { "union", CT_UNION, LANG_C | LANG_CPP | LANG_OC | LANG_D }, { "unittest", CT_UNITTEST, LANG_D }, { "unsafe", CT_UNSAFE, LANG_CS }, - { "unsigned", CT_TYPE, LANG_C | LANG_CPP }, + { "unsigned", CT_TYPE, LANG_C | LANG_CPP | LANG_OC }, { "ushort", CT_TYPE, LANG_CS | LANG_VALA | LANG_D }, { "using", CT_USING, LANG_CPP | LANG_CS | LANG_VALA }, { "var", CT_TYPE, LANG_VALA | LANG_ECMA }, { "version", CT_D_VERSION, LANG_D }, { "virtual", CT_QUALIFIER, LANG_CPP | LANG_CS | LANG_VALA }, { "void", CT_TYPE, LANG_ALLC }, - { "volatile", CT_QUALIFIER, LANG_C | LANG_CPP | LANG_CS | LANG_JAVA | LANG_ECMA }, + { "volatile", CT_QUALIFIER, LANG_C | LANG_CPP | LANG_OC | LANG_CS | LANG_JAVA | LANG_ECMA }, { "volatile", CT_VOLATILE, LANG_D }, { "wchar", CT_TYPE, LANG_D }, - { "wchar_t", CT_TYPE, LANG_C | LANG_CPP }, + { "wchar_t", CT_TYPE, LANG_C | LANG_CPP | LANG_OC }, { "weak", CT_QUALIFIER, LANG_VALA }, { "when", CT_WHEN, LANG_CS }, { "while", CT_WHILE, LANG_ALL }, // PAWN { "with", CT_D_WITH, LANG_D | LANG_ECMA }, - { "xor", CT_SARITH, LANG_C | LANG_CPP }, - { "xor_eq", CT_SASSIGN, LANG_C | LANG_CPP }, + { "xor", CT_SARITH, LANG_CPP }, + { "xor_eq", CT_SASSIGN, LANG_CPP }, }; diff --git a/src/tokenize_cleanup.cpp b/src/tokenize_cleanup.cpp index e4e42d186e..0049e259e4 100644 --- a/src/tokenize_cleanup.cpp +++ b/src/tokenize_cleanup.cpp @@ -57,7 +57,7 @@ static void mark_selectors_in_property_with_open_paren(chunk_t *open_paren); /** * Marks ObjC specific chunks in propery declaration ( attributes) - * Changes all the CT_WORD to CT_OC_PROPERTY_ATTR + * Changes all the CT_WORD and CT_TYPE to CT_OC_PROPERTY_ATTR */ static void mark_attributes_in_property_with_open_paren(chunk_t *open_paren); @@ -1244,7 +1244,7 @@ static void mark_attributes_in_property_with_open_paren(chunk_t *open_paren) { if ( (tmp->type == CT_COMMA || tmp->type == CT_PAREN_OPEN) && tmp->next - && tmp->next->type == CT_WORD) + && (tmp->next->type == CT_WORD || tmp->next->type == CT_TYPE)) { tmp->next->type = CT_OC_PROPERTY_ATTR; } From 1ab48ef905867ef0b769c5ef02d06e9c362c9015 Mon Sep 17 00:00:00 2001 From: Maxim Mikityanskiy Date: Mon, 16 Oct 2017 16:54:41 +0300 Subject: [PATCH 021/136] Format the table in src/keywords.cpp --- src/keywords.cpp | 526 +++++++++++++++++++++++------------------------ 1 file changed, 263 insertions(+), 263 deletions(-) diff --git a/src/keywords.cpp b/src/keywords.cpp index b6ae05b443..3a09270fe5 100644 --- a/src/keywords.cpp +++ b/src/keywords.cpp @@ -56,269 +56,269 @@ static const chunk_tag_t *kw_static_match(const chunk_tag_t *tag); static const chunk_tag_t keywords[] = { // TODO: it might be useful if users could add there custom keywords to this list - { "@catch", CT_CATCH, LANG_OC }, - { "@dynamic", CT_OC_DYNAMIC, LANG_OC }, - { "@end", CT_OC_END, LANG_OC }, - { "@finally", CT_FINALLY, LANG_OC }, - { "@implementation", CT_OC_IMPL, LANG_OC }, - { "@interface", CT_OC_INTF, LANG_OC }, - { "@interface", CT_CLASS, LANG_JAVA }, - { "@private", CT_PRIVATE, LANG_OC }, - { "@property", CT_OC_PROPERTY, LANG_OC }, - { "@protocol", CT_OC_PROTOCOL, LANG_OC }, - { "@selector", CT_OC_SEL, LANG_OC }, - { "@synthesize", CT_OC_DYNAMIC, LANG_OC }, - { "@throw", CT_THROW, LANG_OC }, - { "@try", CT_TRY, LANG_OC }, - { "BOOL", CT_TYPE, LANG_OC }, - { "NS_ENUM", CT_ENUM, LANG_OC }, - { "NS_OPTIONS", CT_ENUM, LANG_OC }, - { "Q_EMIT", CT_Q_EMIT, LANG_CPP }, // guy 2015-10-16 - { "Q_FOREACH", CT_FOR, LANG_CPP }, // guy 2015-09-23 - { "Q_FOREVER", CT_Q_FOREVER, LANG_CPP }, // guy 2015-10-18 - { "Q_GADGET", CT_Q_GADGET, LANG_CPP }, // guy 2016-05-04 - { "Q_OBJECT", CT_COMMENT_EMBED, LANG_CPP }, - { "_Bool", CT_TYPE, LANG_C | LANG_OC }, - { "_Complex", CT_TYPE, LANG_C | LANG_CPP | LANG_OC }, - { "_Imaginary", CT_TYPE, LANG_C | LANG_CPP | LANG_OC }, - { "_Nonnull", CT_QUALIFIER, LANG_OC }, - { "_Null_unspecified", CT_QUALIFIER, LANG_OC }, - { "_Nullable", CT_QUALIFIER, LANG_OC }, - { "__DI__", CT_DI, LANG_C | LANG_CPP | LANG_OC }, - { "__HI__", CT_HI, LANG_C | LANG_CPP | LANG_OC }, - { "__QI__", CT_QI, LANG_C | LANG_CPP | LANG_OC }, - { "__SI__", CT_SI, LANG_C | LANG_CPP | LANG_OC }, - { "__asm__", CT_ASM, LANG_C | LANG_CPP | LANG_OC }, - { "__attribute__", CT_ATTRIBUTE, LANG_C | LANG_CPP | LANG_OC }, - { "__block", CT_QUALIFIER, LANG_OC }, - { "__const__", CT_QUALIFIER, LANG_C | LANG_CPP | LANG_OC }, - { "__except", CT_CATCH, LANG_C | LANG_CPP }, - { "__finally", CT_FINALLY, LANG_C | LANG_CPP }, - { "__inline__", CT_QUALIFIER, LANG_C | LANG_CPP | LANG_OC }, - { "__nonnull", CT_QUALIFIER, LANG_OC }, - { "__nothrow__", CT_NOTHROW, LANG_C | LANG_CPP | LANG_OC }, - { "__null_unspecified", CT_QUALIFIER, LANG_OC }, - { "__nullable", CT_QUALIFIER, LANG_OC }, - { "__restrict", CT_QUALIFIER, LANG_C | LANG_CPP | LANG_OC }, - { "__signed__", CT_TYPE, LANG_C | LANG_CPP | LANG_OC }, - { "__thread", CT_QUALIFIER, LANG_C | LANG_CPP | LANG_OC }, - { "__traits", CT_QUALIFIER, LANG_D }, - { "__try", CT_TRY, LANG_C | LANG_CPP }, - { "__typeof__", CT_SIZEOF, LANG_C | LANG_CPP | LANG_OC }, - { "__volatile__", CT_QUALIFIER, LANG_C | LANG_CPP | LANG_OC }, - { "__word__", CT_WORD_, LANG_C | LANG_CPP | LANG_OC }, - { "abstract", CT_QUALIFIER, LANG_CS | LANG_D | LANG_JAVA | LANG_VALA | LANG_ECMA }, - { "add", CT_GETSET, LANG_CS }, - { "alias", CT_QUALIFIER, LANG_D }, - { "align", CT_ALIGN, LANG_D }, - { "alignof", CT_SIZEOF, LANG_CPP }, - { "and", CT_SBOOL, LANG_CPP }, - { "and_eq", CT_SASSIGN, LANG_CPP }, - { "as", CT_AS, LANG_CS | LANG_VALA }, - { "asm", CT_ASM, LANG_C | LANG_CPP | LANG_OC | LANG_D }, - { "asm", CT_PP_ASM, LANG_ALL | FLAG_PP }, - { "assert", CT_ASSERT, LANG_JAVA }, - { "assert", CT_FUNCTION, LANG_D | LANG_PAWN }, // PAWN - { "assert", CT_PP_ASSERT, LANG_PAWN | FLAG_PP }, // PAWN - { "auto", CT_TYPE, LANG_C | LANG_CPP | LANG_OC | LANG_D }, - { "base", CT_BASE, LANG_CS | LANG_VALA }, - { "bit", CT_TYPE, LANG_D }, - { "bitand", CT_ARITH, LANG_C | LANG_CPP | LANG_OC }, - { "bitor", CT_ARITH, LANG_C | LANG_CPP | LANG_OC }, - { "body", CT_BODY, LANG_D }, - { "bool", CT_TYPE, LANG_C | LANG_CPP | LANG_OC | LANG_CS | LANG_VALA }, - { "boolean", CT_TYPE, LANG_JAVA | LANG_ECMA }, - { "break", CT_BREAK, LANG_ALL }, // PAWN - { "byte", CT_TYPE, LANG_CS | LANG_D | LANG_JAVA | LANG_ECMA }, - { "callback", CT_QUALIFIER, LANG_VALA }, - { "case", CT_CASE, LANG_ALL }, // PAWN - { "cast", CT_D_CAST, LANG_D }, - { "catch", CT_CATCH, LANG_CPP | LANG_CS | LANG_VALA | LANG_D | LANG_JAVA | LANG_ECMA }, - { "cdouble", CT_TYPE, LANG_D }, - { "cent", CT_TYPE, LANG_D }, - { "cfloat", CT_TYPE, LANG_D }, - { "char", CT_CHAR, LANG_PAWN }, // PAWN - { "char", CT_TYPE, LANG_ALLC }, - { "checked", CT_QUALIFIER, LANG_CS }, - { "class", CT_CLASS, LANG_CPP | LANG_CS | LANG_D | LANG_JAVA | LANG_VALA | LANG_ECMA }, - { "compl", CT_ARITH, LANG_CPP }, - { "const", CT_QUALIFIER, LANG_ALL }, // PAWN - { "const_cast", CT_TYPE_CAST, LANG_CPP }, - { "constexpr", CT_QUALIFIER, LANG_CPP }, - { "construct", CT_CONSTRUCT, LANG_VALA }, - { "continue", CT_CONTINUE, LANG_ALL }, // PAWN - { "creal", CT_TYPE, LANG_D }, - { "dchar", CT_TYPE, LANG_D }, - { "debug", CT_DEBUG, LANG_D }, - { "debugger", CT_DEBUGGER, LANG_ECMA }, - { "decltype", CT_SIZEOF, LANG_CPP }, - { "default", CT_DEFAULT, LANG_ALL }, // PAWN - { "define", CT_PP_DEFINE, LANG_ALL | FLAG_PP }, // PAWN - { "defined", CT_DEFINED, LANG_PAWN }, // PAWN - { "defined", CT_PP_DEFINED, LANG_ALLC | FLAG_PP }, - { "delegate", CT_DELEGATE, LANG_CS | LANG_VALA | LANG_D }, - { "delete", CT_DELETE, LANG_CPP | LANG_D | LANG_ECMA | LANG_VALA }, - { "deprecated", CT_QUALIFIER, LANG_D }, - { "do", CT_DO, LANG_ALL }, // PAWN - { "double", CT_TYPE, LANG_ALLC }, - { "dynamic_cast", CT_TYPE_CAST, LANG_CPP }, - { "elif", CT_PP_ELSE, LANG_ALLC | FLAG_PP }, - { "else", CT_ELSE, LANG_ALL }, // PAWN - { "else", CT_PP_ELSE, LANG_ALL | FLAG_PP }, // PAWN - { "elseif", CT_PP_ELSE, LANG_PAWN | FLAG_PP }, // PAWN - { "emit", CT_PP_EMIT, LANG_PAWN | FLAG_PP }, // PAWN - { "endif", CT_PP_ENDIF, LANG_ALL | FLAG_PP }, // PAWN - { "endinput", CT_PP_ENDINPUT, LANG_PAWN | FLAG_PP }, // PAWN - { "endregion", CT_PP_ENDREGION, LANG_ALL | FLAG_PP }, - { "endscript", CT_PP_ENDINPUT, LANG_PAWN | FLAG_PP }, // PAWN - { "enum", CT_ENUM, LANG_ALL }, // PAWN - { "error", CT_PP_ERROR, LANG_PAWN | FLAG_PP }, // PAWN - { "event", CT_TYPE, LANG_CS }, - { "exit", CT_FUNCTION, LANG_PAWN }, // PAWN - { "explicit", CT_TYPE, LANG_CPP | LANG_CS }, - { "export", CT_EXPORT, LANG_CPP | LANG_D | LANG_ECMA }, - { "extends", CT_QUALIFIER, LANG_JAVA | LANG_ECMA }, - { "extern", CT_EXTERN, LANG_C | LANG_CPP | LANG_OC | LANG_CS | LANG_D | LANG_VALA }, - { "false", CT_WORD, LANG_ALL }, - { "file", CT_PP_FILE, LANG_PAWN | FLAG_PP }, // PAWN - { "final", CT_QUALIFIER, LANG_CPP | LANG_D | LANG_ECMA }, - { "finally", CT_FINALLY, LANG_D | LANG_CS | LANG_VALA | LANG_ECMA | LANG_JAVA }, - { "flags", CT_TYPE, LANG_VALA }, - { "float", CT_TYPE, LANG_ALLC }, - { "for", CT_FOR, LANG_ALL }, // PAWN - { "foreach", CT_FOR, LANG_CS | LANG_D | LANG_VALA }, - { "foreach_reverse", CT_FOR, LANG_D }, - { "forward", CT_FORWARD, LANG_PAWN }, // PAWN - { "friend", CT_FRIEND, LANG_CPP }, - { "function", CT_FUNCTION, LANG_D | LANG_ECMA }, - { "get", CT_GETSET, LANG_CS | LANG_VALA }, - { "goto", CT_GOTO, LANG_ALL }, // PAWN - { "idouble", CT_TYPE, LANG_D }, - { "if", CT_IF, LANG_ALL }, // PAWN - { "if", CT_PP_IF, LANG_ALL | FLAG_PP }, // PAWN - { "ifdef", CT_PP_IF, LANG_ALLC | FLAG_PP }, - { "ifloat", CT_TYPE, LANG_D }, - { "ifndef", CT_PP_IF, LANG_ALLC | FLAG_PP }, - { "implements", CT_QUALIFIER, LANG_JAVA | LANG_ECMA }, - { "implicit", CT_QUALIFIER, LANG_CS }, - { "import", CT_IMPORT, LANG_D | LANG_JAVA | LANG_ECMA }, // fudged to get indenting - { "import", CT_PP_INCLUDE, LANG_OC | FLAG_PP }, // ObjectiveC version of include - { "in", CT_IN, LANG_D | LANG_CS | LANG_VALA | LANG_ECMA | LANG_OC }, - { "include", CT_PP_INCLUDE, LANG_C | LANG_CPP | LANG_OC | LANG_PAWN | FLAG_PP }, // PAWN - { "inline", CT_QUALIFIER, LANG_C | LANG_CPP | LANG_OC }, - { "inout", CT_QUALIFIER, LANG_D }, - { "instanceof", CT_SIZEOF, LANG_JAVA | LANG_ECMA }, - { "int", CT_TYPE, LANG_ALLC }, - { "interface", CT_CLASS, LANG_CPP | LANG_CS | LANG_D | LANG_JAVA | LANG_VALA | LANG_ECMA }, - { "internal", CT_QUALIFIER, LANG_CS }, - { "invariant", CT_INVARIANT, LANG_D }, - { "ireal", CT_TYPE, LANG_D }, - { "is", CT_SCOMPARE, LANG_D | LANG_CS | LANG_VALA }, - { "lazy", CT_LAZY, LANG_D }, - { "line", CT_PP_LINE, LANG_PAWN | FLAG_PP }, // PAWN - { "lock", CT_LOCK, LANG_CS | LANG_VALA }, - { "long", CT_TYPE, LANG_ALLC }, - { "macro", CT_D_MACRO, LANG_D }, - { "mixin", CT_CLASS, LANG_D }, // may need special handling - { "module", CT_D_MODULE, LANG_D }, - { "mutable", CT_QUALIFIER, LANG_CPP }, - { "namespace", CT_NAMESPACE, LANG_CPP | LANG_CS | LANG_VALA }, - { "native", CT_NATIVE, LANG_PAWN }, // PAWN - { "native", CT_QUALIFIER, LANG_JAVA | LANG_ECMA }, - { "new", CT_NEW, LANG_CPP | LANG_CS | LANG_D | LANG_JAVA | LANG_PAWN | LANG_VALA | LANG_ECMA }, // PAWN - { "noexcept", CT_NOEXCEPT, LANG_CPP }, - { "nonnull", CT_TYPE, LANG_OC }, - { "not", CT_SARITH, LANG_CPP }, - { "not_eq", CT_SCOMPARE, LANG_CPP }, - { "null", CT_TYPE, LANG_CS | LANG_D | LANG_JAVA | LANG_VALA }, - { "null_resettable", CT_OC_PROPERTY_ATTR, LANG_OC }, - { "null_unspecified", CT_TYPE, LANG_OC }, - { "nullable", CT_TYPE, LANG_OC }, - { "object", CT_TYPE, LANG_CS }, - { "operator", CT_OPERATOR, LANG_CPP | LANG_CS | LANG_PAWN }, // PAWN - { "or", CT_SBOOL, LANG_CPP }, - { "or_eq", CT_SASSIGN, LANG_CPP }, - { "out", CT_QUALIFIER, LANG_CS | LANG_D | LANG_VALA }, - { "override", CT_QUALIFIER, LANG_CS | LANG_D | LANG_VALA }, - { "package", CT_PRIVATE, LANG_D }, - { "package", CT_PACKAGE, LANG_ECMA | LANG_JAVA }, - { "params", CT_TYPE, LANG_CS | LANG_VALA }, - { "pragma", CT_PP_PRAGMA, LANG_ALL | FLAG_PP }, // PAWN - { "private", CT_PRIVATE, LANG_ALLC }, // not C - { "property", CT_PP_PROPERTY, LANG_CS | FLAG_PP }, - { "protected", CT_PRIVATE, LANG_ALLC }, // not C - { "public", CT_PRIVATE, LANG_ALL }, // PAWN // not C - { "readonly", CT_QUALIFIER, LANG_CS }, - { "real", CT_TYPE, LANG_D }, - { "ref", CT_QUALIFIER, LANG_CS | LANG_VALA }, - { "region", CT_PP_REGION, LANG_ALL | FLAG_PP }, - { "register", CT_QUALIFIER, LANG_C | LANG_CPP | LANG_OC }, - { "reinterpret_cast", CT_TYPE_CAST, LANG_CPP }, - { "remove", CT_GETSET, LANG_CS }, - { "restrict", CT_QUALIFIER, LANG_C | LANG_OC }, - { "return", CT_RETURN, LANG_ALL }, // PAWN - { "sbyte", CT_TYPE, LANG_CS }, - { "scope", CT_D_SCOPE, LANG_D }, - { "sealed", CT_QUALIFIER, LANG_CS }, - { "section", CT_PP_SECTION, LANG_PAWN | FLAG_PP }, // PAWN - { "set", CT_GETSET, LANG_CS | LANG_VALA }, - { "short", CT_TYPE, LANG_ALLC }, - { "signal", CT_PRIVATE, LANG_VALA }, - { "signals", CT_PRIVATE, LANG_CPP }, - { "signed", CT_TYPE, LANG_C | LANG_CPP | LANG_OC }, - { "sizeof", CT_SIZEOF, LANG_C | LANG_CPP | LANG_OC | LANG_CS | LANG_VALA | LANG_PAWN }, // PAWN - { "sleep", CT_SIZEOF, LANG_PAWN }, // PAWN - { "stackalloc", CT_NEW, LANG_CS }, - { "state", CT_STATE, LANG_PAWN }, // PAWN - { "static", CT_QUALIFIER, LANG_ALL }, // PAWN - { "static_cast", CT_TYPE_CAST, LANG_CPP }, - { "stock", CT_STOCK, LANG_PAWN }, // PAWN - { "strictfp", CT_QUALIFIER, LANG_JAVA }, - { "string", CT_TYPE, LANG_CS | LANG_VALA }, - { "struct", CT_STRUCT, LANG_C | LANG_CPP | LANG_OC | LANG_CS | LANG_D | LANG_VALA }, - { "super", CT_SUPER, LANG_D | LANG_JAVA | LANG_ECMA }, - { "switch", CT_SWITCH, LANG_ALL }, // PAWN - { "synchronized", CT_QUALIFIER, LANG_D | LANG_ECMA }, - { "synchronized", CT_SYNCHRONIZED, LANG_JAVA }, - { "tagof", CT_TAGOF, LANG_PAWN }, // PAWN - { "template", CT_TEMPLATE, LANG_CPP | LANG_D }, - { "this", CT_THIS, LANG_CPP | LANG_CS | LANG_D | LANG_JAVA | LANG_VALA | LANG_ECMA }, - { "throw", CT_THROW, LANG_CPP | LANG_CS | LANG_VALA | LANG_D | LANG_JAVA | LANG_ECMA }, - { "throws", CT_QUALIFIER, LANG_JAVA | LANG_ECMA | LANG_VALA }, - { "transient", CT_QUALIFIER, LANG_JAVA | LANG_ECMA }, - { "true", CT_WORD, LANG_ALL }, - { "try", CT_TRY, LANG_CPP | LANG_CS | LANG_D | LANG_JAVA | LANG_ECMA | LANG_VALA }, - { "tryinclude", CT_PP_INCLUDE, LANG_PAWN | FLAG_PP }, // PAWN - { "typedef", CT_TYPEDEF, LANG_C | LANG_CPP | LANG_D | LANG_OC }, - { "typeid", CT_SIZEOF, LANG_CPP | LANG_D }, - { "typename", CT_TYPENAME, LANG_CPP }, - { "typeof", CT_SIZEOF, LANG_C | LANG_CPP | LANG_OC | LANG_CS | LANG_D | LANG_VALA | LANG_ECMA }, - { "ubyte", CT_TYPE, LANG_D }, - { "ucent", CT_TYPE, LANG_D }, - { "uint", CT_TYPE, LANG_CS | LANG_VALA | LANG_D }, - { "ulong", CT_TYPE, LANG_CS | LANG_VALA | LANG_D }, - { "unchecked", CT_QUALIFIER, LANG_CS }, - { "undef", CT_PP_UNDEF, LANG_ALL | FLAG_PP }, // PAWN - { "union", CT_UNION, LANG_C | LANG_CPP | LANG_OC | LANG_D }, - { "unittest", CT_UNITTEST, LANG_D }, - { "unsafe", CT_UNSAFE, LANG_CS }, - { "unsigned", CT_TYPE, LANG_C | LANG_CPP | LANG_OC }, - { "ushort", CT_TYPE, LANG_CS | LANG_VALA | LANG_D }, - { "using", CT_USING, LANG_CPP | LANG_CS | LANG_VALA }, - { "var", CT_TYPE, LANG_VALA | LANG_ECMA }, - { "version", CT_D_VERSION, LANG_D }, - { "virtual", CT_QUALIFIER, LANG_CPP | LANG_CS | LANG_VALA }, - { "void", CT_TYPE, LANG_ALLC }, - { "volatile", CT_QUALIFIER, LANG_C | LANG_CPP | LANG_OC | LANG_CS | LANG_JAVA | LANG_ECMA }, - { "volatile", CT_VOLATILE, LANG_D }, - { "wchar", CT_TYPE, LANG_D }, - { "wchar_t", CT_TYPE, LANG_C | LANG_CPP | LANG_OC }, - { "weak", CT_QUALIFIER, LANG_VALA }, - { "when", CT_WHEN, LANG_CS }, - { "while", CT_WHILE, LANG_ALL }, // PAWN - { "with", CT_D_WITH, LANG_D | LANG_ECMA }, - { "xor", CT_SARITH, LANG_CPP }, - { "xor_eq", CT_SASSIGN, LANG_CPP }, + { "@catch", CT_CATCH, LANG_OC }, + { "@dynamic", CT_OC_DYNAMIC, LANG_OC }, + { "@end", CT_OC_END, LANG_OC }, + { "@finally", CT_FINALLY, LANG_OC }, + { "@implementation", CT_OC_IMPL, LANG_OC }, + { "@interface", CT_OC_INTF, LANG_OC }, + { "@interface", CT_CLASS, LANG_JAVA }, + { "@private", CT_PRIVATE, LANG_OC }, + { "@property", CT_OC_PROPERTY, LANG_OC }, + { "@protocol", CT_OC_PROTOCOL, LANG_OC }, + { "@selector", CT_OC_SEL, LANG_OC }, + { "@synthesize", CT_OC_DYNAMIC, LANG_OC }, + { "@throw", CT_THROW, LANG_OC }, + { "@try", CT_TRY, LANG_OC }, + { "BOOL", CT_TYPE, LANG_OC }, + { "NS_ENUM", CT_ENUM, LANG_OC }, + { "NS_OPTIONS", CT_ENUM, LANG_OC }, + { "Q_EMIT", CT_Q_EMIT, LANG_CPP }, // guy 2015-10-16 + { "Q_FOREACH", CT_FOR, LANG_CPP }, // guy 2015-09-23 + { "Q_FOREVER", CT_Q_FOREVER, LANG_CPP }, // guy 2015-10-18 + { "Q_GADGET", CT_Q_GADGET, LANG_CPP }, // guy 2016-05-04 + { "Q_OBJECT", CT_COMMENT_EMBED, LANG_CPP }, + { "_Bool", CT_TYPE, LANG_C | LANG_OC }, + { "_Complex", CT_TYPE, LANG_C | LANG_CPP | LANG_OC }, + { "_Imaginary", CT_TYPE, LANG_C | LANG_CPP | LANG_OC }, + { "_Nonnull", CT_QUALIFIER, LANG_OC }, + { "_Null_unspecified", CT_QUALIFIER, LANG_OC }, + { "_Nullable", CT_QUALIFIER, LANG_OC }, + { "__DI__", CT_DI, LANG_C | LANG_CPP | LANG_OC }, + { "__HI__", CT_HI, LANG_C | LANG_CPP | LANG_OC }, + { "__QI__", CT_QI, LANG_C | LANG_CPP | LANG_OC }, + { "__SI__", CT_SI, LANG_C | LANG_CPP | LANG_OC }, + { "__asm__", CT_ASM, LANG_C | LANG_CPP | LANG_OC }, + { "__attribute__", CT_ATTRIBUTE, LANG_C | LANG_CPP | LANG_OC }, + { "__block", CT_QUALIFIER, LANG_OC }, + { "__const__", CT_QUALIFIER, LANG_C | LANG_CPP | LANG_OC }, + { "__except", CT_CATCH, LANG_C | LANG_CPP }, + { "__finally", CT_FINALLY, LANG_C | LANG_CPP }, + { "__inline__", CT_QUALIFIER, LANG_C | LANG_CPP | LANG_OC }, + { "__nonnull", CT_QUALIFIER, LANG_OC }, + { "__nothrow__", CT_NOTHROW, LANG_C | LANG_CPP | LANG_OC }, + { "__null_unspecified", CT_QUALIFIER, LANG_OC }, + { "__nullable", CT_QUALIFIER, LANG_OC }, + { "__restrict", CT_QUALIFIER, LANG_C | LANG_CPP | LANG_OC }, + { "__signed__", CT_TYPE, LANG_C | LANG_CPP | LANG_OC }, + { "__thread", CT_QUALIFIER, LANG_C | LANG_CPP | LANG_OC }, + { "__traits", CT_QUALIFIER, LANG_D }, + { "__try", CT_TRY, LANG_C | LANG_CPP }, + { "__typeof__", CT_SIZEOF, LANG_C | LANG_CPP | LANG_OC }, + { "__volatile__", CT_QUALIFIER, LANG_C | LANG_CPP | LANG_OC }, + { "__word__", CT_WORD_, LANG_C | LANG_CPP | LANG_OC }, + { "abstract", CT_QUALIFIER, LANG_CS | LANG_D | LANG_JAVA | LANG_VALA | LANG_ECMA }, + { "add", CT_GETSET, LANG_CS }, + { "alias", CT_QUALIFIER, LANG_D }, + { "align", CT_ALIGN, LANG_D }, + { "alignof", CT_SIZEOF, LANG_CPP }, + { "and", CT_SBOOL, LANG_CPP }, + { "and_eq", CT_SASSIGN, LANG_CPP }, + { "as", CT_AS, LANG_CS | LANG_VALA }, + { "asm", CT_ASM, LANG_C | LANG_CPP | LANG_OC | LANG_D }, + { "asm", CT_PP_ASM, LANG_ALL | FLAG_PP }, + { "assert", CT_ASSERT, LANG_JAVA }, + { "assert", CT_FUNCTION, LANG_D | LANG_PAWN }, // PAWN + { "assert", CT_PP_ASSERT, LANG_PAWN | FLAG_PP }, // PAWN + { "auto", CT_TYPE, LANG_C | LANG_CPP | LANG_OC | LANG_D }, + { "base", CT_BASE, LANG_CS | LANG_VALA }, + { "bit", CT_TYPE, LANG_D }, + { "bitand", CT_ARITH, LANG_C | LANG_CPP | LANG_OC }, + { "bitor", CT_ARITH, LANG_C | LANG_CPP | LANG_OC }, + { "body", CT_BODY, LANG_D }, + { "bool", CT_TYPE, LANG_C | LANG_CPP | LANG_OC | LANG_CS | LANG_VALA }, + { "boolean", CT_TYPE, LANG_JAVA | LANG_ECMA }, + { "break", CT_BREAK, LANG_ALL }, // PAWN + { "byte", CT_TYPE, LANG_CS | LANG_D | LANG_JAVA | LANG_ECMA }, + { "callback", CT_QUALIFIER, LANG_VALA }, + { "case", CT_CASE, LANG_ALL }, // PAWN + { "cast", CT_D_CAST, LANG_D }, + { "catch", CT_CATCH, LANG_CPP | LANG_CS | LANG_VALA | LANG_D | LANG_JAVA | LANG_ECMA }, + { "cdouble", CT_TYPE, LANG_D }, + { "cent", CT_TYPE, LANG_D }, + { "cfloat", CT_TYPE, LANG_D }, + { "char", CT_CHAR, LANG_PAWN }, // PAWN + { "char", CT_TYPE, LANG_ALLC }, + { "checked", CT_QUALIFIER, LANG_CS }, + { "class", CT_CLASS, LANG_CPP | LANG_CS | LANG_D | LANG_JAVA | LANG_VALA | LANG_ECMA }, + { "compl", CT_ARITH, LANG_CPP }, + { "const", CT_QUALIFIER, LANG_ALL }, // PAWN + { "const_cast", CT_TYPE_CAST, LANG_CPP }, + { "constexpr", CT_QUALIFIER, LANG_CPP }, + { "construct", CT_CONSTRUCT, LANG_VALA }, + { "continue", CT_CONTINUE, LANG_ALL }, // PAWN + { "creal", CT_TYPE, LANG_D }, + { "dchar", CT_TYPE, LANG_D }, + { "debug", CT_DEBUG, LANG_D }, + { "debugger", CT_DEBUGGER, LANG_ECMA }, + { "decltype", CT_SIZEOF, LANG_CPP }, + { "default", CT_DEFAULT, LANG_ALL }, // PAWN + { "define", CT_PP_DEFINE, LANG_ALL | FLAG_PP }, // PAWN + { "defined", CT_DEFINED, LANG_PAWN }, // PAWN + { "defined", CT_PP_DEFINED, LANG_ALLC | FLAG_PP }, + { "delegate", CT_DELEGATE, LANG_CS | LANG_VALA | LANG_D }, + { "delete", CT_DELETE, LANG_CPP | LANG_D | LANG_ECMA | LANG_VALA }, + { "deprecated", CT_QUALIFIER, LANG_D }, + { "do", CT_DO, LANG_ALL }, // PAWN + { "double", CT_TYPE, LANG_ALLC }, + { "dynamic_cast", CT_TYPE_CAST, LANG_CPP }, + { "elif", CT_PP_ELSE, LANG_ALLC | FLAG_PP }, + { "else", CT_ELSE, LANG_ALL }, // PAWN + { "else", CT_PP_ELSE, LANG_ALL | FLAG_PP }, // PAWN + { "elseif", CT_PP_ELSE, LANG_PAWN | FLAG_PP }, // PAWN + { "emit", CT_PP_EMIT, LANG_PAWN | FLAG_PP }, // PAWN + { "endif", CT_PP_ENDIF, LANG_ALL | FLAG_PP }, // PAWN + { "endinput", CT_PP_ENDINPUT, LANG_PAWN | FLAG_PP }, // PAWN + { "endregion", CT_PP_ENDREGION, LANG_ALL | FLAG_PP }, + { "endscript", CT_PP_ENDINPUT, LANG_PAWN | FLAG_PP }, // PAWN + { "enum", CT_ENUM, LANG_ALL }, // PAWN + { "error", CT_PP_ERROR, LANG_PAWN | FLAG_PP }, // PAWN + { "event", CT_TYPE, LANG_CS }, + { "exit", CT_FUNCTION, LANG_PAWN }, // PAWN + { "explicit", CT_TYPE, LANG_CPP | LANG_CS }, + { "export", CT_EXPORT, LANG_CPP | LANG_D | LANG_ECMA }, + { "extends", CT_QUALIFIER, LANG_JAVA | LANG_ECMA }, + { "extern", CT_EXTERN, LANG_C | LANG_CPP | LANG_OC | LANG_CS | LANG_D | LANG_VALA }, + { "false", CT_WORD, LANG_ALL }, + { "file", CT_PP_FILE, LANG_PAWN | FLAG_PP }, // PAWN + { "final", CT_QUALIFIER, LANG_CPP | LANG_D | LANG_ECMA }, + { "finally", CT_FINALLY, LANG_D | LANG_CS | LANG_VALA | LANG_ECMA | LANG_JAVA }, + { "flags", CT_TYPE, LANG_VALA }, + { "float", CT_TYPE, LANG_ALLC }, + { "for", CT_FOR, LANG_ALL }, // PAWN + { "foreach", CT_FOR, LANG_CS | LANG_D | LANG_VALA }, + { "foreach_reverse", CT_FOR, LANG_D }, + { "forward", CT_FORWARD, LANG_PAWN }, // PAWN + { "friend", CT_FRIEND, LANG_CPP }, + { "function", CT_FUNCTION, LANG_D | LANG_ECMA }, + { "get", CT_GETSET, LANG_CS | LANG_VALA }, + { "goto", CT_GOTO, LANG_ALL }, // PAWN + { "idouble", CT_TYPE, LANG_D }, + { "if", CT_IF, LANG_ALL }, // PAWN + { "if", CT_PP_IF, LANG_ALL | FLAG_PP }, // PAWN + { "ifdef", CT_PP_IF, LANG_ALLC | FLAG_PP }, + { "ifloat", CT_TYPE, LANG_D }, + { "ifndef", CT_PP_IF, LANG_ALLC | FLAG_PP }, + { "implements", CT_QUALIFIER, LANG_JAVA | LANG_ECMA }, + { "implicit", CT_QUALIFIER, LANG_CS }, + { "import", CT_IMPORT, LANG_D | LANG_JAVA | LANG_ECMA }, // fudged to get indenting + { "import", CT_PP_INCLUDE, LANG_OC | FLAG_PP }, // ObjectiveC version of include + { "in", CT_IN, LANG_D | LANG_CS | LANG_VALA | LANG_ECMA | LANG_OC }, + { "include", CT_PP_INCLUDE, LANG_C | LANG_CPP | LANG_OC | LANG_PAWN | FLAG_PP }, // PAWN + { "inline", CT_QUALIFIER, LANG_C | LANG_CPP | LANG_OC }, + { "inout", CT_QUALIFIER, LANG_D }, + { "instanceof", CT_SIZEOF, LANG_JAVA | LANG_ECMA }, + { "int", CT_TYPE, LANG_ALLC }, + { "interface", CT_CLASS, LANG_CPP | LANG_CS | LANG_D | LANG_JAVA | LANG_VALA | LANG_ECMA }, + { "internal", CT_QUALIFIER, LANG_CS }, + { "invariant", CT_INVARIANT, LANG_D }, + { "ireal", CT_TYPE, LANG_D }, + { "is", CT_SCOMPARE, LANG_D | LANG_CS | LANG_VALA }, + { "lazy", CT_LAZY, LANG_D }, + { "line", CT_PP_LINE, LANG_PAWN | FLAG_PP }, // PAWN + { "lock", CT_LOCK, LANG_CS | LANG_VALA }, + { "long", CT_TYPE, LANG_ALLC }, + { "macro", CT_D_MACRO, LANG_D }, + { "mixin", CT_CLASS, LANG_D }, // may need special handling + { "module", CT_D_MODULE, LANG_D }, + { "mutable", CT_QUALIFIER, LANG_CPP }, + { "namespace", CT_NAMESPACE, LANG_CPP | LANG_CS | LANG_VALA }, + { "native", CT_NATIVE, LANG_PAWN }, // PAWN + { "native", CT_QUALIFIER, LANG_JAVA | LANG_ECMA }, + { "new", CT_NEW, LANG_CPP | LANG_CS | LANG_D | LANG_JAVA | LANG_PAWN | LANG_VALA | LANG_ECMA }, // PAWN + { "noexcept", CT_NOEXCEPT, LANG_CPP }, + { "nonnull", CT_TYPE, LANG_OC }, + { "not", CT_SARITH, LANG_CPP }, + { "not_eq", CT_SCOMPARE, LANG_CPP }, + { "null", CT_TYPE, LANG_CS | LANG_D | LANG_JAVA | LANG_VALA }, + { "null_resettable", CT_OC_PROPERTY_ATTR, LANG_OC }, + { "null_unspecified", CT_TYPE, LANG_OC }, + { "nullable", CT_TYPE, LANG_OC }, + { "object", CT_TYPE, LANG_CS }, + { "operator", CT_OPERATOR, LANG_CPP | LANG_CS | LANG_PAWN }, // PAWN + { "or", CT_SBOOL, LANG_CPP }, + { "or_eq", CT_SASSIGN, LANG_CPP }, + { "out", CT_QUALIFIER, LANG_CS | LANG_D | LANG_VALA }, + { "override", CT_QUALIFIER, LANG_CS | LANG_D | LANG_VALA }, + { "package", CT_PRIVATE, LANG_D }, + { "package", CT_PACKAGE, LANG_ECMA | LANG_JAVA }, + { "params", CT_TYPE, LANG_CS | LANG_VALA }, + { "pragma", CT_PP_PRAGMA, LANG_ALL | FLAG_PP }, // PAWN + { "private", CT_PRIVATE, LANG_ALLC }, // not C + { "property", CT_PP_PROPERTY, LANG_CS | FLAG_PP }, + { "protected", CT_PRIVATE, LANG_ALLC }, // not C + { "public", CT_PRIVATE, LANG_ALL }, // PAWN // not C + { "readonly", CT_QUALIFIER, LANG_CS }, + { "real", CT_TYPE, LANG_D }, + { "ref", CT_QUALIFIER, LANG_CS | LANG_VALA }, + { "region", CT_PP_REGION, LANG_ALL | FLAG_PP }, + { "register", CT_QUALIFIER, LANG_C | LANG_CPP | LANG_OC }, + { "reinterpret_cast", CT_TYPE_CAST, LANG_CPP }, + { "remove", CT_GETSET, LANG_CS }, + { "restrict", CT_QUALIFIER, LANG_C | LANG_OC }, + { "return", CT_RETURN, LANG_ALL }, // PAWN + { "sbyte", CT_TYPE, LANG_CS }, + { "scope", CT_D_SCOPE, LANG_D }, + { "sealed", CT_QUALIFIER, LANG_CS }, + { "section", CT_PP_SECTION, LANG_PAWN | FLAG_PP }, // PAWN + { "set", CT_GETSET, LANG_CS | LANG_VALA }, + { "short", CT_TYPE, LANG_ALLC }, + { "signal", CT_PRIVATE, LANG_VALA }, + { "signals", CT_PRIVATE, LANG_CPP }, + { "signed", CT_TYPE, LANG_C | LANG_CPP | LANG_OC }, + { "sizeof", CT_SIZEOF, LANG_C | LANG_CPP | LANG_OC | LANG_CS | LANG_VALA | LANG_PAWN }, // PAWN + { "sleep", CT_SIZEOF, LANG_PAWN }, // PAWN + { "stackalloc", CT_NEW, LANG_CS }, + { "state", CT_STATE, LANG_PAWN }, // PAWN + { "static", CT_QUALIFIER, LANG_ALL }, // PAWN + { "static_cast", CT_TYPE_CAST, LANG_CPP }, + { "stock", CT_STOCK, LANG_PAWN }, // PAWN + { "strictfp", CT_QUALIFIER, LANG_JAVA }, + { "string", CT_TYPE, LANG_CS | LANG_VALA }, + { "struct", CT_STRUCT, LANG_C | LANG_CPP | LANG_OC | LANG_CS | LANG_D | LANG_VALA }, + { "super", CT_SUPER, LANG_D | LANG_JAVA | LANG_ECMA }, + { "switch", CT_SWITCH, LANG_ALL }, // PAWN + { "synchronized", CT_QUALIFIER, LANG_D | LANG_ECMA }, + { "synchronized", CT_SYNCHRONIZED, LANG_JAVA }, + { "tagof", CT_TAGOF, LANG_PAWN }, // PAWN + { "template", CT_TEMPLATE, LANG_CPP | LANG_D }, + { "this", CT_THIS, LANG_CPP | LANG_CS | LANG_D | LANG_JAVA | LANG_VALA | LANG_ECMA }, + { "throw", CT_THROW, LANG_CPP | LANG_CS | LANG_VALA | LANG_D | LANG_JAVA | LANG_ECMA }, + { "throws", CT_QUALIFIER, LANG_JAVA | LANG_ECMA | LANG_VALA }, + { "transient", CT_QUALIFIER, LANG_JAVA | LANG_ECMA }, + { "true", CT_WORD, LANG_ALL }, + { "try", CT_TRY, LANG_CPP | LANG_CS | LANG_D | LANG_JAVA | LANG_ECMA | LANG_VALA }, + { "tryinclude", CT_PP_INCLUDE, LANG_PAWN | FLAG_PP }, // PAWN + { "typedef", CT_TYPEDEF, LANG_C | LANG_CPP | LANG_D | LANG_OC }, + { "typeid", CT_SIZEOF, LANG_CPP | LANG_D }, + { "typename", CT_TYPENAME, LANG_CPP }, + { "typeof", CT_SIZEOF, LANG_C | LANG_CPP | LANG_OC | LANG_CS | LANG_D | LANG_VALA | LANG_ECMA }, + { "ubyte", CT_TYPE, LANG_D }, + { "ucent", CT_TYPE, LANG_D }, + { "uint", CT_TYPE, LANG_CS | LANG_VALA | LANG_D }, + { "ulong", CT_TYPE, LANG_CS | LANG_VALA | LANG_D }, + { "unchecked", CT_QUALIFIER, LANG_CS }, + { "undef", CT_PP_UNDEF, LANG_ALL | FLAG_PP }, // PAWN + { "union", CT_UNION, LANG_C | LANG_CPP | LANG_OC | LANG_D }, + { "unittest", CT_UNITTEST, LANG_D }, + { "unsafe", CT_UNSAFE, LANG_CS }, + { "unsigned", CT_TYPE, LANG_C | LANG_CPP | LANG_OC }, + { "ushort", CT_TYPE, LANG_CS | LANG_VALA | LANG_D }, + { "using", CT_USING, LANG_CPP | LANG_CS | LANG_VALA }, + { "var", CT_TYPE, LANG_VALA | LANG_ECMA }, + { "version", CT_D_VERSION, LANG_D }, + { "virtual", CT_QUALIFIER, LANG_CPP | LANG_CS | LANG_VALA }, + { "void", CT_TYPE, LANG_ALLC }, + { "volatile", CT_QUALIFIER, LANG_C | LANG_CPP | LANG_OC | LANG_CS | LANG_JAVA | LANG_ECMA }, + { "volatile", CT_VOLATILE, LANG_D }, + { "wchar", CT_TYPE, LANG_D }, + { "wchar_t", CT_TYPE, LANG_C | LANG_CPP | LANG_OC }, + { "weak", CT_QUALIFIER, LANG_VALA }, + { "when", CT_WHEN, LANG_CS }, + { "while", CT_WHILE, LANG_ALL }, // PAWN + { "with", CT_D_WITH, LANG_D | LANG_ECMA }, + { "xor", CT_SARITH, LANG_CPP }, + { "xor_eq", CT_SASSIGN, LANG_CPP }, }; From 7961559f636170e70e87d3e6c251d15be3352a52 Mon Sep 17 00:00:00 2001 From: Maxim Mikityanskiy Date: Thu, 12 Oct 2017 13:04:32 +0300 Subject: [PATCH 022/136] Fix invalid tests for C enums Some of the enums in the tests are called 'not'. The output files had that enums incorrectly formatted, because 'not' is a keyword in C++, and uncrustify treated it as a C keyword too. Also that enum had a syntax error, because two values weren't separated by a comma. Fix it by putting a missing comma there. --- tests/input/c/enum_gallery.c | 2 +- tests/output/c/00451-enum_gallery.c | 2 +- tests/output/c/00452-enum_gallery.c | 3 ++- tests/output/c/00453-enum_gallery.c | 7 +------ tests/output/c/00454-enum_gallery.c | 6 +++++- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/input/c/enum_gallery.c b/tests/input/c/enum_gallery.c index 236da2b4d3..2be9319423 100644 --- a/tests/input/c/enum_gallery.c +++ b/tests/input/c/enum_gallery.c @@ -2,7 +2,7 @@ enum one { liner }; enum not { -a, one +a, one, liner }; diff --git a/tests/output/c/00451-enum_gallery.c b/tests/output/c/00451-enum_gallery.c index f8edcb4607..3cb8db3c3d 100644 --- a/tests/output/c/00451-enum_gallery.c +++ b/tests/output/c/00451-enum_gallery.c @@ -2,7 +2,7 @@ enum one { liner }; enum not { - a, one + a, one, liner }; diff --git a/tests/output/c/00452-enum_gallery.c b/tests/output/c/00452-enum_gallery.c index 8986a0d5b9..cb235c3dd5 100644 --- a/tests/output/c/00452-enum_gallery.c +++ b/tests/output/c/00452-enum_gallery.c @@ -4,7 +4,8 @@ enum one { enum not { - a, one + a, + one, liner }; diff --git a/tests/output/c/00453-enum_gallery.c b/tests/output/c/00453-enum_gallery.c index 300b9c0a36..af537d1d42 100644 --- a/tests/output/c/00453-enum_gallery.c +++ b/tests/output/c/00453-enum_gallery.c @@ -1,11 +1,6 @@ enum one { liner }; -enum not { - - a, one - - liner -}; +enum not {a, one,liner }; enum foo { bar, baz, quux }; diff --git a/tests/output/c/00454-enum_gallery.c b/tests/output/c/00454-enum_gallery.c index 2c879eba12..8d00cbce51 100644 --- a/tests/output/c/00454-enum_gallery.c +++ b/tests/output/c/00454-enum_gallery.c @@ -1,6 +1,10 @@ enum one { liner -}; enum not {a, one liner }; enum foo { +}; enum not { + a, + one, + liner +}; enum foo { bar, baz, quux From 185b46876c0916633b950c37f3b06b3e94312450 Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Tue, 17 Oct 2017 16:42:20 +0200 Subject: [PATCH 023/136] Introduce a new option: sp_angle_colon --- src/options.cpp | 2 ++ src/options.h | 1 + src/space.cpp | 6 ++++++ tests/cli/Output/help.txt | 2 +- tests/cli/Output/mini_d_uc.txt | 1 + tests/cli/Output/mini_d_ucwd.txt | 3 +++ tests/cli/Output/mini_nd_uc.txt | 1 + tests/cli/Output/mini_nd_ucwd.txt | 3 +++ tests/cli/Output/show_config.txt | 3 +++ tests/config/bug_1001.cfg | 3 +++ tests/cpp.test | 2 ++ tests/input/cpp/bug_1001.cpp | 4 ++++ tests/output/cpp/33105-bug_1001.cpp | 4 ++++ 13 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 tests/config/bug_1001.cfg create mode 100644 tests/input/cpp/bug_1001.cpp create mode 100644 tests/output/cpp/33105-bug_1001.cpp diff --git a/src/options.cpp b/src/options.cpp index 4c2e887572..23b3351a85 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -395,6 +395,8 @@ void register_options(void) "Add or remove space before '<>'."); unc_add_option("sp_inside_angle", UO_sp_inside_angle, AT_IARF, "Add or remove space inside '<' and '>'."); + unc_add_option("sp_angle_colon", UO_sp_angle_colon, AT_IARF, + "Add or remove space between '<>' and ':'."); unc_add_option("sp_after_angle", UO_sp_after_angle, AT_IARF, "Add or remove space after '<>'."); unc_add_option("sp_angle_paren", UO_sp_angle_paren, AT_IARF, diff --git a/src/options.h b/src/options.h index 0799f1b6e1..5cde3112e5 100644 --- a/src/options.h +++ b/src/options.h @@ -188,6 +188,7 @@ enum uncrustify_options UO_sp_template_angle, // UO_sp_before_angle, // space before '<>', as in '' UO_sp_inside_angle, // space inside '<>', as in '' + UO_sp_angle_colon, // space between '<>' and ':' UO_sp_after_angle, // space after '<>', as in '' UO_sp_angle_paren, // space between '<>' and '(' in 'a = new List(foo);' UO_sp_angle_paren_empty, // space between '<>' and '()' in 'a = new List();' diff --git a/src/space.cpp b/src/space.cpp index 8ecddb85da..a37b12ae58 100644 --- a/src/space.cpp +++ b/src/space.cpp @@ -833,6 +833,12 @@ static argval_t do_space(chunk_t *first, chunk_t *second, int &min_sp, bool comp } if (second->type != CT_BYREF && second->type != CT_PTR_TYPE) { + if ( second->type == CT_CLASS_COLON + && cpd.settings[UO_sp_angle_colon].a != AV_IGNORE) + { + log_rule("sp_angle_colon"); + return(cpd.settings[UO_sp_angle_colon].a); + } log_rule("sp_after_angle"); return(cpd.settings[UO_sp_after_angle].a); } diff --git a/tests/cli/Output/help.txt b/tests/cli/Output/help.txt index 21acc386e9..71be99a0bf 100644 --- a/tests/cli/Output/help.txt +++ b/tests/cli/Output/help.txt @@ -70,6 +70,6 @@ Note: Use comments containing ' *INDENT-OFF*' and ' *INDENT-ON*' to disable processing of parts of the source file (these can be overridden with enable_processing_cmt and disable_processing_cmt). -There are currently 606 options and minimal documentation. +There are currently 607 options and minimal documentation. Try UniversalIndentGUI and good luck. diff --git a/tests/cli/Output/mini_d_uc.txt b/tests/cli/Output/mini_d_uc.txt index 7778634930..755bd2f34b 100644 --- a/tests/cli/Output/mini_d_uc.txt +++ b/tests/cli/Output/mini_d_uc.txt @@ -53,6 +53,7 @@ sp_before_template_paren = ignore sp_template_angle = ignore sp_before_angle = ignore sp_inside_angle = ignore +sp_angle_colon = ignore sp_after_angle = ignore sp_angle_paren = ignore sp_angle_paren_empty = ignore diff --git a/tests/cli/Output/mini_d_ucwd.txt b/tests/cli/Output/mini_d_ucwd.txt index 51565002b1..bb5bc79d6e 100644 --- a/tests/cli/Output/mini_d_ucwd.txt +++ b/tests/cli/Output/mini_d_ucwd.txt @@ -174,6 +174,9 @@ sp_before_angle = ignore # ignore/add/remove/force # Add or remove space inside '<' and '>'. sp_inside_angle = ignore # ignore/add/remove/force +# Add or remove space between '<>' and ':'. +sp_angle_colon = ignore # ignore/add/remove/force + # Add or remove space after '<>'. sp_after_angle = ignore # ignore/add/remove/force diff --git a/tests/cli/Output/mini_nd_uc.txt b/tests/cli/Output/mini_nd_uc.txt index 863eff87fa..adf73735ed 100644 --- a/tests/cli/Output/mini_nd_uc.txt +++ b/tests/cli/Output/mini_nd_uc.txt @@ -53,6 +53,7 @@ sp_before_template_paren = ignore sp_template_angle = ignore sp_before_angle = ignore sp_inside_angle = ignore +sp_angle_colon = ignore sp_after_angle = ignore sp_angle_paren = ignore sp_angle_paren_empty = ignore diff --git a/tests/cli/Output/mini_nd_ucwd.txt b/tests/cli/Output/mini_nd_ucwd.txt index dbab3b859d..84df1b5c43 100644 --- a/tests/cli/Output/mini_nd_ucwd.txt +++ b/tests/cli/Output/mini_nd_ucwd.txt @@ -174,6 +174,9 @@ sp_before_angle = ignore # ignore/add/remove/force # Add or remove space inside '<' and '>'. sp_inside_angle = ignore # ignore/add/remove/force +# Add or remove space between '<>' and ':'. +sp_angle_colon = ignore # ignore/add/remove/force + # Add or remove space after '<>'. sp_after_angle = ignore # ignore/add/remove/force diff --git a/tests/cli/Output/show_config.txt b/tests/cli/Output/show_config.txt index b46a752eb9..ce7cca98aa 100644 --- a/tests/cli/Output/show_config.txt +++ b/tests/cli/Output/show_config.txt @@ -172,6 +172,9 @@ sp_before_angle { Ignore, Add, Remove, Force } sp_inside_angle { Ignore, Add, Remove, Force } Add or remove space inside '<' and '>'. +sp_angle_colon { Ignore, Add, Remove, Force } + Add or remove space between '<>' and ':'. + sp_after_angle { Ignore, Add, Remove, Force } Add or remove space after '<>'. diff --git a/tests/config/bug_1001.cfg b/tests/config/bug_1001.cfg new file mode 100644 index 0000000000..1ee0d71505 --- /dev/null +++ b/tests/config/bug_1001.cfg @@ -0,0 +1,3 @@ +sp_angle_colon = force +sp_after_angle = remove +sp_before_class_colon = force diff --git a/tests/cpp.test b/tests/cpp.test index c12bd325b2..b1e6408068 100644 --- a/tests/cpp.test +++ b/tests/cpp.test @@ -401,6 +401,8 @@ 33101 enum_comma-5.cfg cpp/enum_comma.h 33102 enum_comma-6.cfg cpp/enum_comma.h +33105 bug_1001.cfg cpp/bug_1001.cpp + 33110 enum.cfg cpp/enum.cpp 33150 bug_i_753.cfg cpp/bug_i_753.cpp diff --git a/tests/input/cpp/bug_1001.cpp b/tests/input/cpp/bug_1001.cpp new file mode 100644 index 0000000000..b0ce9a06e1 --- /dev/null +++ b/tests/input/cpp/bug_1001.cpp @@ -0,0 +1,4 @@ +template< > +struct Bar< false > : Foo +{ +}; diff --git a/tests/output/cpp/33105-bug_1001.cpp b/tests/output/cpp/33105-bug_1001.cpp new file mode 100644 index 0000000000..b0ce9a06e1 --- /dev/null +++ b/tests/output/cpp/33105-bug_1001.cpp @@ -0,0 +1,4 @@ +template< > +struct Bar< false > : Foo +{ +}; From a79ef5d091394cdbca94755bd08848f676832db2 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Tue, 17 Oct 2017 17:42:50 +0200 Subject: [PATCH 024/136] remove test symlinks --- tests/cli/Input/21.cpp | 1 - tests/cli/Input/25.cpp | 1 - tests/cli/Input/31.cpp | 1 - tests/cli/Input/36.cpp | 1 - tests/cli/Input/66.cpp | 1 - tests/cli/Input/9.cpp | 1 - tests/cli/Input/92.cpp | 1 - tests/cli/Input/{28.cpp => testSrc.cpp} | 0 tests/cli/test_cli_options.py | 4 ++-- tests/cli/test_cli_options.sh | 4 ++-- 10 files changed, 4 insertions(+), 11 deletions(-) delete mode 120000 tests/cli/Input/21.cpp delete mode 120000 tests/cli/Input/25.cpp delete mode 120000 tests/cli/Input/31.cpp delete mode 120000 tests/cli/Input/36.cpp delete mode 120000 tests/cli/Input/66.cpp delete mode 120000 tests/cli/Input/9.cpp delete mode 120000 tests/cli/Input/92.cpp rename tests/cli/Input/{28.cpp => testSrc.cpp} (100%) diff --git a/tests/cli/Input/21.cpp b/tests/cli/Input/21.cpp deleted file mode 120000 index 53134ca5cc..0000000000 --- a/tests/cli/Input/21.cpp +++ /dev/null @@ -1 +0,0 @@ -28.cpp \ No newline at end of file diff --git a/tests/cli/Input/25.cpp b/tests/cli/Input/25.cpp deleted file mode 120000 index 53134ca5cc..0000000000 --- a/tests/cli/Input/25.cpp +++ /dev/null @@ -1 +0,0 @@ -28.cpp \ No newline at end of file diff --git a/tests/cli/Input/31.cpp b/tests/cli/Input/31.cpp deleted file mode 120000 index 53134ca5cc..0000000000 --- a/tests/cli/Input/31.cpp +++ /dev/null @@ -1 +0,0 @@ -28.cpp \ No newline at end of file diff --git a/tests/cli/Input/36.cpp b/tests/cli/Input/36.cpp deleted file mode 120000 index 53134ca5cc..0000000000 --- a/tests/cli/Input/36.cpp +++ /dev/null @@ -1 +0,0 @@ -28.cpp \ No newline at end of file diff --git a/tests/cli/Input/66.cpp b/tests/cli/Input/66.cpp deleted file mode 120000 index 53134ca5cc..0000000000 --- a/tests/cli/Input/66.cpp +++ /dev/null @@ -1 +0,0 @@ -28.cpp \ No newline at end of file diff --git a/tests/cli/Input/9.cpp b/tests/cli/Input/9.cpp deleted file mode 120000 index 53134ca5cc..0000000000 --- a/tests/cli/Input/9.cpp +++ /dev/null @@ -1 +0,0 @@ -28.cpp \ No newline at end of file diff --git a/tests/cli/Input/92.cpp b/tests/cli/Input/92.cpp deleted file mode 120000 index 53134ca5cc..0000000000 --- a/tests/cli/Input/92.cpp +++ /dev/null @@ -1 +0,0 @@ -28.cpp \ No newline at end of file diff --git a/tests/cli/Input/28.cpp b/tests/cli/Input/testSrc.cpp similarity index 100% rename from tests/cli/Input/28.cpp rename to tests/cli/Input/testSrc.cpp diff --git a/tests/cli/test_cli_options.py b/tests/cli/test_cli_options.py index 8215cf670e..3533951318 100644 --- a/tests/cli/test_cli_options.py +++ b/tests/cli/test_cli_options.py @@ -477,7 +477,7 @@ def main(args): # if not check_output(uncr_bin, args_arr=['-c', './Config/mini_nd.cfg', - '-f', './Input/28.cpp', + '-f', './Input/testSrc.cpp', '-p', "./Results/p.txt"], gen_expected_path='./Output/p.txt', gen_result_path='./Results/p.txt', @@ -492,7 +492,7 @@ def main(args): if not check_output(uncr_bin, args_arr=[ '-c', NULL_DEVICE, - '-f', './Input/%s.cpp' % L, + '-f', './Input/testSrc.cpp', '-o', NULL_DEVICE, '-L', L], combine=False, diff --git a/tests/cli/test_cli_options.sh b/tests/cli/test_cli_options.sh index e4e6484f92..69e6f45396 100755 --- a/tests/cli/test_cli_options.sh +++ b/tests/cli/test_cli_options.sh @@ -135,7 +135,7 @@ done # Test -p # ResultsFile="${RESULTS}/p.txt" -InputFile="${INPUT}/28.cpp" +InputFile="${INPUT}/testSrc.cpp" OutputFile="${OUTPUT}/p.txt" ConfigFile="${CONFIG}/mini_nd.cfg" @@ -162,7 +162,7 @@ fi Liste_of_Ls_A="9 21 25 28 31 36 66 92" for L_Value in ${Liste_of_Ls_A} do - InputFile="${INPUT}/${L_Value}.cpp" + InputFile="${INPUT}/testSrc.cpp" OutputFile="${OUTPUT}/${L_Value}.txt" LFile="${RESULTS}/${L_Value}.txt" ../../build/uncrustify -c /dev/null -f "${InputFile}" -o /dev/null -L "${L_Value}" 2> "${LFile}" From 0fc6091f1710a384a20831369e7c46ce857c553b Mon Sep 17 00:00:00 2001 From: Johnny Oskarsson Date: Tue, 17 Oct 2017 18:55:53 +0200 Subject: [PATCH 025/136] Don't force-align with tabs when indenting ternary ':' When using the following settings, a ternary operator ':' should be aligned to '?', yet also adhering to the 'indent with tabs, align with spaces' setting. ``` indent_with_tabs = 1 indent_ternary_operator = 2 ``` The result however is that the ':' is aligned to '?' as if `indent_with_tabs = 2`. (using tabs as much as it can, then aligning the last bit using spaces) I tracked this down to a special handling of ':' in `src/output.cpp`. Here is where I have a caveat: I don't understand what special case this line was supposed to handle. I tried tracking it down in the git history, but I ended up at commit fe25b6d0 ("Import r1644 from subversion"), and then I couldn't find the old subversion repository. No tests broke when removing this line (except for the test for aligning of the ternary operator ':'), so it would appear to only exist to make sure that the ternary ':' is aligned using tabs even though `indent_with_tabs = 1` which I would argue is wrong. I guess my only hope to understand what this line really is supposed to do is to remove it and wait for someone to yell at me that something would/did break when applying this commit. --- src/output.cpp | 3 +-- tests/output/c/09604-indent_ternary-2.c | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/output.cpp b/src/output.cpp index 5448e25b41..4a0abd9133 100644 --- a/src/output.cpp +++ b/src/output.cpp @@ -604,10 +604,9 @@ void output_text(FILE *pfile) size_t lvlcol; /* * FIXME: it would be better to properly set column_indent in - * indent_text(), but this hack for '}' and ':' seems to work. + * indent_text(), but this hack for '}' and '#' seems to work. */ if ( pc->type == CT_BRACE_CLOSE - || chunk_is_str(pc, ":", 1) || pc->type == CT_PREPROC) { lvlcol = pc->column; diff --git a/tests/output/c/09604-indent_ternary-2.c b/tests/output/c/09604-indent_ternary-2.c index 3f5650abfc..e6d3576cb3 100644 --- a/tests/output/c/09604-indent_ternary-2.c +++ b/tests/output/c/09604-indent_ternary-2.c @@ -1,13 +1,13 @@ void foo(void) { int a = x ? y - : z, + : z, b = x ? (y) - : (z), + : (z), c = x ? *y - : *z, + : *z, d = x ? &y - : &z; + : &z; if (x ? y From 3baddbaa4b7a1ea42cbaf6e55ed94c53b3bc86af Mon Sep 17 00:00:00 2001 From: Johnny Oskarsson Date: Tue, 17 Oct 2017 22:54:39 +0200 Subject: [PATCH 026/136] Add special handling for CT_CASE_COLON to output_text() In a previous commit, a `chunk_is_str(pc, ":", 1)` was removed since it changed the behaviour of other colons. Most likely this line was referring to CT_CASE_COLON if e5779e3 is to be interpreted. I cannot see an actual difference in output when using this, but I guess it's better to be safe than sorry. --- src/output.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/output.cpp b/src/output.cpp index 4a0abd9133..6772b12416 100644 --- a/src/output.cpp +++ b/src/output.cpp @@ -607,6 +607,7 @@ void output_text(FILE *pfile) * indent_text(), but this hack for '}' and '#' seems to work. */ if ( pc->type == CT_BRACE_CLOSE + || pc->type == CT_CASE_COLON || pc->type == CT_PREPROC) { lvlcol = pc->column; From 7ecd02b815aad38d1e116d7cd7db8ee9b4ce5721 Mon Sep 17 00:00:00 2001 From: Viktor Kireev Date: Tue, 10 Oct 2017 20:51:48 +0300 Subject: [PATCH 027/136] Fix the detection of CT_BYREF in the 'operator' return type. --- src/combine.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/combine.cpp b/src/combine.cpp index 62f8ee188d..8307f977d9 100644 --- a/src/combine.cpp +++ b/src/combine.cpp @@ -1628,8 +1628,17 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next) || tmp->type == CT_QUALIFIER) { set_chunk_type(prev, CT_TYPE); - set_chunk_type(pc, CT_ADDR); - chunk_flags_set(next, PCF_VAR_1ST); + if ( next->type == CT_OPERATOR + || next->type == CT_TYPE + || next->type == CT_DC_MEMBER) + { + set_chunk_type(pc, CT_BYREF); + } + else + { + set_chunk_type(pc, CT_ADDR); + chunk_flags_set(next, PCF_VAR_1ST); + } } else if (tmp->type == CT_DC_MEMBER) { From e082901eeafce0db8151f12635f81a123c216ca3 Mon Sep 17 00:00:00 2001 From: Viktor Kireev Date: Tue, 10 Oct 2017 20:55:12 +0300 Subject: [PATCH 028/136] Fix align_on_operator in combination with align_mix_var_proto. --- src/align.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/align.cpp b/src/align.cpp index eb9e334ca0..646b2d904d 100644 --- a/src/align.cpp +++ b/src/align.cpp @@ -1310,6 +1310,7 @@ static chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_co if (fp_active && !(pc->flags & PCF_IN_CLASS_BASE)) { + // WARNING: Duplicate from the align_func_proto() if ( pc->type == CT_FUNC_PROTO || ( pc->type == CT_FUNC_DEF && cpd.settings[UO_align_single_line_func].b)) @@ -1317,7 +1318,17 @@ static chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_co LOG_FMT(LAVDB, "%s(%d): add=[%s], orig_line is %zu, orig_col is %zu, level is %zu\n", __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col, pc->level); - as.Add(pc); + chunk_t *toadd; + if ( pc->parent_type == CT_OPERATOR + && cpd.settings[UO_align_on_operator].b) + { + toadd = chunk_get_prev_ncnl(pc); + } + else + { + toadd = pc; + } + as.Add(step_back_over_member(toadd)); fp_look_bro = (pc->type == CT_FUNC_DEF) && cpd.settings[UO_align_single_line_brace].b; } From abab88636634f6997acf3731ca218ef5880b33d1 Mon Sep 17 00:00:00 2001 From: Viktor Kireev Date: Tue, 10 Oct 2017 13:58:20 +0300 Subject: [PATCH 029/136] Fix 'sp_after_operator = remove' in 'operator _word_'. In some cases, the 'sp_after_operator = remove' option eats a space between the 'operator' and the '_word_': Type1::operator type() -> Type1::operatortype(). This patch fixes this issue. --- src/space.cpp | 46 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/src/space.cpp b/src/space.cpp index 8ecddb85da..a565bf2fbe 100644 --- a/src/space.cpp +++ b/src/space.cpp @@ -44,6 +44,17 @@ static void log_rule2(size_t line, const char *rule, chunk_t *first, chunk_t *se */ static argval_t do_space(chunk_t *first, chunk_t *second, int &min_sp, bool complete); +/** + * Ensure to force the space between the \a first and the \a second chunks + * if the PCF_FORCE_SPACE flag is set in the \a first. + * + * @param first The first chunk + * @param second The second chunk + * @param av Av from the do_space() + * + * @return AV_IGNORE, AV_ADD, AV_REMOVE or AV_FORCE + */ +static argval_t ensure_force_space(chunk_t *first, chunk_t *second, argval_t av); //! type that stores two chunks between those no space shall occur struct no_space_table_t @@ -1889,6 +1900,27 @@ static argval_t do_space(chunk_t *first, chunk_t *second, int &min_sp, bool comp } // do_space +static argval_t ensure_force_space(chunk_t *first, chunk_t *second, argval_t av) +{ + if (first->flags & PCF_FORCE_SPACE) + { + int av_int = av; + LOG_FMT(LSPACE, " ", + first->text(), second->text()); + av_int |= AV_ADD; + return(static_cast(av_int)); + } + + return(av); +} + + +static argval_t do_space_ensured(chunk_t *first, chunk_t *second, int &min_sp, bool complete = true) +{ + return(ensure_force_space(first, second, do_space(first, second, min_sp, complete))); +} + + void space_text(void) { LOG_FUNC_ENTRY(); @@ -2064,15 +2096,7 @@ void space_text(void) int min_sp; LOG_FMT(LSPACE, "%s(%d): orig_line is %zu, orig_col is %zu, pc-text() '%s', type is %s\n", __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type)); - argval_t av = do_space(pc, next, min_sp, false); - if (pc->flags & PCF_FORCE_SPACE) - { - int av_int = av; - LOG_FMT(LSPACE, " ", - pc->text(), next->text()); - av_int |= AV_ADD; - av = static_cast(av_int); - } + argval_t av = do_space_ensured(pc, next, min_sp, false); min_sp = max(1, min_sp); switch (av) { @@ -2237,7 +2261,7 @@ size_t space_needed(chunk_t *first, chunk_t *second) LOG_FMT(LSPACE, "%s(%d)\n", __func__, __LINE__); int min_sp; - switch (do_space(first, second, min_sp)) + switch (do_space_ensured(first, second, min_sp)) { case AV_ADD: case AV_FORCE: @@ -2267,7 +2291,7 @@ size_t space_col_align(chunk_t *first, chunk_t *second) log_func_stack_inline(LSPACE); int min_sp; - argval_t av = do_space(first, second, min_sp); + argval_t av = do_space_ensured(first, second, min_sp); LOG_FMT(LSPACE, "%s(%d): av is %s\n", __func__, __LINE__, argval_to_string(av).c_str()); size_t coldiff; From 54cdca69678f4768e1e5405af99af75ac2bbb676 Mon Sep 17 00:00:00 2001 From: Viktor Kireev Date: Tue, 10 Oct 2017 14:08:13 +0300 Subject: [PATCH 030/136] Add tests for the 'sp_after_operator = remove' fix. --- tests/config/op-space-remove-align-1.cfg | 21 ++++++ tests/config/op-space-remove-align-2.cfg | 22 ++++++ tests/cpp.test | 4 ++ tests/output/cpp/30036-operator.cpp | 87 +++++++++++++++++++++++ tests/output/cpp/30037-operator_proto.cpp | 64 +++++++++++++++++ tests/output/cpp/30038-operator.cpp | 87 +++++++++++++++++++++++ tests/output/cpp/30039-operator_proto.cpp | 64 +++++++++++++++++ 7 files changed, 349 insertions(+) create mode 100644 tests/config/op-space-remove-align-1.cfg create mode 100644 tests/config/op-space-remove-align-2.cfg create mode 100644 tests/output/cpp/30036-operator.cpp create mode 100644 tests/output/cpp/30037-operator_proto.cpp create mode 100644 tests/output/cpp/30038-operator.cpp create mode 100644 tests/output/cpp/30039-operator_proto.cpp diff --git a/tests/config/op-space-remove-align-1.cfg b/tests/config/op-space-remove-align-1.cfg new file mode 100644 index 0000000000..a677706fe9 --- /dev/null +++ b/tests/config/op-space-remove-align-1.cfg @@ -0,0 +1,21 @@ +# +# Removes a space after an operator +# + +indent_columns = 3 + +sp_before_byref = remove +sp_after_byref = force + +indent_class = True + +sp_func_def_paren = remove +sp_func_proto_paren = remove +sp_after_operator = remove +sp_after_operator_sym = remove + +align_right_cmt_span = 2 + +align_var_class_span = 2 +align_var_def_span = 2 +align_mix_var_proto = true diff --git a/tests/config/op-space-remove-align-2.cfg b/tests/config/op-space-remove-align-2.cfg new file mode 100644 index 0000000000..01c89728e2 --- /dev/null +++ b/tests/config/op-space-remove-align-2.cfg @@ -0,0 +1,22 @@ +# +# Removes a space after an operator +# + +indent_columns = 3 + +sp_before_byref = remove +sp_after_byref = force + +indent_class = True + +sp_func_def_paren = remove +sp_func_proto_paren = remove +sp_after_operator = remove +sp_after_operator_sym = remove + +align_right_cmt_span = 2 + +align_var_class_span = 2 +align_var_def_span = 2 +align_mix_var_proto = true +align_on_operator = true diff --git a/tests/cpp.test b/tests/cpp.test index 6a7d51cc25..46589dc378 100644 --- a/tests/cpp.test +++ b/tests/cpp.test @@ -40,6 +40,10 @@ 30033 op-space-remove.cfg cpp/operator.cpp 30034 op-space-force.cfg cpp/operator_proto.cpp 30035 op-space-remove.cfg cpp/operator_proto.cpp +30036 op-space-remove-align-1.cfg cpp/operator.cpp +30037 op-space-remove-align-1.cfg cpp/operator_proto.cpp +30038 op-space-remove-align-2.cfg cpp/operator.cpp +30039 op-space-remove-align-2.cfg cpp/operator_proto.cpp 30040 nl_class-r.cfg cpp/nl-class.h 30041 nl_class-a.cfg cpp/nl-class.h diff --git a/tests/output/cpp/30036-operator.cpp b/tests/output/cpp/30036-operator.cpp new file mode 100644 index 0000000000..f36c2631a2 --- /dev/null +++ b/tests/output/cpp/30036-operator.cpp @@ -0,0 +1,87 @@ + +struct bar; +struct foo +{ + operator bar*(); +}; + +class Foo { + Foo operator +(const Foo& rhs) const; + + const Foo& operator==(Foo& me); + + bool operator >(const Foo& rhs) const; + + InStream& operator <<(InStream& in); +} + +const Foo& Foo::operator==(Foo& me) +{ +} + +Foo Foo::operator+(const Foo& rhs) const +{ +} + +bool Foo::operator>(const Foo& rhs) const +{ +} + +class Example +{ + char m_array[256]; + + Example& operator =(const Example& rhs); + Example& operator +=(const Example& rhs); + const Example operator+(const Example& other) const; + bool operator ==(const Example& other) const; + bool operator !=(const Example& other) const; + Example operator +(const Example& x, const Example& y); + Example operator *(const Example& x, const Example& y); + + double& operator ()(int row, int col); + double operator ()(int row, int col) const; + void operator ++(); + int& operator *(); + Example& operator ++(); // prefix ++ + Example operator ++(int); // postfix ++ + + bool operator <(const Example& lhs, const Example& rhs) const; + + int operator()(int index) + { + i = ~~3; + return index + 1; + } + + char& operator[](unsigned i) + { + return m_array[i & 0xff]; + } +} +bool Example::operator==(const Example& other) const +{ + /*TODO: compare something? */ + return false; +} +bool Example::operator!=(const Example& other) const +{ + return !operator==(other); +} + + +void a() { + Op op = &X::operator==; + if (!A) + if (op != &X::operator==) + A(1) = a; + if (!A) { + if (op != &X::operator==) + A(1) = a; + } +} + +void *operator new(std::size_t) throw(std::bad_alloc); +void *operator new[](std::size_t) throw(std::bad_alloc); +void operator delete(void *) throw(); +void operator delete[](void *) throw(); diff --git a/tests/output/cpp/30037-operator_proto.cpp b/tests/output/cpp/30037-operator_proto.cpp new file mode 100644 index 0000000000..a3c0d09ef1 --- /dev/null +++ b/tests/output/cpp/30037-operator_proto.cpp @@ -0,0 +1,64 @@ +/* A collection of all the different known operator prototypes in C++ */ + +// arithmetic operators +Type1 operator +(const Type1& a); // +a +Type1 operator +(const Type1& a, const Type2& b); // a + b +Type1& operator++(Type1& a); // ++a +Type1 operator ++(Type1& a, int); // a++ +Type1& operator+=(Type1& a, const Type1& b); // a += b +Type1 operator -(const Type1& a); // -a +Type1& operator--(Type1& a); // --a +Type1 operator --(Type1& a, int); // a-- +Type1& operator-=(Type1& a, const Type1& b); // a -= b +Type1 operator *(const Type1& a, const Type1& b); // a * b +Type1& operator*=(Type1& a, const Type1& b); // a *= b +Type1 operator /(const Type1& a, const Type1& b); // a / b +Type1& operator/=(Type1& a, const Type1& b); // a /= b +Type1 operator %(const Type1& a, const Type1& b); // a % b +Type1& operator%=(Type1& a, const Type1& b); // a %= b + +// comparison operators +bool operator<(const Type1& a, const Type1& b); // a < b +bool operator<=(const Type1& a, const Type1& b); // a <= b +bool operator>(const Type1& a, const Type1& b); // a > b +bool operator>=(const Type1& a, const Type1& b); // a >= b +bool operator!=(const Type1& a, const Type1& b); // a != b +bool operator==(const Type1& a, const Type1& b); // a == b + +// logical operators +bool operator!(const Type1& a); // !a +bool operator&&(const Type1& a, const Type1& b); // a && b +bool operator||(const Type1& a, const Type1& b); // a || b + +// bitwise operators +Type1 operator <<(const Type1& a, const Type1& b); // a << b +Type1& operator<<=(Type1& a, const Type1& b); // a <<= b +Type1 operator >>(const Type1& a, const Type1& b); // a >> b +Type1& operator>>=(Type1& a, const Type1& b); // a >>= b +Type1 operator ~(const Type1& a); // ~a +Type1 operator &(const Type1& a, const Type1& b); // a & b +Type1& operator&=(Type1& a, const Type1& b); // a &= b +Type1 operator |(const Type1& a, const Type1& b); // a | b +Type1& operator|=(Type1& a, const Type1& b); // a |= b +Type1 operator ^(const Type1& a, const Type1& b); // a ^ b +Type1& operator^=(Type1& a, const Type1& b); // a ^= b + +// other operators +Type1& Type1::operator=(const Type1& b); // a = b +void operator ()(Type1& a); // a() +const Type2& operator [](const Type1& a, const Type1& b); // a[b] +Type2& operator *(const Type1& a); // *a +Type2* operator &(const Type1& a); // &a +Type2* Type1::operator->(); // a->b +Type1::operator type(); // (type)a +Type2& operator ,(const Type1& a, Type2& b); // a, b +void *Type1::operator new(size_t x); // new Type1 +void *Type1::operator new[](size_t x); // new Type1[n] +void *Type1::operator delete(size_t x); // delete a +void *Type1::operator delete[](size_t x); // delete [] a + +// Misc examples +int& operator *(); +Foo::operator const char *(); +Foo::operator const Bar&(); + diff --git a/tests/output/cpp/30038-operator.cpp b/tests/output/cpp/30038-operator.cpp new file mode 100644 index 0000000000..753c959152 --- /dev/null +++ b/tests/output/cpp/30038-operator.cpp @@ -0,0 +1,87 @@ + +struct bar; +struct foo +{ + operator bar*(); +}; + +class Foo { + Foo operator+(const Foo& rhs) const; + + const Foo& operator==(Foo& me); + + bool operator>(const Foo& rhs) const; + + InStream& operator<<(InStream& in); +} + +const Foo& Foo::operator==(Foo& me) +{ +} + +Foo Foo::operator+(const Foo& rhs) const +{ +} + +bool Foo::operator>(const Foo& rhs) const +{ +} + +class Example +{ + char m_array[256]; + + Example& operator=(const Example& rhs); + Example& operator+=(const Example& rhs); + const Example operator+(const Example& other) const; + bool operator==(const Example& other) const; + bool operator!=(const Example& other) const; + Example operator+(const Example& x, const Example& y); + Example operator*(const Example& x, const Example& y); + + double& operator()(int row, int col); + double operator()(int row, int col) const; + void operator++(); + int& operator*(); + Example& operator++(); // prefix ++ + Example operator++(int); // postfix ++ + + bool operator<(const Example& lhs, const Example& rhs) const; + + int operator()(int index) + { + i = ~~3; + return index + 1; + } + + char& operator[](unsigned i) + { + return m_array[i & 0xff]; + } +} +bool Example::operator==(const Example& other) const +{ + /*TODO: compare something? */ + return false; +} +bool Example::operator!=(const Example& other) const +{ + return !operator==(other); +} + + +void a() { + Op op = &X::operator==; + if (!A) + if (op != &X::operator==) + A(1) = a; + if (!A) { + if (op != &X::operator==) + A(1) = a; + } +} + +void *operator new(std::size_t) throw(std::bad_alloc); +void *operator new[](std::size_t) throw(std::bad_alloc); +void operator delete(void *) throw(); +void operator delete[](void *) throw(); diff --git a/tests/output/cpp/30039-operator_proto.cpp b/tests/output/cpp/30039-operator_proto.cpp new file mode 100644 index 0000000000..585a12eeeb --- /dev/null +++ b/tests/output/cpp/30039-operator_proto.cpp @@ -0,0 +1,64 @@ +/* A collection of all the different known operator prototypes in C++ */ + +// arithmetic operators +Type1 operator+(const Type1& a); // +a +Type1 operator+(const Type1& a, const Type2& b); // a + b +Type1& operator++(Type1& a); // ++a +Type1 operator++(Type1& a, int); // a++ +Type1& operator+=(Type1& a, const Type1& b); // a += b +Type1 operator-(const Type1& a); // -a +Type1& operator--(Type1& a); // --a +Type1 operator--(Type1& a, int); // a-- +Type1& operator-=(Type1& a, const Type1& b); // a -= b +Type1 operator*(const Type1& a, const Type1& b); // a * b +Type1& operator*=(Type1& a, const Type1& b); // a *= b +Type1 operator/(const Type1& a, const Type1& b); // a / b +Type1& operator/=(Type1& a, const Type1& b); // a /= b +Type1 operator%(const Type1& a, const Type1& b); // a % b +Type1& operator%=(Type1& a, const Type1& b); // a %= b + +// comparison operators +bool operator<(const Type1& a, const Type1& b); // a < b +bool operator<=(const Type1& a, const Type1& b); // a <= b +bool operator>(const Type1& a, const Type1& b); // a > b +bool operator>=(const Type1& a, const Type1& b); // a >= b +bool operator!=(const Type1& a, const Type1& b); // a != b +bool operator==(const Type1& a, const Type1& b); // a == b + +// logical operators +bool operator!(const Type1& a); // !a +bool operator&&(const Type1& a, const Type1& b); // a && b +bool operator||(const Type1& a, const Type1& b); // a || b + +// bitwise operators +Type1 operator<<(const Type1& a, const Type1& b); // a << b +Type1& operator<<=(Type1& a, const Type1& b); // a <<= b +Type1 operator>>(const Type1& a, const Type1& b); // a >> b +Type1& operator>>=(Type1& a, const Type1& b); // a >>= b +Type1 operator~(const Type1& a); // ~a +Type1 operator&(const Type1& a, const Type1& b); // a & b +Type1& operator&=(Type1& a, const Type1& b); // a &= b +Type1 operator|(const Type1& a, const Type1& b); // a | b +Type1& operator|=(Type1& a, const Type1& b); // a |= b +Type1 operator^(const Type1& a, const Type1& b); // a ^ b +Type1& operator^=(Type1& a, const Type1& b); // a ^= b + +// other operators +Type1& Type1::operator=(const Type1& b); // a = b +void operator()(Type1& a); // a() +const Type2& operator[](const Type1& a, const Type1& b); // a[b] +Type2& operator*(const Type1& a); // *a +Type2* operator&(const Type1& a); // &a +Type2* Type1::operator->(); // a->b + Type1::operator type(); // (type)a +Type2& operator,(const Type1& a, Type2& b); // a, b +void * Type1::operator new(size_t x); // new Type1 +void * Type1::operator new[](size_t x); // new Type1[n] +void * Type1::operator delete(size_t x); // delete a +void * Type1::operator delete[](size_t x); // delete [] a + +// Misc examples +int& operator*(); + Foo::operator const char *(); + Foo::operator const Bar&(); + From 2878a42ddb726a4d1b8c7f3f008b83f073c522d5 Mon Sep 17 00:00:00 2001 From: Viktor Kireev Date: Wed, 18 Oct 2017 16:25:58 +0300 Subject: [PATCH 031/136] Fix 30023 cpp test according to 'force space' --- tests/output/cpp/30023-templates.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/output/cpp/30023-templates.cpp b/tests/output/cpp/30023-templates.cpp index f244caefd2..9ed4d56abe 100644 --- a/tests/output/cpp/30023-templates.cpp +++ b/tests/output/cpp/30023-templates.cpp @@ -163,8 +163,8 @@ void g(X<>& x); typedef std::vector > Table; // OK typedef std::vector > Flags; // Error -void func(List =default_val1); -void func(List >=default_val2); +void func(List =default_val1); +void func(List > =default_val2); BLAH<(3.14 >= 42)> blah; bool X = j<3> > 1; From 71a1a612de0deffa28882df84ebab0e23bb38ea7 Mon Sep 17 00:00:00 2001 From: Viktor Kireev Date: Wed, 18 Oct 2017 16:28:24 +0300 Subject: [PATCH 032/136] Fix 66 cli test according to 'force space' --- tests/cli/Output/66.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/cli/Output/66.txt b/tests/cli/Output/66.txt index 0ece39ffe5..6a14f83d00 100644 --- a/tests/cli/Output/66.txt +++ b/tests/cli/Output/66.txt @@ -244,7 +244,7 @@ space_col_align(): orig_line is , orig_col is , [QUALIFIER/NONE] 'const' <==> or do_space(): orig_line is , orig_col is , first->text() 'const', type is QUALIFIER log_rule(): Spacing: first->orig_line is , first->text() is 'const', [QUALIFIER/NONE] <===> second->text() 'char', [TYPE/NONE] : rule sp_after_type[line ] -space_col_align(): av is force + space_col_align(): av is force len is => coldiff is space_col_align(): orig_line is , orig_col is , [TYPE/NONE] 'char' <==> orig_line is , orig_col is [PTR_TYPE/NONE] '*' [CallStack:-DEBUG NOT SET-] @@ -279,14 +279,14 @@ space_col_align(): orig_line is , orig_col is , [TYPE/NONE] 'unsigned' <==> orig do_space(): orig_line is , orig_col is , first->text() 'unsigned', type is TYPE log_rule(): Spacing: first->orig_line is , first->text() is 'unsigned', [TYPE/NONE] <===> second->text() 'long', [TYPE/NONE] : rule sp_after_type[line ] -space_col_align(): av is force + space_col_align(): av is force len is => coldiff is space_col_align(): orig_line is , orig_col is , [TYPE/NONE] 'long' <==> orig_line is , orig_col is [WORD/NONE] 'nI' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'long', type is TYPE log_rule(): Spacing: first->orig_line is , first->text() is 'long', [TYPE/NONE] <===> second->text() 'nI', [WORD/NONE] : rule sp_after_type[line ] -space_col_align(): av is force + space_col_align(): av is force len is => coldiff is space_col_align(): orig_line is , orig_col is , [WORD/NONE] 'nI' <==> orig_line is , orig_col is [FPAREN_CLOSE/FUNC_CLASS_DEF] ')' [CallStack:-DEBUG NOT SET-] @@ -417,7 +417,7 @@ space_col_align(): orig_line is , orig_col is , [QUALIFIER/NONE] 'const' <==> or do_space(): orig_line is , orig_col is , first->text() 'const', type is QUALIFIER log_rule(): Spacing: first->orig_line is , first->text() is 'const', [QUALIFIER/NONE] <===> second->text() 'char', [TYPE/NONE] : rule sp_after_type[line ] -space_col_align(): av is force + space_col_align(): av is force len is => coldiff is space_col_align(): orig_line is , orig_col is , [TYPE/NONE] 'char' <==> orig_line is , orig_col is [PTR_TYPE/NONE] '*' [CallStack:-DEBUG NOT SET-] @@ -438,7 +438,7 @@ space_col_align(): orig_line is , orig_col is , [QUALIFIER/NONE] 'const' <==> or do_space(): orig_line is , orig_col is , first->text() 'const', type is QUALIFIER log_rule(): Spacing: first->orig_line is , first->text() is 'const', [QUALIFIER/NONE] <===> second->text() 'pTelName', [WORD/NONE] : rule sp_after_type[line ] -space_col_align(): av is force + space_col_align(): av is force len is => coldiff is space_col_align(): orig_line is , orig_col is , [WORD/NONE] 'pTelName' <==> orig_line is , orig_col is [SEMICOLON/NONE] ';' [CallStack:-DEBUG NOT SET-] @@ -457,14 +457,14 @@ space_col_align(): orig_line is , orig_col is , [TYPE/NONE] 'unsigned' <==> orig do_space(): orig_line is , orig_col is , first->text() 'unsigned', type is TYPE log_rule(): Spacing: first->orig_line is , first->text() is 'unsigned', [TYPE/NONE] <===> second->text() 'long', [TYPE/NONE] : rule sp_after_type[line ] -space_col_align(): av is force + space_col_align(): av is force len is => coldiff is space_col_align(): orig_line is , orig_col is , [TYPE/NONE] 'long' <==> orig_line is , orig_col is [WORD/NONE] 'nTelIndex' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'long', type is TYPE log_rule(): Spacing: first->orig_line is , first->text() is 'long', [TYPE/NONE] <===> second->text() 'nTelIndex', [WORD/NONE] : rule sp_after_type[line ] -space_col_align(): av is force + space_col_align(): av is force len is => coldiff is space_col_align(): orig_line is , orig_col is , [WORD/NONE] 'nTelIndex' <==> orig_line is , orig_col is [SEMICOLON/NONE] ';' [CallStack:-DEBUG NOT SET-] From 4c31679e2c13fed984b1e1bfbc59bd4826ad4ba0 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Thu, 19 Oct 2017 12:09:41 +0200 Subject: [PATCH 033/136] fix diff message Setting the working dir to the dir of the script results in generation of unexpected filepaths, therefore every path that is inside the cli directory is build by joining the script dir and a relative path joined. Everything else relies on the (untouched) working dir. --- tests/cli/test_cli_options.py | 142 +++++++++++++++++----------------- tests/cli/test_cli_options.sh | 8 +- 2 files changed, 76 insertions(+), 74 deletions(-) diff --git a/tests/cli/test_cli_options.py b/tests/cli/test_cli_options.py index 3533951318..1b61177bb2 100644 --- a/tests/cli/test_cli_options.py +++ b/tests/cli/test_cli_options.py @@ -9,9 +9,9 @@ """ from __future__ import print_function -from sys import stderr, argv, version_info, exit as sys_exit -from os import chdir, mkdir, remove, name as os_name -from os.path import dirname, abspath, isdir, isfile +from sys import stderr, argv, exit as sys_exit +from os import mkdir, remove, name as os_name +from os.path import dirname, relpath, isdir, isfile, join as path_join from shutil import rmtree from subprocess import Popen, PIPE, STDOUT from io import open @@ -381,16 +381,15 @@ def check_build_type(build_type, cmake_cache_path): def main(args): # set working dir to script dir - script_dir = dirname(abspath(__file__)) - chdir(script_dir) + sc_dir = dirname(relpath(__file__)) # find the uncrustify binary (keep Debug dir excluded) bin_found = False uncr_bin = '' - uncr_bin_locations = ['../../build/uncrustify', - '../../build/Release/uncrustify', - '../../build/Release/uncrustify.exe'] - for uncr_bin in uncr_bin_locations: + bin_paths = [path_join(sc_dir, '../../build/uncrustify'), + path_join(sc_dir, '../../build/Release/uncrustify'), + path_join(sc_dir, '../../build/Release/uncrustify.exe')] + for uncr_bin in bin_paths: if not isfile(uncr_bin): eprint("is not a file: %s" % uncr_bin) else: @@ -407,8 +406,8 @@ def main(args): TODO: find a check for Windows, for now rely on the ../../build/Release/ location ''' - if os_name != 'nt' \ - and not check_build_type('release', '../../build/CMakeCache.txt'): + if os_name != 'nt' and not check_build_type( + 'release', path_join(sc_dir, '../../build/CMakeCache.txt')): sys_exit(EX_USAGE) clear_dir("./Results") @@ -418,70 +417,76 @@ def main(args): # # Test help # -h -? --help --usage - stdout, stderr = proc(uncr_bin) - if not check_output(uncr_bin, - out_expected_path='./Output/help.txt', - out_result_path='./Results/help.txt'): + if not check_output( + uncr_bin, + out_expected_path=path_join(sc_dir, 'Output/help.txt'), + out_result_path=path_join(sc_dir, 'Results/help.txt')): return_flag = False # # Test --show-config # - if not check_output(uncr_bin, - args_arr=['--show-config'], - out_expected_path='./Output/show_config.txt', - out_result_path='./Results/show_config.txt', - out_result_manip=reg_replace(r'\# Uncrustify.+', '')): + if not check_output( + uncr_bin, + args_arr=['--show-config'], + out_expected_path=path_join(sc_dir, 'Output/show_config.txt'), + out_result_path=path_join(sc_dir, 'Results/show_config.txt'), + out_result_manip=reg_replace(r'\# Uncrustify.+', '')): return_flag = False # # Test --update-config # - if not check_output(uncr_bin, - args_arr=['-c', './Config/mini_d.cfg', - '--update-config'], - out_expected_path='./Output/mini_d_uc.txt', - out_result_path='./Results/mini_d_uc.txt', - out_result_manip=reg_replace(r'\# Uncrustify.+', '')): + if not check_output( + uncr_bin, + args_arr=['-c', path_join(sc_dir, 'Config/mini_d.cfg'), + '--update-config'], + out_expected_path=path_join(sc_dir, 'Output/mini_d_uc.txt'), + out_result_path=path_join(sc_dir, 'Results/mini_d_uc.txt'), + out_result_manip=reg_replace(r'\# Uncrustify.+', '')): return_flag = False - if not check_output(uncr_bin, - args_arr=['-c', './Config/mini_nd.cfg', - '--update-config'], - out_expected_path='./Output/mini_nd_uc.txt', - out_result_path='./Results/mini_nd_uc.txt', - out_result_manip=reg_replace(r'\# Uncrustify.+', '')): + if not check_output( + uncr_bin, + args_arr=['-c', path_join(sc_dir, 'Config/mini_nd.cfg'), + '--update-config'], + out_expected_path=path_join(sc_dir, 'Output/mini_nd_uc.txt'), + out_result_path=path_join(sc_dir, 'Results/mini_nd_uc.txt'), + out_result_manip=reg_replace(r'\# Uncrustify.+', '')): return_flag = False # # Test --update-config-with-doc # - if not check_output(uncr_bin, - args_arr=['-c', './Config/mini_d.cfg', - '--update-config-with-doc'], - out_expected_path='./Output/mini_d_ucwd.txt', - out_result_path='./Results/mini_d_ucwd.txt', - out_result_manip=reg_replace(r'\# Uncrustify.+', '')): + if not check_output( + uncr_bin, + args_arr=['-c', path_join(sc_dir, 'Config/mini_d.cfg'), + '--update-config-with-doc'], + out_expected_path=path_join(sc_dir, 'Output/mini_d_ucwd.txt'), + out_result_path=path_join(sc_dir, 'Results/mini_d_ucwd.txt'), + out_result_manip=reg_replace(r'\# Uncrustify.+', '')): return_flag = False - if not check_output(uncr_bin, - args_arr=['-c', './Config/mini_nd.cfg', - '--update-config-with-doc'], - out_expected_path='./Output/mini_nd_ucwd.txt', - out_result_path='./Results/mini_nd_ucwd.txt', - out_result_manip=reg_replace(r'\# Uncrustify.+', '')): + if not check_output( + uncr_bin, + args_arr=['-c', path_join(sc_dir, 'Config/mini_nd.cfg'), + '--update-config-with-doc'], + out_expected_path=path_join(sc_dir, 'Output/mini_nd_ucwd.txt'), + out_result_path=path_join(sc_dir, 'Results/mini_nd_ucwd.txt'), + out_result_manip=reg_replace(r'\# Uncrustify.+', '')): return_flag = False # # Test -p # - if not check_output(uncr_bin, - args_arr=['-c', './Config/mini_nd.cfg', - '-f', './Input/testSrc.cpp', - '-p', "./Results/p.txt"], - gen_expected_path='./Output/p.txt', - gen_result_path='./Results/p.txt', - gen_result_manip=reg_replace(r'\# Uncrustify.+', '')): + if not check_output( + uncr_bin, + args_arr=['-c', path_join(sc_dir, 'Config/mini_nd.cfg'), + '-f', path_join(sc_dir, 'Input/testSrc.cpp'), + '-p', path_join(sc_dir, 'Results/p.txt')], + gen_expected_path=path_join(sc_dir, 'Output/p.txt'), + gen_result_path=path_join(sc_dir, 'Results/p.txt'), + gen_result_manip=reg_replace(r'\# Uncrustify.+', '')): return_flag = False # Debug Options: @@ -489,29 +494,26 @@ def main(args): # look at src/log_levels.h Ls_A = ['9', '21', '25', '28', '31', '36', '66', '92'] for L in Ls_A: - if not check_output(uncr_bin, - args_arr=[ - '-c', NULL_DEVICE, - '-f', './Input/testSrc.cpp', - '-o', NULL_DEVICE, - '-L', L], - combine=False, - err_expected_path='./Output/%s.txt' % L, - err_result_path='./Results/%s.txt' % L, - err_result_manip=reg_replace(r'[0-9]', '')): + if not check_output( + uncr_bin, + args_arr=['-c', NULL_DEVICE, '-L', L, '-o', NULL_DEVICE, + '-f', path_join(sc_dir, 'Input/testSrc.cpp')], + combine=False, + err_expected_path=path_join(sc_dir, 'Output/%s.txt' % L), + err_result_path=path_join(sc_dir, 'Results/%s.txt' % L), + err_result_manip=reg_replace(r'[0-9]', '')): return_flag = False error_tests = ["I-842", "unmatched_close_pp"] for test in error_tests: - if not check_output(uncr_bin, - args_arr=[ - '-q', - '-c', './Config/%s.cfg' % test, - '-f', './Input/%s.cpp' % test, - '-o', NULL_DEVICE], - combine=False, - err_expected_path='./Output/%s.txt' % test, - err_result_path='./Results/%s.txt' % test): + if not check_output( + uncr_bin, + args_arr=['-q', '-c', path_join(sc_dir, 'Config/%s.cfg' % test), + '-f', path_join(sc_dir, 'Input/%s.cpp' % test), + '-o', NULL_DEVICE], + combine=False, + err_expected_path=path_join(sc_dir, 'Output/%s.txt' % test), + err_result_path=path_join(sc_dir, 'Results/%s.txt' % test)): return_flag = False if return_flag: diff --git a/tests/cli/test_cli_options.sh b/tests/cli/test_cli_options.sh index 69e6f45396..8f4b8733c0 100755 --- a/tests/cli/test_cli_options.sh +++ b/tests/cli/test_cli_options.sh @@ -29,10 +29,10 @@ else fi -INPUT="./Input" -OUTPUT="./Output" -CONFIG="./Config" -RESULTS="./Results" +INPUT="Input" +OUTPUT="Output" +CONFIG="Config" +RESULTS="Results" rm -rf ${RESULTS} mkdir ${RESULTS} From 9de3eb5418bb601d202b8bebcdcbe6e6af930d0a Mon Sep 17 00:00:00 2001 From: Viktor Kireev Date: Wed, 18 Oct 2017 18:19:30 +0300 Subject: [PATCH 034/136] Fix test_cli_options.py for Windows newlines issues. --- tests/cli/test_cli_options.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/cli/test_cli_options.py b/tests/cli/test_cli_options.py index 1b61177bb2..4d223f02c4 100644 --- a/tests/cli/test_cli_options.py +++ b/tests/cli/test_cli_options.py @@ -10,7 +10,7 @@ from __future__ import print_function from sys import stderr, argv, exit as sys_exit -from os import mkdir, remove, name as os_name +from os import mkdir, remove, linesep, name as os_name from os.path import dirname, relpath, isdir, isfile, join as path_join from shutil import rmtree from subprocess import Popen, PIPE, STDOUT @@ -96,7 +96,7 @@ def get_file_content(fp): out = None if isfile(fp): - with open(fp, encoding="utf-8") as f: + with open(fp, encoding="utf-8", newline="") as f: out = f.read() else: eprint("is not a file: %s" % fp) @@ -147,7 +147,7 @@ def check_generated_output(gen_expected_path, gen_result_path, result_manip=None if gen_res_txt != gen_exp_txt: - with open(gen_result_path, 'w', encoding="utf-8") as f: + with open(gen_result_path, 'w', encoding="utf-8", newline="") as f: f.write(gen_res_txt) print("\nProblem with %s" % gen_result_path) @@ -193,7 +193,7 @@ def check_std_output(expected_path, result_path, result_str, result_manip=None): result_str = result_manip(result_str) if result_str != exp_txt: - with open(result_path, 'w', encoding="utf-8") as f: + with open(result_path, 'w', encoding="utf-8", newline="") as f: f.write(result_str) print("\nProblem with %s" % result_path) @@ -335,7 +335,7 @@ def file_find_string(search_string, file_path): True if found, False otherwise """ if isfile(file_path): - with open(file_path, encoding="utf-8") as f: + with open(file_path, encoding="utf-8", newline="") as f: if search_string.lower() in f.read().lower(): return True else: @@ -431,7 +431,7 @@ def main(args): args_arr=['--show-config'], out_expected_path=path_join(sc_dir, 'Output/show_config.txt'), out_result_path=path_join(sc_dir, 'Results/show_config.txt'), - out_result_manip=reg_replace(r'\# Uncrustify.+', '')): + out_result_manip=reg_replace(r'\# Uncrustify.+\n', linesep)): return_flag = False # @@ -443,7 +443,7 @@ def main(args): '--update-config'], out_expected_path=path_join(sc_dir, 'Output/mini_d_uc.txt'), out_result_path=path_join(sc_dir, 'Results/mini_d_uc.txt'), - out_result_manip=reg_replace(r'\# Uncrustify.+', '')): + out_result_manip=reg_replace(r'\# Uncrustify.+\n', linesep)): return_flag = False if not check_output( @@ -452,7 +452,7 @@ def main(args): '--update-config'], out_expected_path=path_join(sc_dir, 'Output/mini_nd_uc.txt'), out_result_path=path_join(sc_dir, 'Results/mini_nd_uc.txt'), - out_result_manip=reg_replace(r'\# Uncrustify.+', '')): + out_result_manip=reg_replace(r'\# Uncrustify.+\n', linesep)): return_flag = False # @@ -464,7 +464,7 @@ def main(args): '--update-config-with-doc'], out_expected_path=path_join(sc_dir, 'Output/mini_d_ucwd.txt'), out_result_path=path_join(sc_dir, 'Results/mini_d_ucwd.txt'), - out_result_manip=reg_replace(r'\# Uncrustify.+', '')): + out_result_manip=reg_replace(r'\# Uncrustify.+\n', linesep)): return_flag = False if not check_output( @@ -473,7 +473,7 @@ def main(args): '--update-config-with-doc'], out_expected_path=path_join(sc_dir, 'Output/mini_nd_ucwd.txt'), out_result_path=path_join(sc_dir, 'Results/mini_nd_ucwd.txt'), - out_result_manip=reg_replace(r'\# Uncrustify.+', '')): + out_result_manip=reg_replace(r'\# Uncrustify.+\n', linesep)): return_flag = False # @@ -486,7 +486,7 @@ def main(args): '-p', path_join(sc_dir, 'Results/p.txt')], gen_expected_path=path_join(sc_dir, 'Output/p.txt'), gen_result_path=path_join(sc_dir, 'Results/p.txt'), - gen_result_manip=reg_replace(r'\# Uncrustify.+', '')): + gen_result_manip=reg_replace(r'\# Uncrustify.+\n', linesep)): return_flag = False # Debug Options: From a3ff0fe1ccc2a9220da041e77eed12a647624cd8 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Thu, 19 Oct 2017 20:33:57 +0200 Subject: [PATCH 035/136] remove `\r` from file inputs and proc outputs This makes the script resilient against Windwos style newlines. --- tests/cli/test_cli_options.py | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/tests/cli/test_cli_options.py b/tests/cli/test_cli_options.py index 4d223f02c4..d4f3b29b85 100644 --- a/tests/cli/test_cli_options.py +++ b/tests/cli/test_cli_options.py @@ -10,7 +10,7 @@ from __future__ import print_function from sys import stderr, argv, exit as sys_exit -from os import mkdir, remove, linesep, name as os_name +from os import mkdir, remove, name as os_name from os.path import dirname, relpath, isdir, isfile, join as path_join from shutil import rmtree from subprocess import Popen, PIPE, STDOUT @@ -104,6 +104,11 @@ def get_file_content(fp): return out +def get_file_content_unix_newlined(file_path): + out = get_file_content(file_path) + return None if out is None else out.replace("\r", '') + + def check_generated_output(gen_expected_path, gen_result_path, result_manip=None): """ compares the content of two files, @@ -134,11 +139,11 @@ def check_generated_output(gen_expected_path, gen_result_path, result_manip=None True """ - gen_exp_txt = get_file_content(gen_expected_path) + gen_exp_txt = get_file_content_unix_newlined(gen_expected_path) if gen_exp_txt is None: return False - gen_res_txt = get_file_content(gen_result_path) + gen_res_txt = get_file_content_unix_newlined(gen_result_path) if gen_res_txt is None: return False @@ -185,7 +190,7 @@ def check_std_output(expected_path, result_path, result_str, result_manip=None): True or False depending on whether both files have the same content """ - exp_txt = get_file_content(expected_path) + exp_txt = get_file_content_unix_newlined(expected_path) if exp_txt is None: return False @@ -252,12 +257,12 @@ def check_output( :param gen_result_manip: see out_result_path (is applied, in memory, to the file content of the - file generated by Uncrustify insted) + file generated by Uncrustify instead) :return: bool ---------------------------------------------------------------------------- - True if all specifed files match up, False otherwise + True if all specified files match up, False otherwise """ # check param sanity if not out_expected_path and not err_expected_path and not gen_expected_path: @@ -278,6 +283,8 @@ def check_output( eprint("Set up 'gen_result_path' if 'gen_result_manip' is used") out_res_txt, err_res_txt = proc(uncr_bin, args_arr, combine=combine) + out_res_txt = None if out_res_txt is None else out_res_txt.replace('\r', '') + err_res_txt = None if err_res_txt is None else err_res_txt.replace('\r', '') ret_flag = True @@ -431,7 +438,7 @@ def main(args): args_arr=['--show-config'], out_expected_path=path_join(sc_dir, 'Output/show_config.txt'), out_result_path=path_join(sc_dir, 'Results/show_config.txt'), - out_result_manip=reg_replace(r'\# Uncrustify.+\n', linesep)): + out_result_manip=reg_replace(r'\# Uncrustify.+', '')): return_flag = False # @@ -443,7 +450,7 @@ def main(args): '--update-config'], out_expected_path=path_join(sc_dir, 'Output/mini_d_uc.txt'), out_result_path=path_join(sc_dir, 'Results/mini_d_uc.txt'), - out_result_manip=reg_replace(r'\# Uncrustify.+\n', linesep)): + out_result_manip=reg_replace(r'\# Uncrustify.+', '')): return_flag = False if not check_output( @@ -452,7 +459,7 @@ def main(args): '--update-config'], out_expected_path=path_join(sc_dir, 'Output/mini_nd_uc.txt'), out_result_path=path_join(sc_dir, 'Results/mini_nd_uc.txt'), - out_result_manip=reg_replace(r'\# Uncrustify.+\n', linesep)): + out_result_manip=reg_replace(r'\# Uncrustify.+', '')): return_flag = False # @@ -464,7 +471,7 @@ def main(args): '--update-config-with-doc'], out_expected_path=path_join(sc_dir, 'Output/mini_d_ucwd.txt'), out_result_path=path_join(sc_dir, 'Results/mini_d_ucwd.txt'), - out_result_manip=reg_replace(r'\# Uncrustify.+\n', linesep)): + out_result_manip=reg_replace(r'\# Uncrustify.+', '')): return_flag = False if not check_output( @@ -473,7 +480,7 @@ def main(args): '--update-config-with-doc'], out_expected_path=path_join(sc_dir, 'Output/mini_nd_ucwd.txt'), out_result_path=path_join(sc_dir, 'Results/mini_nd_ucwd.txt'), - out_result_manip=reg_replace(r'\# Uncrustify.+\n', linesep)): + out_result_manip=reg_replace(r'\# Uncrustify.+', '')): return_flag = False # @@ -486,7 +493,7 @@ def main(args): '-p', path_join(sc_dir, 'Results/p.txt')], gen_expected_path=path_join(sc_dir, 'Output/p.txt'), gen_result_path=path_join(sc_dir, 'Results/p.txt'), - gen_result_manip=reg_replace(r'\# Uncrustify.+\n', linesep)): + gen_result_manip=reg_replace(r'\# Uncrustify.+', '')): return_flag = False # Debug Options: From 1a2930937c792c4e29aff26419f5b4b02c772ead Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Thu, 19 Oct 2017 20:36:23 +0200 Subject: [PATCH 036/136] remove the stdout/stderr combine option The order in which stderr and stdout are printed is not consistent across Windows and Linux. The error outputs where moved into their own files which are going to be checked now too. --- tests/cli/Output/mini_d_error.txt | 1 + tests/cli/Output/mini_d_uc.txt | 1 - tests/cli/Output/mini_d_ucwd.txt | 1 - tests/cli/Output/mini_nd_uc.txt | 1 - tests/cli/Output/mini_nd_ucwd.txt | 1 - tests/cli/test_cli_options.py | 46 ++++++++++++------------------- tests/cli/test_cli_options.sh | 40 +++++++++++++++++++++++++-- 7 files changed, 56 insertions(+), 35 deletions(-) create mode 100755 tests/cli/Output/mini_d_error.txt diff --git a/tests/cli/Output/mini_d_error.txt b/tests/cli/Output/mini_d_error.txt new file mode 100755 index 0000000000..f20a102c20 --- /dev/null +++ b/tests/cli/Output/mini_d_error.txt @@ -0,0 +1 @@ +Config/mini_d.cfg:2 Unknown symbol 'not_existing_option' diff --git a/tests/cli/Output/mini_d_uc.txt b/tests/cli/Output/mini_d_uc.txt index 7778634930..c9e1d5911b 100644 --- a/tests/cli/Output/mini_d_uc.txt +++ b/tests/cli/Output/mini_d_uc.txt @@ -1,4 +1,3 @@ -./Config/mini_d.cfg:2 Unknown symbol 'not_existing_option' newlines = auto input_tab_size = 8 diff --git a/tests/cli/Output/mini_d_ucwd.txt b/tests/cli/Output/mini_d_ucwd.txt index 51565002b1..668c253cad 100644 --- a/tests/cli/Output/mini_d_ucwd.txt +++ b/tests/cli/Output/mini_d_ucwd.txt @@ -1,4 +1,3 @@ -./Config/mini_d.cfg:2 Unknown symbol 'not_existing_option' # diff --git a/tests/cli/Output/mini_nd_uc.txt b/tests/cli/Output/mini_nd_uc.txt index 863eff87fa..c5d3535419 100644 --- a/tests/cli/Output/mini_nd_uc.txt +++ b/tests/cli/Output/mini_nd_uc.txt @@ -1,4 +1,3 @@ -./Config/mini_d.cfg:2 Unknown symbol 'not_existing_option' newlines = crlf input_tab_size = 8 diff --git a/tests/cli/Output/mini_nd_ucwd.txt b/tests/cli/Output/mini_nd_ucwd.txt index dbab3b859d..8f72196f6b 100644 --- a/tests/cli/Output/mini_nd_ucwd.txt +++ b/tests/cli/Output/mini_nd_ucwd.txt @@ -1,4 +1,3 @@ -./Config/mini_d.cfg:2 Unknown symbol 'not_existing_option' # diff --git a/tests/cli/test_cli_options.py b/tests/cli/test_cli_options.py index d4f3b29b85..4f86005371 100644 --- a/tests/cli/test_cli_options.py +++ b/tests/cli/test_cli_options.py @@ -34,7 +34,7 @@ def eprint(*args, **kwargs): print(*args, file=stderr, **kwargs) -def proc(bin_path, args_arr=(), combine=True): +def proc(bin_path, args_arr=()): """ simple Popen wrapper to return std out/err utf8 strings @@ -47,9 +47,6 @@ def proc(bin_path, args_arr=(), combine=True): args_arr : list/tuple all needed arguments - :param combine: bool - whether or not to merge stderr into stdout - :return: string, string ---------------------------------------------------------------------------- @@ -63,16 +60,13 @@ def proc(bin_path, args_arr=(), combine=True): return False # call uncrustify, hold output in memory - stdout_f = PIPE - stderr_f = PIPE if not combine else STDOUT - call_arr = [bin_path] call_arr.extend(args_arr) - proc = Popen(call_arr, stdout=stdout_f, stderr=stderr_f) + proc = Popen(call_arr, stdout=PIPE, stderr=PIPE) out_b, err_b = proc.communicate() out_txt = out_b.decode("UTF-8") - err_txt = err_b.decode("UTF-8") if not combine else None + err_txt = err_b.decode("UTF-8") return out_txt, err_txt @@ -208,7 +202,7 @@ def check_std_output(expected_path, result_path, result_str, result_manip=None): def check_output( - uncr_bin, args_arr=(), combine=True, + uncr_bin, args_arr=(), out_expected_path=None, out_result_manip=None, out_result_path=None, err_expected_path=None, err_result_manip=None, err_result_path=None, gen_expected_path=None, gen_result_path=None, gen_result_manip=None): @@ -223,13 +217,8 @@ def check_output( :param args_arr: list/tuple Uncrustify commandline arguments - :param combine: bool - whether or not to merge stderr into stdout, (use ony if - out_expected_path) is set - :param out_expected_path: string file that will be compared with Uncrustifys stdout output - (or combined with stderr if combine is True) :param out_result_manip: string lambda function that will be applied to Uncrustifys stdout output @@ -269,11 +258,6 @@ def check_output( eprint("No expected comparison file provided") return False - if combine and (err_result_path or err_expected_path): - eprint("If combine=True don't set either of err_result_path or " - "err_expected_path") - return False - if bool(gen_expected_path) != bool(gen_result_path): eprint("'gen_expected_path' and 'gen_result_path' must be used in " "combination") @@ -282,7 +266,7 @@ def check_output( if gen_result_manip and not gen_result_path: eprint("Set up 'gen_result_path' if 'gen_result_manip' is used") - out_res_txt, err_res_txt = proc(uncr_bin, args_arr, combine=combine) + out_res_txt, err_res_txt = proc(uncr_bin, args_arr) out_res_txt = None if out_res_txt is None else out_res_txt.replace('\r', '') err_res_txt = None if err_res_txt is None else err_res_txt.replace('\r', '') @@ -293,7 +277,7 @@ def check_output( result_manip=out_result_manip): ret_flag = False - if not combine and err_expected_path and not check_std_output( + if err_expected_path and not check_std_output( err_expected_path, err_result_path, err_res_txt, result_manip=err_result_manip): ret_flag = False @@ -450,7 +434,9 @@ def main(args): '--update-config'], out_expected_path=path_join(sc_dir, 'Output/mini_d_uc.txt'), out_result_path=path_join(sc_dir, 'Results/mini_d_uc.txt'), - out_result_manip=reg_replace(r'\# Uncrustify.+', '')): + out_result_manip=reg_replace(r'\# Uncrustify.+', ''), + err_expected_path=path_join(sc_dir, 'Output/mini_d_error.txt'), + err_result_path=path_join(sc_dir, 'Results/mini_d_error0.txt')): return_flag = False if not check_output( @@ -459,7 +445,9 @@ def main(args): '--update-config'], out_expected_path=path_join(sc_dir, 'Output/mini_nd_uc.txt'), out_result_path=path_join(sc_dir, 'Results/mini_nd_uc.txt'), - out_result_manip=reg_replace(r'\# Uncrustify.+', '')): + out_result_manip=reg_replace(r'\# Uncrustify.+', ''), + err_expected_path=path_join(sc_dir, 'Output/mini_d_error.txt'), + err_result_path=path_join(sc_dir, 'Results/mini_d_error1.txt')): return_flag = False # @@ -471,7 +459,9 @@ def main(args): '--update-config-with-doc'], out_expected_path=path_join(sc_dir, 'Output/mini_d_ucwd.txt'), out_result_path=path_join(sc_dir, 'Results/mini_d_ucwd.txt'), - out_result_manip=reg_replace(r'\# Uncrustify.+', '')): + out_result_manip=reg_replace(r'\# Uncrustify.+', ''), + err_expected_path=path_join(sc_dir, 'Output/mini_d_error.txt'), + err_result_path=path_join(sc_dir, 'Results/mini_d_error2.txt')): return_flag = False if not check_output( @@ -480,7 +470,9 @@ def main(args): '--update-config-with-doc'], out_expected_path=path_join(sc_dir, 'Output/mini_nd_ucwd.txt'), out_result_path=path_join(sc_dir, 'Results/mini_nd_ucwd.txt'), - out_result_manip=reg_replace(r'\# Uncrustify.+', '')): + out_result_manip=reg_replace(r'\# Uncrustify.+', ''), + err_expected_path=path_join(sc_dir, 'Output/mini_d_error.txt'), + err_result_path=path_join(sc_dir, 'Results/mini_d_error3.txt')): return_flag = False # @@ -505,7 +497,6 @@ def main(args): uncr_bin, args_arr=['-c', NULL_DEVICE, '-L', L, '-o', NULL_DEVICE, '-f', path_join(sc_dir, 'Input/testSrc.cpp')], - combine=False, err_expected_path=path_join(sc_dir, 'Output/%s.txt' % L), err_result_path=path_join(sc_dir, 'Results/%s.txt' % L), err_result_manip=reg_replace(r'[0-9]', '')): @@ -518,7 +509,6 @@ def main(args): args_arr=['-q', '-c', path_join(sc_dir, 'Config/%s.cfg' % test), '-f', path_join(sc_dir, 'Input/%s.cpp' % test), '-o', NULL_DEVICE], - combine=False, err_expected_path=path_join(sc_dir, 'Output/%s.txt' % test), err_result_path=path_join(sc_dir, 'Results/%s.txt' % test)): return_flag = False diff --git a/tests/cli/test_cli_options.sh b/tests/cli/test_cli_options.sh index 8f4b8733c0..7d8a5b7308 100755 --- a/tests/cli/test_cli_options.sh +++ b/tests/cli/test_cli_options.sh @@ -81,14 +81,19 @@ fi # # Test --update-config # +G_ErrorFile="mini_d_error" +E_ErrorFile="${OUTPUT}/${G_ErrorFile}.txt" + ConfigFileNames="mini_d mini_nd" +IDX=0 for ConfigFileName in ${ConfigFileNames} do ResultsFile="${RESULTS}/${ConfigFileName}_uc.txt" OutputFile="${OUTPUT}/${ConfigFileName}_uc.txt" ConfigFile="${CONFIG}/${ConfigFileName}.cfg" + R_ErrorFile="${RESULTS}/${G_ErrorFile}${IDX}.txt" - ../../build/uncrustify -c "${ConfigFile}" --update-config &> "${ResultsFile}" + ../../build/uncrustify -c "${ConfigFile}" --update-config > "${ResultsFile}" 2> "${R_ErrorFile}" sed 's/# Uncrustify.*//g' "${ResultsFile}" > "${ResultsFile}.sed" cmp -s "${ResultsFile}.sed" "${OutputFile}" how_different=${?} @@ -103,6 +108,20 @@ do rm "${ResultsFile}" rm "${ResultsFile}.sed" fi + + cmp -s "${R_ErrorFile}" "${E_ErrorFile}" + how_different=${?} + if [ ${how_different} != "0" ] ; + then + echo + echo "Problem with ${R_ErrorFile}" + echo "use: diff ${R_ErrorFile} ${E_ErrorFile} to find why" + diff "${R_ErrorFile}" "${E_ErrorFile}" + echo + else + rm "${R_ErrorFile}" + fi + IDX=`expr $IDX + 1` done # @@ -113,9 +132,10 @@ for ConfigFileName in ${ConfigFileNames} do ResultsFile="${RESULTS}/${ConfigFileName}_ucwd.txt" OutputFile="${OUTPUT}/${ConfigFileName}_ucwd.txt" - ConfigFile="${CONFIG}/${ConfigFileName}.cfg" + ConfigFile="${CONFIG}/${ConfigFileName}.cfg" + R_ErrorFile="${RESULTS}/${G_ErrorFile}${IDX}.txt" - ../../build/uncrustify -c "${ConfigFile}" --update-config-with-doc &> "${ResultsFile}" + ../../build/uncrustify -c "${ConfigFile}" --update-config-with-doc > "${ResultsFile}" 2> "${R_ErrorFile}" sed 's/# Uncrustify.*//g' "${ResultsFile}" > "${ResultsFile}.sed" cmp -s "${ResultsFile}.sed" "${OutputFile}" how_different=${?} @@ -129,6 +149,20 @@ do rm "${ResultsFile}" rm "${ResultsFile}.sed" fi + + cmp -s "${R_ErrorFile}" "${E_ErrorFile}" + how_different=${?} + if [ ${how_different} != "0" ] ; + then + echo + echo "Problem with ${R_ErrorFile}" + echo "use: diff ${R_ErrorFile} ${E_ErrorFile} to find why" + diff "${R_ErrorFile}" "${E_ErrorFile}" + echo + else + rm "${R_ErrorFile}" + fi + IDX=`expr $IDX + 1` done # From 6cf9c0f134c70746f7c2420d1fa3e2e1e40ca26c Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Thu, 19 Oct 2017 20:37:42 +0200 Subject: [PATCH 037/136] the various manip parameters can now take in lists/tuples Also the manipulation functions where converted to proper functions for consistency. --- tests/cli/test_cli_options.py | 60 +++++++++++++++++++++++++++++------ 1 file changed, 51 insertions(+), 9 deletions(-) diff --git a/tests/cli/test_cli_options.py b/tests/cli/test_cli_options.py index 4f86005371..70a2deacf9 100644 --- a/tests/cli/test_cli_options.py +++ b/tests/cli/test_cli_options.py @@ -99,6 +99,9 @@ def get_file_content(fp): def get_file_content_unix_newlined(file_path): + """ + like get_file_content, additionally removes '\r' from the output + """ out = get_file_content(file_path) return None if out is None else out.replace("\r", '') @@ -119,10 +122,10 @@ def check_generated_output(gen_expected_path, gen_result_path, result_manip=None :param gen_result_path: string path to the file that will be generated by Uncrustify - :param result_manip: lambda - optional lambda function that will be applied (before the comparison) + :param result_manip: lambda OR list or tuple of lambdas + optional lambda function(s) that will be applied (before the comparison) on the content of the generated file, - the lambda function should accept one string parameter + the lambda function(s) should accept one string parameter :return: bool @@ -142,7 +145,11 @@ def check_generated_output(gen_expected_path, gen_result_path, result_manip=None return False if result_manip is not None: - gen_res_txt = result_manip(gen_res_txt) + if type(result_manip) is list or type(result_manip) is tuple: + for m in result_manip: + gen_res_txt = m(gen_res_txt) + else: + gen_res_txt = result_manip(gen_res_txt) if gen_res_txt != gen_exp_txt: @@ -175,7 +182,7 @@ def check_std_output(expected_path, result_path, result_str, result_manip=None): :param result_str: string (utf8) the output string generated by Uncrustify - :param result_manip: lambda + :param result_manip: lambda OR list or tuple of lambdas see result_manip for check_generated_output @@ -189,7 +196,11 @@ def check_std_output(expected_path, result_path, result_str, result_manip=None): return False if result_manip is not None: - result_str = result_manip(result_str) + if type(result_manip) is list or type(result_manip) is tuple: + for m in result_manip: + result_str = m(result_str) + else: + result_str = result_manip(result_str) if result_str != exp_txt: with open(result_path, 'w', encoding="utf-8", newline="") as f: @@ -365,9 +376,40 @@ def check_build_type(build_type, cmake_cache_path): return False -""" Regex replacement lambda function, simplistic sed replacement """ -reg_replace = lambda pattern, replacement: \ - lambda text: re.sub(pattern, replacement, text) +def reg_replace(pattern, replacement): + """ + returns a generated lambda function that applies a regex string replacement + + + Parameters: + ---------------------------------------------------------------------------- + + :param pattern: regex pattern + the pattern that will be used to find targets to replace + + :param replacement: string + the replacement that will be applied + + + :return: lambda function + ---------------------------------------------------------------------------- + the generated lambda function, takes in a string on which the + replacement will be applied and returned + + >>> l = reg_replace(r"a", "b") + >>> a = l("a") + 'b' + """ + return lambda text: re.sub(pattern, replacement, text) + + +def string_replace(string_target, replacement): + """ + returns a generated lambda function that applies a string replacement + + like reg_replace, uses string.replace() instead + """ + return lambda text: text.replace(string_target, replacement) def main(args): From 0307255d7bf661101ee3fc56681315cbdc47d2d6 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Thu, 19 Oct 2017 21:47:24 +0200 Subject: [PATCH 038/136] add needed Windows specific replacements --- tests/cli/Output/help.txt | 1 - tests/cli/test_cli_options.py | 116 ++++++++++++++++++++++------------ tests/cli/test_cli_options.sh | 9 ++- 3 files changed, 81 insertions(+), 45 deletions(-) diff --git a/tests/cli/Output/help.txt b/tests/cli/Output/help.txt index 21acc386e9..58a4f39065 100644 --- a/tests/cli/Output/help.txt +++ b/tests/cli/Output/help.txt @@ -31,7 +31,6 @@ Basic Options: --replace : Replace source files (creates a backup). --no-backup : Replace files, no backup. Useful if files are under source control. --if-changed : Write to stdout (or create output FILE) only if a change was detected. - --mtime : Preserve mtime on replaced files. -l : Language override: C, CPP, D, CS, JAVA, PAWN, OC, OC+, VALA. -t : Load a file with types (usually not needed). -q : Quiet mode - no output on stderr (-L will override). diff --git a/tests/cli/test_cli_options.py b/tests/cli/test_cli_options.py index 70a2deacf9..4549f3e347 100644 --- a/tests/cli/test_cli_options.py +++ b/tests/cli/test_cli_options.py @@ -11,7 +11,7 @@ from __future__ import print_function from sys import stderr, argv, exit as sys_exit from os import mkdir, remove, name as os_name -from os.path import dirname, relpath, isdir, isfile, join as path_join +from os.path import dirname, relpath, isdir, isfile, join as path_join, split as path_split from shutil import rmtree from subprocess import Popen, PIPE, STDOUT from io import open @@ -412,6 +412,31 @@ def string_replace(string_target, replacement): return lambda text: text.replace(string_target, replacement) +def s_path_join(path, *paths): + """ + Wrapper for the os.path.join function, splits every path component to + replace it wit a system specific path separator. This is for consistent + path separators (and also systems that don't use either \ or /) + + + Parameter + ---------------------------------------------------------------------------- + :params path, paths: string + see os.path.join + + :return: sting + ---------------------------------------------------------------------------- + a joined path, see os.path.join + + >>> s_path_join('./z/d/', '../a/b/c/f') + ".\z\a\b\c\f" + """ + p_splits = list(path_split(path)) + for r in map(path_split, paths): + p_splits.extend(r) + return path_join(*p_splits) + + def main(args): # set working dir to script dir sc_dir = dirname(relpath(__file__)) @@ -419,9 +444,9 @@ def main(args): # find the uncrustify binary (keep Debug dir excluded) bin_found = False uncr_bin = '' - bin_paths = [path_join(sc_dir, '../../build/uncrustify'), - path_join(sc_dir, '../../build/Release/uncrustify'), - path_join(sc_dir, '../../build/Release/uncrustify.exe')] + bin_paths = [s_path_join(sc_dir, '../../build/uncrustify'), + s_path_join(sc_dir, '../../build/Release/uncrustify'), + s_path_join(sc_dir, '../../build/Release/uncrustify.exe')] for uncr_bin in bin_paths: if not isfile(uncr_bin): eprint("is not a file: %s" % uncr_bin) @@ -440,7 +465,7 @@ def main(args): for now rely on the ../../build/Release/ location ''' if os_name != 'nt' and not check_build_type( - 'release', path_join(sc_dir, '../../build/CMakeCache.txt')): + 'release', s_path_join(sc_dir, '../../build/CMakeCache.txt')): sys_exit(EX_USAGE) clear_dir("./Results") @@ -452,8 +477,13 @@ def main(args): # -h -? --help --usage if not check_output( uncr_bin, - out_expected_path=path_join(sc_dir, 'Output/help.txt'), - out_result_path=path_join(sc_dir, 'Results/help.txt')): + out_expected_path=s_path_join(sc_dir, 'Output/help.txt'), + out_result_path=s_path_join(sc_dir, 'Results/help.txt'), + out_result_manip=[ + string_replace(' --mtime : Preserve mtime on replaced files.\n', ''), + string_replace('.exe', '') + ]): + # return_flag = False # @@ -462,8 +492,8 @@ def main(args): if not check_output( uncr_bin, args_arr=['--show-config'], - out_expected_path=path_join(sc_dir, 'Output/show_config.txt'), - out_result_path=path_join(sc_dir, 'Results/show_config.txt'), + out_expected_path=s_path_join(sc_dir, 'Output/show_config.txt'), + out_result_path=s_path_join(sc_dir, 'Results/show_config.txt'), out_result_manip=reg_replace(r'\# Uncrustify.+', '')): return_flag = False @@ -472,24 +502,26 @@ def main(args): # if not check_output( uncr_bin, - args_arr=['-c', path_join(sc_dir, 'Config/mini_d.cfg'), + args_arr=['-c', s_path_join(sc_dir, 'Config/mini_d.cfg'), '--update-config'], - out_expected_path=path_join(sc_dir, 'Output/mini_d_uc.txt'), - out_result_path=path_join(sc_dir, 'Results/mini_d_uc.txt'), + out_expected_path=s_path_join(sc_dir, 'Output/mini_d_uc.txt'), + out_result_path=s_path_join(sc_dir, 'Results/mini_d_uc.txt'), out_result_manip=reg_replace(r'\# Uncrustify.+', ''), - err_expected_path=path_join(sc_dir, 'Output/mini_d_error.txt'), - err_result_path=path_join(sc_dir, 'Results/mini_d_error0.txt')): + err_expected_path=s_path_join(sc_dir, 'Output/mini_d_error.txt'), + err_result_path=s_path_join(sc_dir, 'Results/mini_d_error0.txt'), + err_result_manip=string_replace('\\', '/')): return_flag = False if not check_output( uncr_bin, - args_arr=['-c', path_join(sc_dir, 'Config/mini_nd.cfg'), + args_arr=['-c', s_path_join(sc_dir, 'Config/mini_nd.cfg'), '--update-config'], - out_expected_path=path_join(sc_dir, 'Output/mini_nd_uc.txt'), - out_result_path=path_join(sc_dir, 'Results/mini_nd_uc.txt'), + out_expected_path=s_path_join(sc_dir, 'Output/mini_nd_uc.txt'), + out_result_path=s_path_join(sc_dir, 'Results/mini_nd_uc.txt'), out_result_manip=reg_replace(r'\# Uncrustify.+', ''), - err_expected_path=path_join(sc_dir, 'Output/mini_d_error.txt'), - err_result_path=path_join(sc_dir, 'Results/mini_d_error1.txt')): + err_expected_path=s_path_join(sc_dir, 'Output/mini_d_error.txt'), + err_result_path=s_path_join(sc_dir, 'Results/mini_d_error1.txt'), + err_result_manip=string_replace('\\', '/')): return_flag = False # @@ -497,24 +529,26 @@ def main(args): # if not check_output( uncr_bin, - args_arr=['-c', path_join(sc_dir, 'Config/mini_d.cfg'), + args_arr=['-c', s_path_join(sc_dir, 'Config/mini_d.cfg'), '--update-config-with-doc'], - out_expected_path=path_join(sc_dir, 'Output/mini_d_ucwd.txt'), - out_result_path=path_join(sc_dir, 'Results/mini_d_ucwd.txt'), + out_expected_path=s_path_join(sc_dir, 'Output/mini_d_ucwd.txt'), + out_result_path=s_path_join(sc_dir, 'Results/mini_d_ucwd.txt'), out_result_manip=reg_replace(r'\# Uncrustify.+', ''), - err_expected_path=path_join(sc_dir, 'Output/mini_d_error.txt'), - err_result_path=path_join(sc_dir, 'Results/mini_d_error2.txt')): + err_expected_path=s_path_join(sc_dir, 'Output/mini_d_error.txt'), + err_result_path=s_path_join(sc_dir, 'Results/mini_d_error2.txt'), + err_result_manip=string_replace('\\', '/')): return_flag = False if not check_output( uncr_bin, - args_arr=['-c', path_join(sc_dir, 'Config/mini_nd.cfg'), + args_arr=['-c', s_path_join(sc_dir, 'Config/mini_nd.cfg'), '--update-config-with-doc'], - out_expected_path=path_join(sc_dir, 'Output/mini_nd_ucwd.txt'), - out_result_path=path_join(sc_dir, 'Results/mini_nd_ucwd.txt'), + out_expected_path=s_path_join(sc_dir, 'Output/mini_nd_ucwd.txt'), + out_result_path=s_path_join(sc_dir, 'Results/mini_nd_ucwd.txt'), out_result_manip=reg_replace(r'\# Uncrustify.+', ''), - err_expected_path=path_join(sc_dir, 'Output/mini_d_error.txt'), - err_result_path=path_join(sc_dir, 'Results/mini_d_error3.txt')): + err_expected_path=s_path_join(sc_dir, 'Output/mini_d_error.txt'), + err_result_path=s_path_join(sc_dir, 'Results/mini_d_error3.txt'), + err_result_manip=string_replace('\\', '/')): return_flag = False # @@ -522,11 +556,11 @@ def main(args): # if not check_output( uncr_bin, - args_arr=['-c', path_join(sc_dir, 'Config/mini_nd.cfg'), - '-f', path_join(sc_dir, 'Input/testSrc.cpp'), - '-p', path_join(sc_dir, 'Results/p.txt')], - gen_expected_path=path_join(sc_dir, 'Output/p.txt'), - gen_result_path=path_join(sc_dir, 'Results/p.txt'), + args_arr=['-c', s_path_join(sc_dir, 'Config/mini_nd.cfg'), + '-f', s_path_join(sc_dir, 'Input/testSrc.cpp'), + '-p', s_path_join(sc_dir, 'Results/p.txt')], + gen_expected_path=s_path_join(sc_dir, 'Output/p.txt'), + gen_result_path=s_path_join(sc_dir, 'Results/p.txt'), gen_result_manip=reg_replace(r'\# Uncrustify.+', '')): return_flag = False @@ -538,9 +572,9 @@ def main(args): if not check_output( uncr_bin, args_arr=['-c', NULL_DEVICE, '-L', L, '-o', NULL_DEVICE, - '-f', path_join(sc_dir, 'Input/testSrc.cpp')], - err_expected_path=path_join(sc_dir, 'Output/%s.txt' % L), - err_result_path=path_join(sc_dir, 'Results/%s.txt' % L), + '-f', s_path_join(sc_dir, 'Input/testSrc.cpp')], + err_expected_path=s_path_join(sc_dir, 'Output/%s.txt' % L), + err_result_path=s_path_join(sc_dir, 'Results/%s.txt' % L), err_result_manip=reg_replace(r'[0-9]', '')): return_flag = False @@ -548,11 +582,11 @@ def main(args): for test in error_tests: if not check_output( uncr_bin, - args_arr=['-q', '-c', path_join(sc_dir, 'Config/%s.cfg' % test), - '-f', path_join(sc_dir, 'Input/%s.cpp' % test), + args_arr=['-q', '-c', s_path_join(sc_dir, 'Config/%s.cfg' % test), + '-f', s_path_join(sc_dir, 'Input/%s.cpp' % test), '-o', NULL_DEVICE], - err_expected_path=path_join(sc_dir, 'Output/%s.txt' % test), - err_result_path=path_join(sc_dir, 'Results/%s.txt' % test)): + err_expected_path=s_path_join(sc_dir, 'Output/%s.txt' % test), + err_result_path=s_path_join(sc_dir, 'Results/%s.txt' % test)): return_flag = False if return_flag: diff --git a/tests/cli/test_cli_options.sh b/tests/cli/test_cli_options.sh index 7d8a5b7308..e899c97a8c 100755 --- a/tests/cli/test_cli_options.sh +++ b/tests/cli/test_cli_options.sh @@ -44,17 +44,20 @@ mkdir ${RESULTS} file="help.txt" ../../build/uncrustify > "${RESULTS}/${file}" -cmp -s "${RESULTS}/${file}" "${OUTPUT}/${file}" + +sed -e ':a' -e 'N' -e '$!ba' -e 's| --mtime : Preserve mtime on replaced files.\n||g' "${RESULTS}/${file}" > "${RESULTS}/${file}.sed" +cmp -s "${RESULTS}/${file}.sed" "${OUTPUT}/${file}" how_different=${?} if [ ${how_different} != "0" ] ; then echo echo "Problem with "${file} - echo "use: diff ${RESULTS}/${file} ${OUTPUT}/${file} to find why" - diff --unified=5 "${RESULTS}/${file}" "${OUTPUT}/${file}" + echo "use: diff ${RESULTS}/${file}.sed ${OUTPUT}/${file} to find why" + diff "${RESULTS}/${file}.sed" "${OUTPUT}/${file}" echo else rm "${RESULTS}/${file}" + rm "${RESULTS}/${file}.sed" fi # From 4dd498abda4d8f1d3546c67ce2ccaab5b5ac45e2 Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Fri, 20 Oct 2017 18:17:36 +0200 Subject: [PATCH 039/136] A bugfix proposal for #1112 --- src/chunk_list.cpp | 25 +++++++++ src/chunk_list.h | 9 ++++ src/combine.cpp | 83 ++++++++++++++--------------- tests/cli/test_cli_options.sh | 14 ++--- tests/config/bug_1112.cfg | 3 ++ tests/cpp.test | 2 + tests/input/cpp/bug_1112.cpp | 2 + tests/output/cpp/33160-bug_1112.cpp | 2 + 8 files changed, 91 insertions(+), 49 deletions(-) create mode 100644 tests/config/bug_1112.cfg create mode 100644 tests/input/cpp/bug_1112.cpp create mode 100644 tests/output/cpp/33160-bug_1112.cpp diff --git a/src/chunk_list.cpp b/src/chunk_list.cpp index 74af176ae9..a6ca533cc0 100644 --- a/src/chunk_list.cpp +++ b/src/chunk_list.cpp @@ -140,6 +140,9 @@ static chunk_t *chunk_search_typelevel(chunk_t *cur, c_token_t type, scope_e sco static chunk_t *chunk_get_ncnlnp(chunk_t *cur, const scope_e scope = scope_e::ALL, const direction_e dir = direction_e::FORWARD); +static chunk_t *chunk_get_ncnlnpnd(chunk_t *cur, const scope_e scope = scope_e::ALL, const direction_e dir = direction_e::FORWARD); + + /** * @brief searches a chunk that holds a specific string * @@ -502,6 +505,12 @@ chunk_t *chunk_get_prev_ncnlnp(chunk_t *cur, scope_e scope) } +chunk_t *chunk_get_prev_ncnlnpnd(chunk_t *cur, scope_e scope) +{ + return(chunk_get_ncnlnpnd(cur, scope, direction_e::BACKWARD)); +} + + chunk_t *chunk_get_next_nblank(chunk_t *cur, scope_e scope) { return(chunk_search(cur, chunk_is_comment_newline_or_blank, scope, direction_e::FORWARD, false)); @@ -784,6 +793,22 @@ static chunk_t *chunk_get_ncnlnp(chunk_t *cur, const scope_e scope, const direct } +static chunk_t *chunk_get_ncnlnpnd(chunk_t *cur, const scope_e scope, const direction_e dir) +{ + search_t search_function = select_search_fct(dir); + chunk_t *pc = cur; + + do // loop over the chunk list + { + pc = search_function(pc, scope); // in either direction while + } while ( pc != nullptr // the end of the list was not reached yet + && !chunk_is_comment_or_newline(pc) + && !chunk_is_preproc(pc) + && (pc->type == CT_DC_MEMBER)); + return(pc); +} + + static chunk_t *chunk_add(const chunk_t *pc_in, chunk_t *ref, const direction_e pos) { chunk_t *pc = chunk_dup(pc_in); diff --git a/src/chunk_list.h b/src/chunk_list.h index db8094d8bb..5d5336c1a1 100644 --- a/src/chunk_list.h +++ b/src/chunk_list.h @@ -290,6 +290,15 @@ chunk_t *chunk_get_prev_ncnl(chunk_t *cur, scope_e scope = scope_e::ALL); chunk_t *chunk_get_prev_ncnlnp(chunk_t *cur, scope_e scope = scope_e::ALL); +/** + * Gets the prev non-NEWLINE and non-comment chunk, non-preprocessor chunk, non-DC_MEMBER chunk + * + * @param cur chunk to use as start point + * @param scope code region to search in + */ +chunk_t *chunk_get_prev_ncnlnpnd(chunk_t *cur, scope_e scope = scope_e::ALL); + + /** * Grabs the next chunk of the given type at the level. * diff --git a/src/combine.cpp b/src/combine.cpp index 62f8ee188d..6867a1a2ed 100644 --- a/src/combine.cpp +++ b/src/combine.cpp @@ -767,32 +767,6 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next) LOG_FUNC_ENTRY(); chunk_t *tmp; - if (pc->type == CT_NEWLINE) - { - LOG_FMT(LGUY, "%s(%d): orig_line is %zu, orig_col is %zu, CT_NEWLINE\n", - __func__, __LINE__, pc->orig_line, pc->orig_col); - } - else if (pc->type == CT_VBRACE_OPEN) - { - LOG_FMT(LGUY, "%s(%d): orig_line is %zu, orig_col is %zu, CT_VBRACE_OPEN\n", - __func__, __LINE__, pc->orig_line, pc->orig_col); - } - else if (pc->type == CT_VBRACE_CLOSE) - { - LOG_FMT(LGUY, "%s(%d): orig_line is %zu, orig_col is %zu, CT_VBRACE_CLOSE\n", - __func__, __LINE__, pc->orig_line, pc->orig_col); - } - else - { - LOG_FMT(LGUY, "%s(%d): orig_line is %zu, orig_col is %zu, pc->text() '%s', pc->type is %s\n", - __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type)); - } - // LOG_FMT(LSYS, " %3d > ['%s' %s] ['%s' %s] ['%s' %s]\n", - // pc->orig_line, - // prev->text(), get_token_name(prev->type), - // pc->text(), get_token_name(pc->type), - // next->text(), get_token_name(next->type)); - if (pc->type == CT_OC_AT) { if ( next->type == CT_PAREN_OPEN @@ -3815,6 +3789,8 @@ static void mark_function(chunk_t *pc) { LOG_FUNC_ENTRY(); + LOG_FMT(LFCN, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s'\n", + __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text()); chunk_t *prev = chunk_get_prev_ncnlnp(pc); chunk_t *next = chunk_get_next_ncnlnp(pc); if (next == nullptr) @@ -3895,9 +3871,10 @@ static void mark_function(chunk_t *pc) } } - LOG_FMT(LFCN, "%s(%d): orig_line=%zu] %s[%s] - parent=%s level=%zu/%zu, next=%s[%s] - level=%zu\n", - __func__, __LINE__, pc->orig_line, pc->text(), - get_token_name(pc->type), get_token_name(pc->parent_type), + LOG_FMT(LFCN, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s, type is %s, parent_type is %s\n", + __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), + get_token_name(pc->type), get_token_name(pc->parent_type)); + LOG_FMT(LFCN, " level is %zu, brace_level is %zu, next->text() '%s', next->type is %s, next->level is %zu\n", pc->level, pc->brace_level, next->text(), get_token_name(next->type), next->level); @@ -4043,13 +4020,13 @@ static void mark_function(chunk_t *pc) // Assume it is a function call if not already labeled if (pc->type == CT_FUNCTION) { - LOG_FMT(LFCN, "%s(%d): examine [%zu.%zu] [%s], type is %s\n", + LOG_FMT(LFCN, "%s(%d): examine: orig_line is %zu, orig_col is %zu, text() '%s', type is %s\n", __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type)); // look for an assigment. Issue 575 chunk_t *temp = chunk_get_next_type(pc, CT_ASSIGN, pc->level); if (temp != nullptr) { - LOG_FMT(LFCN, "%s(%d): assigment found [%zu.%zu] [%s]\n", + LOG_FMT(LFCN, "%s(%d): assigment found, orig_line is %zu, orig_col is %zu, text() '%s'\n", __func__, __LINE__, temp->orig_line, temp->orig_col, temp->text()); set_chunk_type(pc, CT_FUNC_CALL); } @@ -4123,7 +4100,8 @@ static void mark_function(chunk_t *pc) #ifdef DEBUG LOG_FMT(LFCN, "%s(%d):", __func__, __LINE__); #endif - LOG_FMT(LFCN, " Checking func call: prev=%s", (prev == NULL) ? "" : get_token_name(prev->type)); + LOG_FMT(LFCN, " Checking func call: prev->text() '%s', prev->type is %s", + prev->text(), (prev == NULL) ? "" : get_token_name(prev->type)); #ifdef DEBUG LOG_FMT(LFCN, "\n"); #endif @@ -4153,6 +4131,11 @@ static void mark_function(chunk_t *pc) */ while (prev != nullptr) { +#ifdef DEBUG + LOG_FMT(LFCN, "%s(%d): next step with: ", __func__, __LINE__); +#endif + LOG_FMT(LFCN, "orig_line is %zu, orig_col is %zu, text() '%s'\n", + prev->orig_line, prev->orig_col, prev->text()); if (prev->flags & PCF_IN_PREPROC) { prev = chunk_get_prev_ncnlnp(prev); @@ -4196,8 +4179,24 @@ static void mark_function(chunk_t *pc) isa_def = false; break; } - LOG_FMT(LFCN, " ", prev->text()); - prev = chunk_get_prev_ncnlnp(prev); +#ifdef DEBUG + LOG_FMT(LFCN, "%s(%d):", __func__, __LINE__); +#endif + LOG_FMT(LFCN, " ", prev->text()); +#ifdef DEBUG + LOG_FMT(LFCN, "\n"); +#endif + // Issue #1112 + prev = chunk_get_prev_ncnlnpnd(prev); + if (prev == nullptr) + { + LOG_FMT(LFCN, "nullptr\n"); + } + else + { + LOG_FMT(LFCN, "orig_line is %zu, orig_col is %zu, text() '%s'\n", + prev->orig_line, prev->orig_col, prev->text()); + } continue; } @@ -4207,7 +4206,7 @@ static void mark_function(chunk_t *pc) if (!hit_star) { #ifdef DEBUG - LOG_FMT(LFCN, "\n%s(%d) ", __func__, __LINE__); + LOG_FMT(LFCN, "%s(%d) ", __func__, __LINE__); #endif LOG_FMT(LFCN, " --> For sure a prototype or definition\n"); isa_def = true; @@ -4234,7 +4233,7 @@ static void mark_function(chunk_t *pc) && !chunk_is_ptr_operator(prev)) { #ifdef DEBUG - LOG_FMT(LFCN, "\n%s(%d) ", __func__, __LINE__); + LOG_FMT(LFCN, "%s(%d) ", __func__, __LINE__); #endif LOG_FMT(LFCN, " --> Stopping on %s [%s]\n", prev->text(), get_token_name(prev->type)); @@ -4535,7 +4534,7 @@ static void mark_cpp_constructor(chunk_t *pc) is_destr = true; } - LOG_FMT(LFTOR, "%s(%d): %zu:%zu FOUND %sSTRUCTOR for '%s'[%s] prev=%s[%s]", + LOG_FMT(LFTOR, "%s(%d): orig_line is %zu, orig_col is %zu, FOUND %sSTRUCTOR for '%s'[%s] prev '%s'[%s]", __func__, __LINE__, pc->orig_line, pc->orig_col, is_destr ? "DE" : "CON", pc->text(), get_token_name(pc->type), @@ -4554,7 +4553,7 @@ static void mark_cpp_constructor(chunk_t *pc) fix_fcn_def_params(paren_open); after = flag_parens(paren_open, PCF_IN_FCN_CALL, CT_FPAREN_OPEN, CT_FUNC_CLASS_PROTO, false); - LOG_FMT(LFTOR, "[%s]\n", after->text()); + LOG_FMT(LFTOR, "%s(%d): text() '%s'\n", __func__, __LINE__, after->text()); // Scan until the brace open, mark everything tmp = paren_open; @@ -4593,8 +4592,8 @@ static void mark_cpp_constructor(chunk_t *pc) { set_chunk_parent(tmp, CT_FUNC_CLASS_PROTO); set_chunk_type(pc, CT_FUNC_CLASS_PROTO); - LOG_FMT(LFCN, " 2) Marked [%s] as FUNC_CLASS_PROTO on line %zu col %zu\n", - pc->text(), pc->orig_line, pc->orig_col); + LOG_FMT(LFCN, "%s(%d): 2) Marked '%s' as FUNC_CLASS_PROTO on orig_line %zu, orig_col %zu\n", + __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col); } } } // mark_cpp_constructor @@ -4626,7 +4625,7 @@ static void mark_class_ctor(chunk_t *start) if (pc == nullptr) { - LOG_FMT(LFTOR, "%s(%d): Called on %s on line %zu. Bailed on NULL\n", + LOG_FMT(LFTOR, "%s(%d): Called on %s on orig_line %zu. Bailed on NULL\n", __func__, __LINE__, pclass->text(), pclass->orig_line); return; } @@ -4635,7 +4634,7 @@ static void mark_class_ctor(chunk_t *start) ChunkStack cs; cs.Push_Back(pclass); - LOG_FMT(LFTOR, "%s(%d): Called on %s on line %zu (next='%s')\n", + LOG_FMT(LFTOR, "%s(%d): Called on %s on orig_line %zu (next='%s')\n", __func__, __LINE__, pclass->text(), pclass->orig_line, pc->text()); // detect D template class: "class foo(x) { ... }" diff --git a/tests/cli/test_cli_options.sh b/tests/cli/test_cli_options.sh index 69e6f45396..009c428e7b 100755 --- a/tests/cli/test_cli_options.sh +++ b/tests/cli/test_cli_options.sh @@ -49,7 +49,7 @@ how_different=${?} if [ ${how_different} != "0" ] ; then echo - echo "Problem with "${file} + echo "1Problem with "${file} echo "use: diff ${RESULTS}/${file} ${OUTPUT}/${file} to find why" diff --unified=5 "${RESULTS}/${file}" "${OUTPUT}/${file}" echo @@ -69,7 +69,7 @@ how_different=${?} if [ ${how_different} != "0" ] ; then echo - echo "Problem with ${RESULTS}/${file}.sed" + echo "2Problem with ${RESULTS}/${file}.sed" echo "use: diff ${RESULTS}/${file}.sed ${OUTPUT}/${file} to find why" diff "${RESULTS}/${file}.sed" "${OUTPUT}/${file}" echo @@ -95,7 +95,7 @@ do if [ ${how_different} != "0" ] ; then echo - echo "Problem with ${ResultsFile}.sed" + echo "3Problem with ${ResultsFile}.sed" echo "use: diff ${ResultsFile}.sed ${OutputFile} to find why" diff "${ResultsFile}.sed" "${OutputFile}" echo @@ -121,7 +121,7 @@ do how_different=${?} if [ ${how_different} != "0" ] ; then - echo "Problem with ${ResultsFile}.sed" + echo "4Problem with ${ResultsFile}.sed" echo "use: diff ${ResultsFile}.sed ${OutputFile} to find why" diff "${ResultsFile}.sed" "${OutputFile}" echo @@ -145,7 +145,7 @@ cmp -s "${ResultsFile}.sed" "${OutputFile}" how_different=${?} if [ ${how_different} != "0" ] ; then - echo "Problem with ${ResultsFile}.sed" + echo "5Problem with ${ResultsFile}.sed" echo "use: diff ${ResultsFile}.sed ${OutputFile} to find why" diff "${ResultsFile}.sed" "${OutputFile}" echo @@ -173,7 +173,7 @@ do if [ ${how_different} != "0" ] ; then echo - echo "Problem with "${InputFile} + echo "6Problem with "${InputFile} echo "use: diff ${LFile}.sed ${OutputFile} to find why" diff "${LFile}.sed" "${OutputFile}" diff "${LFile}" "${OutputFile}" @@ -198,7 +198,7 @@ do if [ ${how_different} != "0" ] ; then echo - echo "Problem with "${Error_T} + echo "7Problem with "${Error_T} echo "use: diff ${ErrFile} ${OutputFile} to find why" diff "${ErrFile}" "${OutputFile}" echo diff --git a/tests/config/bug_1112.cfg b/tests/config/bug_1112.cfg new file mode 100644 index 0000000000..1186249900 --- /dev/null +++ b/tests/config/bug_1112.cfg @@ -0,0 +1,3 @@ +sp_arith = force +sp_before_byref = remove +sp_after_byref = force diff --git a/tests/cpp.test b/tests/cpp.test index 6a7d51cc25..cc7407f496 100644 --- a/tests/cpp.test +++ b/tests/cpp.test @@ -409,6 +409,8 @@ 33151 bug_i_752.cfg cpp/bug_i_752.cpp 33152 bug_1004.cfg cpp/bug_1004.cpp +33160 bug_1112.cfg cpp/bug_1112.cpp + 33200 first_len_minimum.cfg cpp/first_len_minimum.cpp 33201 indent_ctor_members_twice.cfg cpp/indent_ctor_members_twice.cpp diff --git a/tests/input/cpp/bug_1112.cpp b/tests/input/cpp/bug_1112.cpp new file mode 100644 index 0000000000..e653764199 --- /dev/null +++ b/tests/input/cpp/bug_1112.cpp @@ -0,0 +1,2 @@ +::std::vector & foo(); +std::vector & bar(); diff --git a/tests/output/cpp/33160-bug_1112.cpp b/tests/output/cpp/33160-bug_1112.cpp new file mode 100644 index 0000000000..da95fcb669 --- /dev/null +++ b/tests/output/cpp/33160-bug_1112.cpp @@ -0,0 +1,2 @@ +::std::vector& foo(); +std::vector& bar(); From 00272bf169db3edf21416ac1e1745844799a4aaa Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Fri, 20 Oct 2017 21:11:02 +0200 Subject: [PATCH 040/136] test the null pointer --- src/combine.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/combine.cpp b/src/combine.cpp index 6867a1a2ed..658ea65d3c 100644 --- a/src/combine.cpp +++ b/src/combine.cpp @@ -4100,8 +4100,15 @@ static void mark_function(chunk_t *pc) #ifdef DEBUG LOG_FMT(LFCN, "%s(%d):", __func__, __LINE__); #endif - LOG_FMT(LFCN, " Checking func call: prev->text() '%s', prev->type is %s", - prev->text(), (prev == NULL) ? "" : get_token_name(prev->type)); + if (prev == NULL) + { + LOG_FMT(LFCN, " Checking func call: prev->type is NULL"); + } + else + { + LOG_FMT(LFCN, " Checking func call: prev->text() '%s', prev->type is %s", + prev->text(), get_token_name(prev->type)); + } #ifdef DEBUG LOG_FMT(LFCN, "\n"); #endif From ec09de3dd2d02a66ab5bdc50721c7880b755c2ec Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Fri, 20 Oct 2017 21:13:28 +0200 Subject: [PATCH 041/136] Typo for a test (sorry) --- tests/cli/test_cli_options.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/cli/test_cli_options.sh b/tests/cli/test_cli_options.sh index 009c428e7b..69e6f45396 100755 --- a/tests/cli/test_cli_options.sh +++ b/tests/cli/test_cli_options.sh @@ -49,7 +49,7 @@ how_different=${?} if [ ${how_different} != "0" ] ; then echo - echo "1Problem with "${file} + echo "Problem with "${file} echo "use: diff ${RESULTS}/${file} ${OUTPUT}/${file} to find why" diff --unified=5 "${RESULTS}/${file}" "${OUTPUT}/${file}" echo @@ -69,7 +69,7 @@ how_different=${?} if [ ${how_different} != "0" ] ; then echo - echo "2Problem with ${RESULTS}/${file}.sed" + echo "Problem with ${RESULTS}/${file}.sed" echo "use: diff ${RESULTS}/${file}.sed ${OUTPUT}/${file} to find why" diff "${RESULTS}/${file}.sed" "${OUTPUT}/${file}" echo @@ -95,7 +95,7 @@ do if [ ${how_different} != "0" ] ; then echo - echo "3Problem with ${ResultsFile}.sed" + echo "Problem with ${ResultsFile}.sed" echo "use: diff ${ResultsFile}.sed ${OutputFile} to find why" diff "${ResultsFile}.sed" "${OutputFile}" echo @@ -121,7 +121,7 @@ do how_different=${?} if [ ${how_different} != "0" ] ; then - echo "4Problem with ${ResultsFile}.sed" + echo "Problem with ${ResultsFile}.sed" echo "use: diff ${ResultsFile}.sed ${OutputFile} to find why" diff "${ResultsFile}.sed" "${OutputFile}" echo @@ -145,7 +145,7 @@ cmp -s "${ResultsFile}.sed" "${OutputFile}" how_different=${?} if [ ${how_different} != "0" ] ; then - echo "5Problem with ${ResultsFile}.sed" + echo "Problem with ${ResultsFile}.sed" echo "use: diff ${ResultsFile}.sed ${OutputFile} to find why" diff "${ResultsFile}.sed" "${OutputFile}" echo @@ -173,7 +173,7 @@ do if [ ${how_different} != "0" ] ; then echo - echo "6Problem with "${InputFile} + echo "Problem with "${InputFile} echo "use: diff ${LFile}.sed ${OutputFile} to find why" diff "${LFile}.sed" "${OutputFile}" diff "${LFile}" "${OutputFile}" @@ -198,7 +198,7 @@ do if [ ${how_different} != "0" ] ; then echo - echo "7Problem with "${Error_T} + echo "Problem with "${Error_T} echo "use: diff ${ErrFile} ${OutputFile} to find why" diff "${ErrFile}" "${OutputFile}" echo From a8d8c6605e3ac846d6f50118bf621507aab8a53d Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Mon, 23 Oct 2017 10:46:49 +0200 Subject: [PATCH 042/136] Prepare the test of pointers used in the macro LOG_FMT. --- src/logger.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/logger.h b/src/logger.h index f3e0ff7ed0..673802ab7b 100644 --- a/src/logger.h +++ b/src/logger.h @@ -113,6 +113,12 @@ void log_fmt(log_sev_t sev, const char *fmt, ...) __attribute__((format(printf, void log_flush(bool force_nl); +// it is necessary to make at least one time pro change a check of all the +// uses of the MACRO LOG_FMT under Linux. This to detect all the used pointers, +// which might be nullptr. +// uncomment the define to do that. +//#define NO_MACRO_VARARG + #ifdef NO_MACRO_VARARG #define LOG_FMT log_fmt // TODO during debugging add source file and line number From 2093c5d54328f681bd9d125be9f14dc976ebe6ce Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Sun, 22 Oct 2017 19:28:34 +0200 Subject: [PATCH 043/136] fix diff message Setting the working directory to the script directory caused that wrong diff paths where printed if the script was not run inside the script directory. To fix this a perl command is used to generate a relative path from the (initial) working directory to the script directory. This relative path is attached to paths that are relative to the script directory. As end result now pahts are printed that are relative to the (initial) working directory, instead of the script directory. --- tests/cli/test_cli_options.sh | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/tests/cli/test_cli_options.sh b/tests/cli/test_cli_options.sh index e899c97a8c..0ff816b2fb 100755 --- a/tests/cli/test_cli_options.sh +++ b/tests/cli/test_cli_options.sh @@ -12,9 +12,13 @@ # jump into the script dir so that printed paths are always the same +init_pwd=$PWD script_dir=$(dirname "$(readlink -f "$0")") cd $script_dir +RELATIVE=$(perl -MFile::Spec -e "print File::Spec->abs2rel(q(${script_dir}),q(${init_pwd}))") + + #set -x #exit 0 # control the CMAKE_BUILD_TYPE @@ -52,7 +56,7 @@ if [ ${how_different} != "0" ] ; then echo echo "Problem with "${file} - echo "use: diff ${RESULTS}/${file}.sed ${OUTPUT}/${file} to find why" + echo "use: diff ${RELATIVE}/${RESULTS}/${file}.sed ${RELATIVE}/${OUTPUT}/${file} to find why" diff "${RESULTS}/${file}.sed" "${OUTPUT}/${file}" echo else @@ -73,7 +77,7 @@ if [ ${how_different} != "0" ] ; then echo echo "Problem with ${RESULTS}/${file}.sed" - echo "use: diff ${RESULTS}/${file}.sed ${OUTPUT}/${file} to find why" + echo "use: diff ${RELATIVE}/${RESULTS}/${file}.sed ${RELATIVE}/${OUTPUT}/${file} to find why" diff "${RESULTS}/${file}.sed" "${OUTPUT}/${file}" echo else @@ -104,7 +108,7 @@ do then echo echo "Problem with ${ResultsFile}.sed" - echo "use: diff ${ResultsFile}.sed ${OutputFile} to find why" + echo "use: diff ${RELATIVE}/${ResultsFile}.sed ${RELATIVE}/${OutputFile} to find why" diff "${ResultsFile}.sed" "${OutputFile}" echo else @@ -118,7 +122,7 @@ do then echo echo "Problem with ${R_ErrorFile}" - echo "use: diff ${R_ErrorFile} ${E_ErrorFile} to find why" + echo "use: diff ${RELATIVE}/${R_ErrorFile} ${RELATIVE}/${E_ErrorFile} to find why" diff "${R_ErrorFile}" "${E_ErrorFile}" echo else @@ -145,7 +149,7 @@ do if [ ${how_different} != "0" ] ; then echo "Problem with ${ResultsFile}.sed" - echo "use: diff ${ResultsFile}.sed ${OutputFile} to find why" + echo "use: diff ${RELATIVE}/${ResultsFile}.sed ${RELATIVE}/${OutputFile} to find why" diff "${ResultsFile}.sed" "${OutputFile}" echo else @@ -159,7 +163,7 @@ do then echo echo "Problem with ${R_ErrorFile}" - echo "use: diff ${R_ErrorFile} ${E_ErrorFile} to find why" + echo "use: diff ${RELATIVE}/${R_ErrorFile} ${RELATIVE}/${E_ErrorFile} to find why" diff "${R_ErrorFile}" "${E_ErrorFile}" echo else @@ -183,7 +187,7 @@ how_different=${?} if [ ${how_different} != "0" ] ; then echo "Problem with ${ResultsFile}.sed" - echo "use: diff ${ResultsFile}.sed ${OutputFile} to find why" + echo "use: diff ${RELATIVE}/${ResultsFile}.sed ${RELATIVE}/${OutputFile} to find why" diff "${ResultsFile}.sed" "${OutputFile}" echo else @@ -211,7 +215,7 @@ do then echo echo "Problem with "${InputFile} - echo "use: diff ${LFile}.sed ${OutputFile} to find why" + echo "use: diff ${RELATIVE}/${LFile}.sed ${RELATIVE}/${OutputFile} to find why" diff "${LFile}.sed" "${OutputFile}" diff "${LFile}" "${OutputFile}" echo @@ -236,7 +240,7 @@ do then echo echo "Problem with "${Error_T} - echo "use: diff ${ErrFile} ${OutputFile} to find why" + echo "use: diff ${RELATIVE}/${ErrFile} ${RELATIVE}/${OutputFile} to find why" diff "${ErrFile}" "${OutputFile}" echo break From b5d6105388db1859fd288bf18f2e19256ef65cad Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Sun, 22 Oct 2017 20:28:43 +0200 Subject: [PATCH 044/136] make various changes for consistency --- tests/cli/test_cli_options.py | 6 +-- tests/cli/test_cli_options.sh | 82 ++++++++++++++++++----------------- 2 files changed, 46 insertions(+), 42 deletions(-) diff --git a/tests/cli/test_cli_options.py b/tests/cli/test_cli_options.py index 4549f3e347..7e9673547b 100644 --- a/tests/cli/test_cli_options.py +++ b/tests/cli/test_cli_options.py @@ -157,8 +157,8 @@ def check_generated_output(gen_expected_path, gen_result_path, result_manip=None f.write(gen_res_txt) print("\nProblem with %s" % gen_result_path) - print("use: 'diff %s %s' to find why" % (gen_result_path, - gen_expected_path)) + print("use: 'diff %s %s' to find out why" % (gen_result_path, + gen_expected_path)) return False remove(gen_result_path) @@ -207,7 +207,7 @@ def check_std_output(expected_path, result_path, result_str, result_manip=None): f.write(result_str) print("\nProblem with %s" % result_path) - print("use: 'diff %s %s' to find why" % (result_path, expected_path)) + print("use: 'diff %s %s' to find out why" % (result_path, expected_path)) return False return True diff --git a/tests/cli/test_cli_options.sh b/tests/cli/test_cli_options.sh index 0ff816b2fb..56367bd95d 100755 --- a/tests/cli/test_cli_options.sh +++ b/tests/cli/test_cli_options.sh @@ -24,8 +24,7 @@ RELATIVE=$(perl -MFile::Spec -e "print File::Spec->abs2rel(q(${script_dir}),q(${ # control the CMAKE_BUILD_TYPE CMAKE_BUILD_TYPE=`grep -i CMAKE_BUILD_TYPE:STRING=release ../../build/CMakeCache.txt` how_different=${?} -if [ ${how_different} == "0" ] ; -then +if [ ${how_different} == "0" ]; then echo "CMAKE_BUILD_TYPE is correct" else echo "CMAKE_BUILD_TYPE must be 'Release' to test" @@ -46,43 +45,48 @@ mkdir ${RESULTS} # Test help # -h -? --help --usage file="help.txt" +ResultsFile="${RESULTS}/${file}" +OutputFile="${OUTPUT}/${file}" -../../build/uncrustify > "${RESULTS}/${file}" +../../build/uncrustify > "${ResultsFile}" +sed -e ':a' -e 'N' -e '$!ba' -e 's| --mtime : Preserve mtime on replaced files.\n||g' "${ResultsFile}" > "${ResultsFile}.sed" -sed -e ':a' -e 'N' -e '$!ba' -e 's| --mtime : Preserve mtime on replaced files.\n||g' "${RESULTS}/${file}" > "${RESULTS}/${file}.sed" -cmp -s "${RESULTS}/${file}.sed" "${OUTPUT}/${file}" +cmp -s "${ResultsFile}.sed" "${OutputFile}" how_different=${?} if [ ${how_different} != "0" ] ; then echo - echo "Problem with "${file} - echo "use: diff ${RELATIVE}/${RESULTS}/${file}.sed ${RELATIVE}/${OUTPUT}/${file} to find why" - diff "${RESULTS}/${file}.sed" "${OUTPUT}/${file}" + echo "Problem with ${ResultsFile}.sed" + echo "use: diff ${RELATIVE}/${ResultsFile}.sed ${RELATIVE}/${OutputFile} to find out why" + diff "${ResultsFile}.sed" "${OutputFile}" echo else - rm "${RESULTS}/${file}" - rm "${RESULTS}/${file}.sed" + rm "${ResultsFile}" + rm "${ResultsFile}.sed" fi # # Test --show-config # file="show_config.txt" +ResultsFile="${RESULTS}/${file}" +OutputFile="${OUTPUT}/${file}" -../../build/uncrustify --show-config > "${RESULTS}/${file}" -sed 's/# Uncrustify.*//g' "${RESULTS}/${file}" > "${RESULTS}/${file}.sed" -cmp -s "${RESULTS}/${file}.sed" "${OUTPUT}/${file}" +../../build/uncrustify --show-config > "${ResultsFile}" +sed 's/# Uncrustify.*//g' "${ResultsFile}" > "${ResultsFile}.sed" + +cmp -s "${ResultsFile}.sed" "${OutputFile}" how_different=${?} if [ ${how_different} != "0" ] ; then echo - echo "Problem with ${RESULTS}/${file}.sed" - echo "use: diff ${RELATIVE}/${RESULTS}/${file}.sed ${RELATIVE}/${OUTPUT}/${file} to find why" - diff "${RESULTS}/${file}.sed" "${OUTPUT}/${file}" + echo "Problem with ${ResultsFile}.sed" + echo "use: diff ${RELATIVE}/${ResultsFile}.sed ${RELATIVE}/${OutputFile} to find out why" + diff "${ResultsFile}.sed" "${OutputFile}" echo else - rm "${RESULTS}/${file}" - rm "${RESULTS}/${file}.sed" + rm "${ResultsFile}" + rm "${ResultsFile}.sed" fi # @@ -93,8 +97,7 @@ E_ErrorFile="${OUTPUT}/${G_ErrorFile}.txt" ConfigFileNames="mini_d mini_nd" IDX=0 -for ConfigFileName in ${ConfigFileNames} -do +for ConfigFileName in ${ConfigFileNames}; do ResultsFile="${RESULTS}/${ConfigFileName}_uc.txt" OutputFile="${OUTPUT}/${ConfigFileName}_uc.txt" ConfigFile="${CONFIG}/${ConfigFileName}.cfg" @@ -108,7 +111,7 @@ do then echo echo "Problem with ${ResultsFile}.sed" - echo "use: diff ${RELATIVE}/${ResultsFile}.sed ${RELATIVE}/${OutputFile} to find why" + echo "use: diff ${RELATIVE}/${ResultsFile}.sed ${RELATIVE}/${OutputFile} to find out why" diff "${ResultsFile}.sed" "${OutputFile}" echo else @@ -122,7 +125,7 @@ do then echo echo "Problem with ${R_ErrorFile}" - echo "use: diff ${RELATIVE}/${R_ErrorFile} ${RELATIVE}/${E_ErrorFile} to find why" + echo "use: diff ${RELATIVE}/${R_ErrorFile} ${RELATIVE}/${E_ErrorFile} to find out why" diff "${R_ErrorFile}" "${E_ErrorFile}" echo else @@ -135,8 +138,7 @@ done # Test --update-config-with-doc # ConfigFileNames="mini_d mini_nd" -for ConfigFileName in ${ConfigFileNames} -do +for ConfigFileName in ${ConfigFileNames}; do ResultsFile="${RESULTS}/${ConfigFileName}_ucwd.txt" OutputFile="${OUTPUT}/${ConfigFileName}_ucwd.txt" ConfigFile="${CONFIG}/${ConfigFileName}.cfg" @@ -149,7 +151,7 @@ do if [ ${how_different} != "0" ] ; then echo "Problem with ${ResultsFile}.sed" - echo "use: diff ${RELATIVE}/${ResultsFile}.sed ${RELATIVE}/${OutputFile} to find why" + echo "use: diff ${RELATIVE}/${ResultsFile}.sed ${RELATIVE}/${OutputFile} to find out why" diff "${ResultsFile}.sed" "${OutputFile}" echo else @@ -159,11 +161,10 @@ do cmp -s "${R_ErrorFile}" "${E_ErrorFile}" how_different=${?} - if [ ${how_different} != "0" ] ; - then + if [ ${how_different} != "0" ]; then echo echo "Problem with ${R_ErrorFile}" - echo "use: diff ${RELATIVE}/${R_ErrorFile} ${RELATIVE}/${E_ErrorFile} to find why" + echo "use: diff ${RELATIVE}/${R_ErrorFile} ${RELATIVE}/${E_ErrorFile} to find out why" diff "${R_ErrorFile}" "${E_ErrorFile}" echo else @@ -182,12 +183,14 @@ ConfigFile="${CONFIG}/mini_nd.cfg" ../../build/uncrustify -c "${ConfigFile}" -f "${InputFile}" -p "${ResultsFile}" &> /dev/null sed 's/# Uncrustify.*//g' "${ResultsFile}" > "${ResultsFile}.sed" + cmp -s "${ResultsFile}.sed" "${OutputFile}" how_different=${?} if [ ${how_different} != "0" ] ; then + echo echo "Problem with ${ResultsFile}.sed" - echo "use: diff ${RELATIVE}/${ResultsFile}.sed ${RELATIVE}/${OutputFile} to find why" + echo "use: diff ${RELATIVE}/${ResultsFile}.sed ${RELATIVE}/${OutputFile} to find out why" diff "${ResultsFile}.sed" "${OutputFile}" echo else @@ -195,27 +198,26 @@ else rm "${ResultsFile}.sed" fi - # Debug Options: # -L # look at src/log_levels.h - Liste_of_Ls_A="9 21 25 28 31 36 66 92" -for L_Value in ${Liste_of_Ls_A} -do +for L_Value in ${Liste_of_Ls_A}; do InputFile="${INPUT}/testSrc.cpp" OutputFile="${OUTPUT}/${L_Value}.txt" LFile="${RESULTS}/${L_Value}.txt" + ../../build/uncrustify -c /dev/null -f "${InputFile}" -o /dev/null -L "${L_Value}" 2> "${LFile}" sed 's/[0-9]//g' "${LFile}" > "${LFile}.sed" + cmp -s "${LFile}.sed" "${OutputFile}" how_different=${?} #echo "the status of is "${how_different} if [ ${how_different} != "0" ] ; then echo - echo "Problem with "${InputFile} - echo "use: diff ${RELATIVE}/${LFile}.sed ${RELATIVE}/${OutputFile} to find why" + echo "Problem with ${LFile}.sed" + echo "use: diff ${RELATIVE}/${LFile}.sed ${RELATIVE}/${OutputFile} to find out why" diff "${LFile}.sed" "${OutputFile}" diff "${LFile}" "${OutputFile}" echo @@ -227,20 +229,21 @@ do done Liste_of_Error_Tests="I-842 unmatched_close_pp" -for Error_T in ${Liste_of_Error_Tests} -do +for Error_T in ${Liste_of_Error_Tests}; do ConfigFile="${CONFIG}/${Error_T}.cfg" InputFile="${INPUT}/${Error_T}.cpp" OutputFile="${OUTPUT}/${Error_T}.txt" ErrFile="${RESULTS}/${Error_T}.txt" + ../../build/uncrustify -q -c "${ConfigFile}" -f "${InputFile}" -o /dev/null 2> "${ErrFile}" + cmp -s "${ErrFile}" "${OutputFile}" how_different=${?} if [ ${how_different} != "0" ] ; then echo - echo "Problem with "${Error_T} - echo "use: diff ${RELATIVE}/${ErrFile} ${RELATIVE}/${OutputFile} to find why" + echo "Problem with ${ErrFile}" + echo "use: diff ${RELATIVE}/${ErrFile} ${RELATIVE}/${OutputFile} to find out why" diff "${ErrFile}" "${OutputFile}" echo break @@ -249,6 +252,7 @@ do fi done + rmdir --ignore-fail-on-non-empty ${RESULTS} if [[ -d ${RESULTS} ]] then From 559948e6d4eeb760e31943e66933e7c1813413b2 Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Mon, 23 Oct 2017 17:08:06 +0200 Subject: [PATCH 045/136] A test to simulate windows. --- src/logger.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/logger.h b/src/logger.h index 673802ab7b..828c504f37 100644 --- a/src/logger.h +++ b/src/logger.h @@ -114,10 +114,10 @@ void log_flush(bool force_nl); // it is necessary to make at least one time pro change a check of all the -// uses of the MACRO LOG_FMT under Linux. This to detect all the used pointers, +// uses of the MACRO LOG_FMT under Linux. This to detect all the used pointers, // which might be nullptr. -// uncomment the define to do that. -//#define NO_MACRO_VARARG +// uncomment the define to do that. +// #define NO_MACRO_VARARG #ifdef NO_MACRO_VARARG #define LOG_FMT log_fmt From a1994b8400dc5ab4ce94703e86a252f27ec3c702 Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Mon, 23 Oct 2017 17:17:23 +0200 Subject: [PATCH 046/136] Try with NO_MACRO_VARARG is set --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index bcc7f766b6..d18feac8dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ matrix: include: - env: BUILD_TYPE=debug - env: BUILD_TYPE=release + - env: BUILD_TYPE=release NO_MACRO_VARARG=1 # GCC 6 - env: C_COMPILER=gcc-6 CXX_COMPILER=g++-6 From f291243ca0b771fd8f257f911d0d967927debf12 Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Tue, 24 Oct 2017 16:32:50 +0200 Subject: [PATCH 047/136] Aproposal for a bugfix #1158 (part 2 latter) --- src/space.cpp | 23 +- tests/cli/Output/66.txt | 354 ++++++++++++++-------------- tests/config/del_semicolon.cfg | 3 + tests/config/sf538.cfg | 1 + tests/config/sp_after_sparen.cfg | 1 + tests/cpp.test | 1 + tests/input/cpp/bug_1158.cpp | 4 + tests/output/c/01011-semicolons.c | 2 +- tests/output/cpp/30712-bug_1158.cpp | 4 + 9 files changed, 208 insertions(+), 185 deletions(-) create mode 100644 tests/input/cpp/bug_1158.cpp create mode 100644 tests/output/cpp/30712-bug_1158.cpp diff --git a/src/space.cpp b/src/space.cpp index f6ca8d5945..54c0908ab1 100644 --- a/src/space.cpp +++ b/src/space.cpp @@ -120,11 +120,12 @@ static void log_rule2(size_t line, const char *rule, chunk_t *first, chunk_t *se LOG_FUNC_ENTRY(); if (second->type != CT_NEWLINE) { - LOG_FMT(LSPACE, "%s(%d): Spacing: first->orig_line is %zu, first->text() is '%s', [%s/%s] <===>\n", - __func__, __LINE__, first->orig_line, first->text(), + LOG_FMT(LSPACE, "%s(%d): Spacing: first->orig_line is %zu, first->orig_col is %zu, first->text() is '%s', [%s/%s] <===>\n", + __func__, __LINE__, first->orig_line, first->orig_col, first->text(), get_token_name(first->type), get_token_name(first->parent_type)); - LOG_FMT(LSPACE, " second->text() '%s', [%s/%s] : rule %s[line %zu]%s", - second->text(), get_token_name(second->type), get_token_name(second->parent_type), + LOG_FMT(LSPACE, " second->orig_line is %zu, second->orig_col is %zu, second->text() '%s', [%s/%s] : rule %s[line %zu]%s", + second->orig_line, second->orig_col, second->text(), + get_token_name(second->type), get_token_name(second->parent_type), rule, line, complete ? "\n" : ""); } @@ -183,7 +184,9 @@ static argval_t do_space(chunk_t *first, chunk_t *second, int &min_sp, bool comp log_rule("REMOVE"); return(AV_REMOVE); } - if (first->type == CT_VBRACE_OPEN && second->type != CT_NL_CONT) + if ( first->type == CT_VBRACE_OPEN + && second->type != CT_NL_CONT + && second->type != CT_SEMICOLON) // # Issue 1158 { log_rule("FORCE"); return(AV_FORCE); @@ -910,6 +913,12 @@ static argval_t do_space(chunk_t *first, chunk_t *second, int &min_sp, bool comp return(cpd.settings[UO_sp_after_sparen].a); } } + if ( first->type == CT_VBRACE_OPEN + && second->type == CT_SEMICOLON) // Issue # 1158 + { + log_rule("sp_before_semi"); + return(cpd.settings[UO_sp_before_semi].a); + } if ( second->type == CT_FPAREN_OPEN && first->parent_type == CT_OPERATOR @@ -1944,12 +1953,12 @@ void space_text(void) { if (pc->type == CT_NEWLINE) { - LOG_FMT(LSPACE, "%s(%d): orig_col is %zu, orig_col is %zu, NEWLINE\n", + LOG_FMT(LSPACE, "%s(%d): orig_line is %zu, orig_col is %zu, NEWLINE\n", __func__, __LINE__, pc->orig_line, pc->orig_col); } else { - LOG_FMT(LSPACE, "%s(%d): orig_col is %zu, orig_col is %zu, '%s' type is %s\n", + LOG_FMT(LSPACE, "%s(%d): orig_line is %zu, orig_col is %zu, '%s' type is %s\n", __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type)); } if ( (cpd.settings[UO_use_options_overriding_for_qt_macros].b) diff --git a/tests/cli/Output/66.txt b/tests/cli/Output/66.txt index 6a14f83d00..ff5d216e3f 100644 --- a/tests/cli/Output/66.txt +++ b/tests/cli/Output/66.txt @@ -1,305 +1,305 @@ -space_text(): orig_col is , orig_col is , 'struct' type is STRUCT +space_text(): orig_line is , orig_col is , 'struct' type is STRUCT space_text(): back-to-back words need a space: pc->text() 'struct', next->text() 'TelegramIndex' space_text(): orig_line is , orig_col is , pc-text() 'struct', type is STRUCT do_space(): orig_line is , orig_col is , first->text() 'struct', type is STRUCT -log_rule(): Spacing: first->orig_line is , first->text() is 'struct', [STRUCT/NONE] <===> - second->text() 'TelegramIndex', [TYPE/STRUCT] : rule ADD as default value[line ] space_text(): rule = ADD @ => -space_text(): orig_col is , orig_col is , 'TelegramIndex' type is TYPE +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'struct', [STRUCT/NONE] <===> + second->orig_line is , second->orig_col is , second->text() 'TelegramIndex', [TYPE/STRUCT] : rule ADD as default value[line ] space_text(): rule = ADD @ => +space_text(): orig_line is , orig_col is , 'TelegramIndex' type is TYPE space_text(): orig_line is , orig_col is , pc-text() 'TelegramIndex', type is TYPE do_space(): orig_line is , orig_col is , first->text() 'TelegramIndex', type is TYPE space_text(): rule = REMOVE @ => -space_text(): orig_col is , orig_col is , NEWLINE -space_text(): orig_col is , orig_col is , '{' type is BRACE_OPEN +space_text(): orig_line is , orig_col is , NEWLINE +space_text(): orig_line is , orig_col is , '{' type is BRACE_OPEN space_text(): orig_line is , orig_col is , pc-text() '{', type is BRACE_OPEN do_space(): orig_line is , orig_col is , first->text() '{', type is BRACE_OPEN space_text(): rule = REMOVE @ => -space_text(): orig_col is , orig_col is , NEWLINE -space_text(): orig_col is , orig_col is , 'TelegramIndex' type is FUNC_CLASS_DEF +space_text(): orig_line is , orig_col is , NEWLINE +space_text(): orig_line is , orig_col is , 'TelegramIndex' type is FUNC_CLASS_DEF space_text(): orig_line is , orig_col is , pc-text() 'TelegramIndex', type is FUNC_CLASS_DEF do_space(): orig_line is , orig_col is , first->text() 'TelegramIndex', type is FUNC_CLASS_DEF -log_rule(): Spacing: first->orig_line is , first->text() is 'TelegramIndex', [FUNC_CLASS_DEF/NONE] <===> - second->text() '(', [FPAREN_OPEN/FUNC_CLASS_DEF] : rule sp_func_class_paren[line ]space_text(): rule = IGNORE @ => -space_text(): orig_col is , orig_col is , '(' type is FPAREN_OPEN +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'TelegramIndex', [FUNC_CLASS_DEF/NONE] <===> + second->orig_line is , second->orig_col is , second->text() '(', [FPAREN_OPEN/FUNC_CLASS_DEF] : rule sp_func_class_paren[line ]space_text(): rule = IGNORE @ => +space_text(): orig_line is , orig_col is , '(' type is FPAREN_OPEN space_text(): orig_line is , orig_col is , pc-text() '(', type is FPAREN_OPEN do_space(): orig_line is , orig_col is , first->text() '(', type is FPAREN_OPEN -log_rule(): Spacing: first->orig_line is , first->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===> - second->text() 'const', [QUALIFIER/NONE] : rule sp_inside_fparen[line ]space_text(): rule = IGNORE @ => -space_text(): orig_col is , orig_col is , 'const' type is QUALIFIER +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===> + second->orig_line is , second->orig_col is , second->text() 'const', [QUALIFIER/NONE] : rule sp_inside_fparen[line ]space_text(): rule = IGNORE @ => +space_text(): orig_line is , orig_col is , 'const' type is QUALIFIER space_text(): back-to-back words need a space: pc->text() 'const', next->text() 'char' space_text(): orig_line is , orig_col is , pc-text() 'const', type is QUALIFIER do_space(): orig_line is , orig_col is , first->text() 'const', type is QUALIFIER -log_rule(): Spacing: first->orig_line is , first->text() is 'const', [QUALIFIER/NONE] <===> - second->text() 'char', [TYPE/NONE] : rule sp_after_type[line ] space_text(): rule = FORCE @ => -space_text(): orig_col is , orig_col is , 'char' type is TYPE +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'const', [QUALIFIER/NONE] <===> + second->orig_line is , second->orig_col is , second->text() 'char', [TYPE/NONE] : rule sp_after_type[line ] space_text(): rule = FORCE @ => +space_text(): orig_line is , orig_col is , 'char' type is TYPE space_text(): orig_line is , orig_col is , pc-text() 'char', type is TYPE do_space(): orig_line is , orig_col is , first->text() 'char', type is TYPE -log_rule(): Spacing: first->orig_line is , first->text() is 'char', [TYPE/NONE] <===> - second->text() '*', [PTR_TYPE/NONE] : rule IGNORE[line ]space_text(): rule = IGNORE @ => -space_text(): orig_col is , orig_col is , '*' type is PTR_TYPE +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'char', [TYPE/NONE] <===> + second->orig_line is , second->orig_col is , second->text() '*', [PTR_TYPE/NONE] : rule IGNORE[line ]space_text(): rule = IGNORE @ => +space_text(): orig_line is , orig_col is , '*' type is PTR_TYPE space_text(): orig_line is , orig_col is , pc-text() '*', type is PTR_TYPE do_space(): orig_line is , orig_col is , first->text() '*', type is PTR_TYPE -log_rule(): Spacing: first->orig_line is , first->text() is '*', [PTR_TYPE/NONE] <===> - second->text() 'pN', [WORD/NONE] : rule IGNORE[line ]space_text(): rule = IGNORE @ => -space_text(): orig_col is , orig_col is , 'pN' type is WORD +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is '*', [PTR_TYPE/NONE] <===> + second->orig_line is , second->orig_col is , second->text() 'pN', [WORD/NONE] : rule IGNORE[line ]space_text(): rule = IGNORE @ => +space_text(): orig_line is , orig_col is , 'pN' type is WORD space_text(): orig_line is , orig_col is , pc-text() 'pN', type is WORD do_space(): orig_line is , orig_col is , first->text() 'pN', type is WORD -log_rule(): Spacing: first->orig_line is , first->text() is 'pN', [WORD/NONE] <===> - second->text() ',', [COMMA/NONE] : rule sp_before_comma[line ]space_text(): rule = REMOVE @ => -space_text(): orig_col is , orig_col is , ',' type is COMMA +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'pN', [WORD/NONE] <===> + second->orig_line is , second->orig_col is , second->text() ',', [COMMA/NONE] : rule sp_before_comma[line ]space_text(): rule = REMOVE @ => +space_text(): orig_line is , orig_col is , ',' type is COMMA space_text(): orig_line is , orig_col is , pc-text() ',', type is COMMA do_space(): orig_line is , orig_col is , first->text() ',', type is COMMA -log_rule(): Spacing: first->orig_line is , first->text() is ',', [COMMA/NONE] <===> - second->text() 'unsigned', [TYPE/NONE] : rule sp_after_comma[line ]space_text(): rule = IGNORE @ => -space_text(): orig_col is , orig_col is , 'unsigned' type is TYPE +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is ',', [COMMA/NONE] <===> + second->orig_line is , second->orig_col is , second->text() 'unsigned', [TYPE/NONE] : rule sp_after_comma[line ]space_text(): rule = IGNORE @ => +space_text(): orig_line is , orig_col is , 'unsigned' type is TYPE space_text(): back-to-back words need a space: pc->text() 'unsigned', next->text() 'long' space_text(): orig_line is , orig_col is , pc-text() 'unsigned', type is TYPE do_space(): orig_line is , orig_col is , first->text() 'unsigned', type is TYPE -log_rule(): Spacing: first->orig_line is , first->text() is 'unsigned', [TYPE/NONE] <===> - second->text() 'long', [TYPE/NONE] : rule sp_after_type[line ] space_text(): rule = FORCE @ => -space_text(): orig_col is , orig_col is , 'long' type is TYPE +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'unsigned', [TYPE/NONE] <===> + second->orig_line is , second->orig_col is , second->text() 'long', [TYPE/NONE] : rule sp_after_type[line ] space_text(): rule = FORCE @ => +space_text(): orig_line is , orig_col is , 'long' type is TYPE space_text(): back-to-back words need a space: pc->text() 'long', next->text() 'nI' space_text(): orig_line is , orig_col is , pc-text() 'long', type is TYPE do_space(): orig_line is , orig_col is , first->text() 'long', type is TYPE -log_rule(): Spacing: first->orig_line is , first->text() is 'long', [TYPE/NONE] <===> - second->text() 'nI', [WORD/NONE] : rule sp_after_type[line ] space_text(): rule = FORCE @ => -space_text(): orig_col is , orig_col is , 'nI' type is WORD +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'long', [TYPE/NONE] <===> + second->orig_line is , second->orig_col is , second->text() 'nI', [WORD/NONE] : rule sp_after_type[line ] space_text(): rule = FORCE @ => +space_text(): orig_line is , orig_col is , 'nI' type is WORD space_text(): orig_line is , orig_col is , pc-text() 'nI', type is WORD do_space(): orig_line is , orig_col is , first->text() 'nI', type is WORD -log_rule(): Spacing: first->orig_line is , first->text() is 'nI', [WORD/NONE] <===> - second->text() ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] : rule sp_inside_fparen[line ]space_text(): rule = IGNORE @ => -space_text(): orig_col is , orig_col is , ')' type is FPAREN_CLOSE +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'nI', [WORD/NONE] <===> + second->orig_line is , second->orig_col is , second->text() ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] : rule sp_inside_fparen[line ]space_text(): rule = IGNORE @ => +space_text(): orig_line is , orig_col is , ')' type is FPAREN_CLOSE space_text(): orig_line is , orig_col is , pc-text() ')', type is FPAREN_CLOSE do_space(): orig_line is , orig_col is , first->text() ')', type is FPAREN_CLOSE -log_rule(): Spacing: first->orig_line is , first->text() is ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] <===> - second->text() ':', [CONSTR_COLON/NONE] : rule ADD as default value[line ]space_text(): rule = ADD @ => -space_text(): orig_col is , orig_col is , ':' type is CONSTR_COLON +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] <===> + second->orig_line is , second->orig_col is , second->text() ':', [CONSTR_COLON/NONE] : rule ADD as default value[line ]space_text(): rule = ADD @ => +space_text(): orig_line is , orig_col is , ':' type is CONSTR_COLON space_text(): orig_line is , orig_col is , pc-text() ':', type is CONSTR_COLON do_space(): orig_line is , orig_col is , first->text() ':', type is CONSTR_COLON space_text(): rule = REMOVE @ => -space_text(): orig_col is , orig_col is , NEWLINE -space_text(): orig_col is , orig_col is , 'pTelName' type is FUNC_CTOR_VAR +space_text(): orig_line is , orig_col is , NEWLINE +space_text(): orig_line is , orig_col is , 'pTelName' type is FUNC_CTOR_VAR space_text(): orig_line is , orig_col is , pc-text() 'pTelName', type is FUNC_CTOR_VAR do_space(): orig_line is , orig_col is , first->text() 'pTelName', type is FUNC_CTOR_VAR -log_rule(): Spacing: first->orig_line is , first->text() is 'pTelName', [FUNC_CTOR_VAR/NONE] <===> - second->text() '(', [FPAREN_OPEN/FUNC_CTOR_VAR] : rule sp_func_call_paren[line ]space_text(): rule = IGNORE @ => -space_text(): orig_col is , orig_col is , '(' type is FPAREN_OPEN +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'pTelName', [FUNC_CTOR_VAR/NONE] <===> + second->orig_line is , second->orig_col is , second->text() '(', [FPAREN_OPEN/FUNC_CTOR_VAR] : rule sp_func_call_paren[line ]space_text(): rule = IGNORE @ => +space_text(): orig_line is , orig_col is , '(' type is FPAREN_OPEN space_text(): orig_line is , orig_col is , pc-text() '(', type is FPAREN_OPEN do_space(): orig_line is , orig_col is , first->text() '(', type is FPAREN_OPEN -log_rule(): Spacing: first->orig_line is , first->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===> - second->text() 'pN', [WORD/NONE] : rule sp_inside_fparen[line ]space_text(): rule = IGNORE @ => -space_text(): orig_col is , orig_col is , 'pN' type is WORD +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===> + second->orig_line is , second->orig_col is , second->text() 'pN', [WORD/NONE] : rule sp_inside_fparen[line ]space_text(): rule = IGNORE @ => +space_text(): orig_line is , orig_col is , 'pN' type is WORD space_text(): orig_line is , orig_col is , pc-text() 'pN', type is WORD do_space(): orig_line is , orig_col is , first->text() 'pN', type is WORD -log_rule(): Spacing: first->orig_line is , first->text() is 'pN', [WORD/NONE] <===> - second->text() ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] : rule sp_inside_fparen[line ]space_text(): rule = IGNORE @ => -space_text(): orig_col is , orig_col is , ')' type is FPAREN_CLOSE +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'pN', [WORD/NONE] <===> + second->orig_line is , second->orig_col is , second->text() ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] : rule sp_inside_fparen[line ]space_text(): rule = IGNORE @ => +space_text(): orig_line is , orig_col is , ')' type is FPAREN_CLOSE space_text(): orig_line is , orig_col is , pc-text() ')', type is FPAREN_CLOSE do_space(): orig_line is , orig_col is , first->text() ')', type is FPAREN_CLOSE -log_rule(): Spacing: first->orig_line is , first->text() is ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] <===> - second->text() ',', [COMMA/NONE] : rule sp_before_comma[line ]space_text(): rule = REMOVE @ => -space_text(): orig_col is , orig_col is , ',' type is COMMA +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] <===> + second->orig_line is , second->orig_col is , second->text() ',', [COMMA/NONE] : rule sp_before_comma[line ]space_text(): rule = REMOVE @ => +space_text(): orig_line is , orig_col is , ',' type is COMMA space_text(): orig_line is , orig_col is , pc-text() ',', type is COMMA do_space(): orig_line is , orig_col is , first->text() ',', type is COMMA space_text(): rule = REMOVE @ => -space_text(): orig_col is , orig_col is , NEWLINE -space_text(): orig_col is , orig_col is , 'nTelIndex' type is FUNC_CTOR_VAR +space_text(): orig_line is , orig_col is , NEWLINE +space_text(): orig_line is , orig_col is , 'nTelIndex' type is FUNC_CTOR_VAR space_text(): orig_line is , orig_col is , pc-text() 'nTelIndex', type is FUNC_CTOR_VAR do_space(): orig_line is , orig_col is , first->text() 'nTelIndex', type is FUNC_CTOR_VAR -log_rule(): Spacing: first->orig_line is , first->text() is 'nTelIndex', [FUNC_CTOR_VAR/NONE] <===> - second->text() '(', [FPAREN_OPEN/FUNC_CTOR_VAR] : rule sp_func_call_paren[line ]space_text(): rule = IGNORE @ => -space_text(): orig_col is , orig_col is , '(' type is FPAREN_OPEN +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'nTelIndex', [FUNC_CTOR_VAR/NONE] <===> + second->orig_line is , second->orig_col is , second->text() '(', [FPAREN_OPEN/FUNC_CTOR_VAR] : rule sp_func_call_paren[line ]space_text(): rule = IGNORE @ => +space_text(): orig_line is , orig_col is , '(' type is FPAREN_OPEN space_text(): orig_line is , orig_col is , pc-text() '(', type is FPAREN_OPEN do_space(): orig_line is , orig_col is , first->text() '(', type is FPAREN_OPEN -log_rule(): Spacing: first->orig_line is , first->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===> - second->text() 'n', [WORD/NONE] : rule sp_inside_fparen[line ]space_text(): rule = IGNORE @ => -space_text(): orig_col is , orig_col is , 'n' type is WORD +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===> + second->orig_line is , second->orig_col is , second->text() 'n', [WORD/NONE] : rule sp_inside_fparen[line ]space_text(): rule = IGNORE @ => +space_text(): orig_line is , orig_col is , 'n' type is WORD space_text(): orig_line is , orig_col is , pc-text() 'n', type is WORD do_space(): orig_line is , orig_col is , first->text() 'n', type is WORD -log_rule(): Spacing: first->orig_line is , first->text() is 'n', [WORD/NONE] <===> - second->text() ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] : rule sp_inside_fparen[line ]space_text(): rule = IGNORE @ => -space_text(): orig_col is , orig_col is , ')' type is FPAREN_CLOSE +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'n', [WORD/NONE] <===> + second->orig_line is , second->orig_col is , second->text() ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] : rule sp_inside_fparen[line ]space_text(): rule = IGNORE @ => +space_text(): orig_line is , orig_col is , ')' type is FPAREN_CLOSE space_text(): orig_line is , orig_col is , pc-text() ')', type is FPAREN_CLOSE do_space(): orig_line is , orig_col is , first->text() ')', type is FPAREN_CLOSE space_text(): rule = REMOVE @ => -space_text(): orig_col is , orig_col is , NEWLINE -space_text(): orig_col is , orig_col is , '{' type is BRACE_OPEN +space_text(): orig_line is , orig_col is , NEWLINE +space_text(): orig_line is , orig_col is , '{' type is BRACE_OPEN space_text(): orig_line is , orig_col is , pc-text() '{', type is BRACE_OPEN do_space(): orig_line is , orig_col is , first->text() '{', type is BRACE_OPEN space_text(): rule = REMOVE @ => -space_text(): orig_col is , orig_col is , NEWLINE -space_text(): orig_col is , orig_col is , '}' type is BRACE_CLOSE +space_text(): orig_line is , orig_col is , NEWLINE +space_text(): orig_line is , orig_col is , '}' type is BRACE_CLOSE space_text(): orig_line is , orig_col is , pc-text() '}', type is BRACE_CLOSE do_space(): orig_line is , orig_col is , first->text() '}', type is BRACE_CLOSE space_text(): rule = REMOVE @ => -space_text(): orig_col is , orig_col is , NEWLINE -space_text(): orig_col is , orig_col is , '~' type is DESTRUCTOR +space_text(): orig_line is , orig_col is , NEWLINE +space_text(): orig_line is , orig_col is , '~' type is DESTRUCTOR space_text(): orig_line is , orig_col is , pc-text() '~', type is DESTRUCTOR do_space(): orig_line is , orig_col is , first->text() '~', type is DESTRUCTOR -log_rule(): Spacing: first->orig_line is , first->text() is '~', [DESTRUCTOR/NONE] <===> - second->text() 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] : rule REMOVE[line ]space_text(): rule = REMOVE @ => -space_text(): orig_col is , orig_col is , 'TelegramIndex' type is FUNC_CLASS_DEF +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is '~', [DESTRUCTOR/NONE] <===> + second->orig_line is , second->orig_col is , second->text() 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] : rule REMOVE[line ]space_text(): rule = REMOVE @ => +space_text(): orig_line is , orig_col is , 'TelegramIndex' type is FUNC_CLASS_DEF space_text(): orig_line is , orig_col is , pc-text() 'TelegramIndex', type is FUNC_CLASS_DEF do_space(): orig_line is , orig_col is , first->text() 'TelegramIndex', type is FUNC_CLASS_DEF -log_rule(): Spacing: first->orig_line is , first->text() is 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] <===> - second->text() '(', [FPAREN_OPEN/FUNC_CLASS_DEF] : rule sp_func_class_paren[line ]space_text(): rule = IGNORE @ => -space_text(): orig_col is , orig_col is , '(' type is FPAREN_OPEN +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] <===> + second->orig_line is , second->orig_col is , second->text() '(', [FPAREN_OPEN/FUNC_CLASS_DEF] : rule sp_func_class_paren[line ]space_text(): rule = IGNORE @ => +space_text(): orig_line is , orig_col is , '(' type is FPAREN_OPEN space_text(): orig_line is , orig_col is , pc-text() '(', type is FPAREN_OPEN do_space(): orig_line is , orig_col is , first->text() '(', type is FPAREN_OPEN -log_rule(): Spacing: first->orig_line is , first->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===> - second->text() ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] : rule sp_inside_fparens[line ]space_text(): rule = IGNORE @ => -space_text(): orig_col is , orig_col is , ')' type is FPAREN_CLOSE +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===> + second->orig_line is , second->orig_col is , second->text() ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] : rule sp_inside_fparens[line ]space_text(): rule = IGNORE @ => +space_text(): orig_line is , orig_col is , ')' type is FPAREN_CLOSE space_text(): orig_line is , orig_col is , pc-text() ')', type is FPAREN_CLOSE do_space(): orig_line is , orig_col is , first->text() ')', type is FPAREN_CLOSE space_text(): rule = REMOVE @ => -space_text(): orig_col is , orig_col is , NEWLINE -space_text(): orig_col is , orig_col is , '{' type is BRACE_OPEN +space_text(): orig_line is , orig_col is , NEWLINE +space_text(): orig_line is , orig_col is , '{' type is BRACE_OPEN space_text(): orig_line is , orig_col is , pc-text() '{', type is BRACE_OPEN do_space(): orig_line is , orig_col is , first->text() '{', type is BRACE_OPEN space_text(): rule = REMOVE @ => -space_text(): orig_col is , orig_col is , NEWLINE -space_text(): orig_col is , orig_col is , '}' type is BRACE_CLOSE +space_text(): orig_line is , orig_col is , NEWLINE +space_text(): orig_line is , orig_col is , '}' type is BRACE_CLOSE space_text(): orig_line is , orig_col is , pc-text() '}', type is BRACE_CLOSE do_space(): orig_line is , orig_col is , first->text() '}', type is BRACE_CLOSE space_text(): rule = REMOVE @ => -space_text(): orig_col is , orig_col is , NEWLINE -space_text(): orig_col is , orig_col is , 'const' type is QUALIFIER +space_text(): orig_line is , orig_col is , NEWLINE +space_text(): orig_line is , orig_col is , 'const' type is QUALIFIER space_text(): back-to-back words need a space: pc->text() 'const', next->text() 'char' space_text(): orig_line is , orig_col is , pc-text() 'const', type is QUALIFIER do_space(): orig_line is , orig_col is , first->text() 'const', type is QUALIFIER -log_rule(): Spacing: first->orig_line is , first->text() is 'const', [QUALIFIER/NONE] <===> - second->text() 'char', [TYPE/NONE] : rule sp_after_type[line ] space_text(): rule = FORCE @ => -space_text(): orig_col is , orig_col is , 'char' type is TYPE +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'const', [QUALIFIER/NONE] <===> + second->orig_line is , second->orig_col is , second->text() 'char', [TYPE/NONE] : rule sp_after_type[line ] space_text(): rule = FORCE @ => +space_text(): orig_line is , orig_col is , 'char' type is TYPE space_text(): orig_line is , orig_col is , pc-text() 'char', type is TYPE do_space(): orig_line is , orig_col is , first->text() 'char', type is TYPE -log_rule(): Spacing: first->orig_line is , first->text() is 'char', [TYPE/NONE] <===> - second->text() '*', [PTR_TYPE/NONE] : rule IGNORE[line ]space_text(): rule = IGNORE @ => -space_text(): orig_col is , orig_col is , '*' type is PTR_TYPE +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'char', [TYPE/NONE] <===> + second->orig_line is , second->orig_col is , second->text() '*', [PTR_TYPE/NONE] : rule IGNORE[line ]space_text(): rule = IGNORE @ => +space_text(): orig_line is , orig_col is , '*' type is PTR_TYPE space_text(): orig_line is , orig_col is , pc-text() '*', type is PTR_TYPE do_space(): orig_line is , orig_col is , first->text() '*', type is PTR_TYPE -log_rule(): Spacing: first->orig_line is , first->text() is '*', [PTR_TYPE/NONE] <===> - second->text() 'const', [QUALIFIER/NONE] : rule IGNORE[line ]space_text(): rule = IGNORE @ => -space_text(): orig_col is , orig_col is , 'const' type is QUALIFIER +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is '*', [PTR_TYPE/NONE] <===> + second->orig_line is , second->orig_col is , second->text() 'const', [QUALIFIER/NONE] : rule IGNORE[line ]space_text(): rule = IGNORE @ => +space_text(): orig_line is , orig_col is , 'const' type is QUALIFIER space_text(): back-to-back words need a space: pc->text() 'const', next->text() 'pTelName' space_text(): orig_line is , orig_col is , pc-text() 'const', type is QUALIFIER do_space(): orig_line is , orig_col is , first->text() 'const', type is QUALIFIER -log_rule(): Spacing: first->orig_line is , first->text() is 'const', [QUALIFIER/NONE] <===> - second->text() 'pTelName', [WORD/NONE] : rule sp_after_type[line ] space_text(): rule = FORCE @ => -space_text(): orig_col is , orig_col is , 'pTelName' type is WORD +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'const', [QUALIFIER/NONE] <===> + second->orig_line is , second->orig_col is , second->text() 'pTelName', [WORD/NONE] : rule sp_after_type[line ] space_text(): rule = FORCE @ => +space_text(): orig_line is , orig_col is , 'pTelName' type is WORD space_text(): orig_line is , orig_col is , pc-text() 'pTelName', type is WORD do_space(): orig_line is , orig_col is , first->text() 'pTelName', type is WORD -log_rule(): Spacing: first->orig_line is , first->text() is 'pTelName', [WORD/NONE] <===> - second->text() ';', [SEMICOLON/NONE] : rule sp_before_semi[line ]space_text(): rule = REMOVE @ => -space_text(): orig_col is , orig_col is , ';' type is SEMICOLON +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'pTelName', [WORD/NONE] <===> + second->orig_line is , second->orig_col is , second->text() ';', [SEMICOLON/NONE] : rule sp_before_semi[line ]space_text(): rule = REMOVE @ => +space_text(): orig_line is , orig_col is , ';' type is SEMICOLON space_text(): orig_line is , orig_col is , pc-text() ';', type is SEMICOLON do_space(): orig_line is , orig_col is , first->text() ';', type is SEMICOLON space_text(): rule = REMOVE @ => -space_text(): orig_col is , orig_col is , NEWLINE -space_text(): orig_col is , orig_col is , 'unsigned' type is TYPE +space_text(): orig_line is , orig_col is , NEWLINE +space_text(): orig_line is , orig_col is , 'unsigned' type is TYPE space_text(): back-to-back words need a space: pc->text() 'unsigned', next->text() 'long' space_text(): orig_line is , orig_col is , pc-text() 'unsigned', type is TYPE do_space(): orig_line is , orig_col is , first->text() 'unsigned', type is TYPE -log_rule(): Spacing: first->orig_line is , first->text() is 'unsigned', [TYPE/NONE] <===> - second->text() 'long', [TYPE/NONE] : rule sp_after_type[line ] space_text(): rule = FORCE @ => -space_text(): orig_col is , orig_col is , 'long' type is TYPE +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'unsigned', [TYPE/NONE] <===> + second->orig_line is , second->orig_col is , second->text() 'long', [TYPE/NONE] : rule sp_after_type[line ] space_text(): rule = FORCE @ => +space_text(): orig_line is , orig_col is , 'long' type is TYPE space_text(): back-to-back words need a space: pc->text() 'long', next->text() 'nTelIndex' space_text(): orig_line is , orig_col is , pc-text() 'long', type is TYPE do_space(): orig_line is , orig_col is , first->text() 'long', type is TYPE -log_rule(): Spacing: first->orig_line is , first->text() is 'long', [TYPE/NONE] <===> - second->text() 'nTelIndex', [WORD/NONE] : rule sp_after_type[line ] space_text(): rule = FORCE @ => -space_text(): orig_col is , orig_col is , 'nTelIndex' type is WORD +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'long', [TYPE/NONE] <===> + second->orig_line is , second->orig_col is , second->text() 'nTelIndex', [WORD/NONE] : rule sp_after_type[line ] space_text(): rule = FORCE @ => +space_text(): orig_line is , orig_col is , 'nTelIndex' type is WORD space_text(): orig_line is , orig_col is , pc-text() 'nTelIndex', type is WORD do_space(): orig_line is , orig_col is , first->text() 'nTelIndex', type is WORD -log_rule(): Spacing: first->orig_line is , first->text() is 'nTelIndex', [WORD/NONE] <===> - second->text() ';', [SEMICOLON/NONE] : rule sp_before_semi[line ]space_text(): rule = REMOVE @ => -space_text(): orig_col is , orig_col is , ';' type is SEMICOLON +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'nTelIndex', [WORD/NONE] <===> + second->orig_line is , second->orig_col is , second->text() ';', [SEMICOLON/NONE] : rule sp_before_semi[line ]space_text(): rule = REMOVE @ => +space_text(): orig_line is , orig_col is , ';' type is SEMICOLON space_text(): orig_line is , orig_col is , pc-text() ';', type is SEMICOLON do_space(): orig_line is , orig_col is , first->text() ';', type is SEMICOLON space_text(): rule = REMOVE @ => -space_text(): orig_col is , orig_col is , NEWLINE -space_text(): orig_col is , orig_col is , '}' type is BRACE_CLOSE +space_text(): orig_line is , orig_col is , NEWLINE +space_text(): orig_line is , orig_col is , '}' type is BRACE_CLOSE space_text(): orig_line is , orig_col is , pc-text() '}', type is BRACE_CLOSE do_space(): orig_line is , orig_col is , first->text() '}', type is BRACE_CLOSE -log_rule(): Spacing: first->orig_line is , first->text() is '}', [BRACE_CLOSE/STRUCT] <===> - second->text() ';', [SEMICOLON/STRUCT] : rule sp_before_semi[line ]space_text(): rule = REMOVE @ => -space_text(): orig_col is , orig_col is , ';' type is SEMICOLON +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is '}', [BRACE_CLOSE/STRUCT] <===> + second->orig_line is , second->orig_col is , second->text() ';', [SEMICOLON/STRUCT] : rule sp_before_semi[line ]space_text(): rule = REMOVE @ => +space_text(): orig_line is , orig_col is , ';' type is SEMICOLON space_text(): orig_line is , orig_col is , pc-text() ';', type is SEMICOLON do_space(): orig_line is , orig_col is , first->text() ';', type is SEMICOLON space_text(): rule = REMOVE @ => -space_text(): orig_col is , orig_col is , NEWLINE +space_text(): orig_line is , orig_col is , NEWLINE space_col_align(): orig_line is , orig_col is , [FUNC_CLASS_DEF/NONE] 'TelegramIndex' <==> orig_line is , orig_col is [FPAREN_OPEN/FUNC_CLASS_DEF] '(' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'TelegramIndex', type is FUNC_CLASS_DEF -log_rule(): Spacing: first->orig_line is , first->text() is 'TelegramIndex', [FUNC_CLASS_DEF/NONE] <===> - second->text() '(', [FPAREN_OPEN/FUNC_CLASS_DEF] : rule sp_func_class_paren[line ] +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'TelegramIndex', [FUNC_CLASS_DEF/NONE] <===> + second->orig_line is , second->orig_col is , second->text() '(', [FPAREN_OPEN/FUNC_CLASS_DEF] : rule sp_func_class_paren[line ] space_col_align(): av is ignore len is => coldiff is space_col_align(): orig_line is , orig_col is , [FPAREN_OPEN/FUNC_CLASS_DEF] '(' <==> orig_line is , orig_col is [QUALIFIER/NONE] 'const' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() '(', type is FPAREN_OPEN -log_rule(): Spacing: first->orig_line is , first->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===> - second->text() 'const', [QUALIFIER/NONE] : rule sp_inside_fparen[line ] +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===> + second->orig_line is , second->orig_col is , second->text() 'const', [QUALIFIER/NONE] : rule sp_inside_fparen[line ] space_col_align(): av is ignore len is => coldiff is space_col_align(): orig_line is , orig_col is , [QUALIFIER/NONE] 'const' <==> orig_line is , orig_col is [TYPE/NONE] 'char' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'const', type is QUALIFIER -log_rule(): Spacing: first->orig_line is , first->text() is 'const', [QUALIFIER/NONE] <===> - second->text() 'char', [TYPE/NONE] : rule sp_after_type[line ] +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'const', [QUALIFIER/NONE] <===> + second->orig_line is , second->orig_col is , second->text() 'char', [TYPE/NONE] : rule sp_after_type[line ] space_col_align(): av is force len is => coldiff is space_col_align(): orig_line is , orig_col is , [TYPE/NONE] 'char' <==> orig_line is , orig_col is [PTR_TYPE/NONE] '*' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'char', type is TYPE -log_rule(): Spacing: first->orig_line is , first->text() is 'char', [TYPE/NONE] <===> - second->text() '*', [PTR_TYPE/NONE] : rule IGNORE[line ] +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'char', [TYPE/NONE] <===> + second->orig_line is , second->orig_col is , second->text() '*', [PTR_TYPE/NONE] : rule IGNORE[line ] space_col_align(): av is ignore len is => coldiff is space_col_align(): orig_line is , orig_col is , [PTR_TYPE/NONE] '*' <==> orig_line is , orig_col is [WORD/NONE] 'pN' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() '*', type is PTR_TYPE -log_rule(): Spacing: first->orig_line is , first->text() is '*', [PTR_TYPE/NONE] <===> - second->text() 'pN', [WORD/NONE] : rule IGNORE[line ] +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is '*', [PTR_TYPE/NONE] <===> + second->orig_line is , second->orig_col is , second->text() 'pN', [WORD/NONE] : rule IGNORE[line ] space_col_align(): av is ignore len is => coldiff is space_col_align(): orig_line is , orig_col is , [WORD/NONE] 'pN' <==> orig_line is , orig_col is [COMMA/NONE] ',' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'pN', type is WORD -log_rule(): Spacing: first->orig_line is , first->text() is 'pN', [WORD/NONE] <===> - second->text() ',', [COMMA/NONE] : rule sp_before_comma[line ] +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'pN', [WORD/NONE] <===> + second->orig_line is , second->orig_col is , second->text() ',', [COMMA/NONE] : rule sp_before_comma[line ] space_col_align(): av is remove len is => coldiff is space_col_align(): orig_line is , orig_col is , [COMMA/NONE] ',' <==> orig_line is , orig_col is [TYPE/NONE] 'unsigned' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() ',', type is COMMA -log_rule(): Spacing: first->orig_line is , first->text() is ',', [COMMA/NONE] <===> - second->text() 'unsigned', [TYPE/NONE] : rule sp_after_comma[line ] +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is ',', [COMMA/NONE] <===> + second->orig_line is , second->orig_col is , second->text() 'unsigned', [TYPE/NONE] : rule sp_after_comma[line ] space_col_align(): av is ignore len is => coldiff is space_col_align(): orig_line is , orig_col is , [TYPE/NONE] 'unsigned' <==> orig_line is , orig_col is [TYPE/NONE] 'long' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'unsigned', type is TYPE -log_rule(): Spacing: first->orig_line is , first->text() is 'unsigned', [TYPE/NONE] <===> - second->text() 'long', [TYPE/NONE] : rule sp_after_type[line ] +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'unsigned', [TYPE/NONE] <===> + second->orig_line is , second->orig_col is , second->text() 'long', [TYPE/NONE] : rule sp_after_type[line ] space_col_align(): av is force len is => coldiff is space_col_align(): orig_line is , orig_col is , [TYPE/NONE] 'long' <==> orig_line is , orig_col is [WORD/NONE] 'nI' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'long', type is TYPE -log_rule(): Spacing: first->orig_line is , first->text() is 'long', [TYPE/NONE] <===> - second->text() 'nI', [WORD/NONE] : rule sp_after_type[line ] +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'long', [TYPE/NONE] <===> + second->orig_line is , second->orig_col is , second->text() 'nI', [WORD/NONE] : rule sp_after_type[line ] space_col_align(): av is force len is => coldiff is space_col_align(): orig_line is , orig_col is , [WORD/NONE] 'nI' <==> orig_line is , orig_col is [FPAREN_CLOSE/FUNC_CLASS_DEF] ')' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'nI', type is WORD -log_rule(): Spacing: first->orig_line is , first->text() is 'nI', [WORD/NONE] <===> - second->text() ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] : rule sp_inside_fparen[line ] +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'nI', [WORD/NONE] <===> + second->orig_line is , second->orig_col is , second->text() ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] : rule sp_inside_fparen[line ] space_col_align(): av is ignore len is => coldiff is space_col_align(): orig_line is , orig_col is , [FPAREN_CLOSE/FUNC_CLASS_DEF] ')' <==> orig_line is , orig_col is [CONSTR_COLON/NONE] ':' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() ')', type is FPAREN_CLOSE -log_rule(): Spacing: first->orig_line is , first->text() is ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] <===> - second->text() ':', [CONSTR_COLON/NONE] : rule ADD as default value[line ] +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] <===> + second->orig_line is , second->orig_col is , second->text() ':', [CONSTR_COLON/NONE] : rule ADD as default value[line ] space_col_align(): av is add len is => coldiff is @@ -310,29 +310,29 @@ space_col_align(): av is remove => coldiff is space_col_align(): orig_line is , orig_col is , [FUNC_CTOR_VAR/NONE] 'pTelName' <==> orig_line is , orig_col is [FPAREN_OPEN/FUNC_CTOR_VAR] '(' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'pTelName', type is FUNC_CTOR_VAR -log_rule(): Spacing: first->orig_line is , first->text() is 'pTelName', [FUNC_CTOR_VAR/NONE] <===> - second->text() '(', [FPAREN_OPEN/FUNC_CTOR_VAR] : rule sp_func_call_paren[line ] +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'pTelName', [FUNC_CTOR_VAR/NONE] <===> + second->orig_line is , second->orig_col is , second->text() '(', [FPAREN_OPEN/FUNC_CTOR_VAR] : rule sp_func_call_paren[line ] space_col_align(): av is ignore len is => coldiff is space_col_align(): orig_line is , orig_col is , [FPAREN_OPEN/FUNC_CTOR_VAR] '(' <==> orig_line is , orig_col is [WORD/NONE] 'pN' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() '(', type is FPAREN_OPEN -log_rule(): Spacing: first->orig_line is , first->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===> - second->text() 'pN', [WORD/NONE] : rule sp_inside_fparen[line ] +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===> + second->orig_line is , second->orig_col is , second->text() 'pN', [WORD/NONE] : rule sp_inside_fparen[line ] space_col_align(): av is ignore len is => coldiff is space_col_align(): orig_line is , orig_col is , [WORD/NONE] 'pN' <==> orig_line is , orig_col is [FPAREN_CLOSE/FUNC_CTOR_VAR] ')' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'pN', type is WORD -log_rule(): Spacing: first->orig_line is , first->text() is 'pN', [WORD/NONE] <===> - second->text() ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] : rule sp_inside_fparen[line ] +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'pN', [WORD/NONE] <===> + second->orig_line is , second->orig_col is , second->text() ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] : rule sp_inside_fparen[line ] space_col_align(): av is ignore len is => coldiff is space_col_align(): orig_line is , orig_col is , [FPAREN_CLOSE/FUNC_CTOR_VAR] ')' <==> orig_line is , orig_col is [COMMA/NONE] ',' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() ')', type is FPAREN_CLOSE -log_rule(): Spacing: first->orig_line is , first->text() is ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] <===> - second->text() ',', [COMMA/NONE] : rule sp_before_comma[line ] +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] <===> + second->orig_line is , second->orig_col is , second->text() ',', [COMMA/NONE] : rule sp_before_comma[line ] space_col_align(): av is remove len is => coldiff is @@ -343,22 +343,22 @@ space_col_align(): av is remove => coldiff is space_col_align(): orig_line is , orig_col is , [FUNC_CTOR_VAR/NONE] 'nTelIndex' <==> orig_line is , orig_col is [FPAREN_OPEN/FUNC_CTOR_VAR] '(' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'nTelIndex', type is FUNC_CTOR_VAR -log_rule(): Spacing: first->orig_line is , first->text() is 'nTelIndex', [FUNC_CTOR_VAR/NONE] <===> - second->text() '(', [FPAREN_OPEN/FUNC_CTOR_VAR] : rule sp_func_call_paren[line ] +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'nTelIndex', [FUNC_CTOR_VAR/NONE] <===> + second->orig_line is , second->orig_col is , second->text() '(', [FPAREN_OPEN/FUNC_CTOR_VAR] : rule sp_func_call_paren[line ] space_col_align(): av is ignore len is => coldiff is space_col_align(): orig_line is , orig_col is , [FPAREN_OPEN/FUNC_CTOR_VAR] '(' <==> orig_line is , orig_col is [WORD/NONE] 'n' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() '(', type is FPAREN_OPEN -log_rule(): Spacing: first->orig_line is , first->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===> - second->text() 'n', [WORD/NONE] : rule sp_inside_fparen[line ] +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===> + second->orig_line is , second->orig_col is , second->text() 'n', [WORD/NONE] : rule sp_inside_fparen[line ] space_col_align(): av is ignore len is => coldiff is space_col_align(): orig_line is , orig_col is , [WORD/NONE] 'n' <==> orig_line is , orig_col is [FPAREN_CLOSE/FUNC_CTOR_VAR] ')' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'n', type is WORD -log_rule(): Spacing: first->orig_line is , first->text() is 'n', [WORD/NONE] <===> - second->text() ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] : rule sp_inside_fparen[line ] +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'n', [WORD/NONE] <===> + second->orig_line is , second->orig_col is , second->text() ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] : rule sp_inside_fparen[line ] space_col_align(): av is ignore len is => coldiff is @@ -379,22 +379,22 @@ space_col_align(): av is remove => coldiff is space_col_align(): orig_line is , orig_col is , [DESTRUCTOR/NONE] '~' <==> orig_line is , orig_col is [FUNC_CLASS_DEF/DESTRUCTOR] 'TelegramIndex' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() '~', type is DESTRUCTOR -log_rule(): Spacing: first->orig_line is , first->text() is '~', [DESTRUCTOR/NONE] <===> - second->text() 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] : rule REMOVE[line ] +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is '~', [DESTRUCTOR/NONE] <===> + second->orig_line is , second->orig_col is , second->text() 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] : rule REMOVE[line ] space_col_align(): av is remove len is => coldiff is space_col_align(): orig_line is , orig_col is , [FUNC_CLASS_DEF/DESTRUCTOR] 'TelegramIndex' <==> orig_line is , orig_col is [FPAREN_OPEN/FUNC_CLASS_DEF] '(' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'TelegramIndex', type is FUNC_CLASS_DEF -log_rule(): Spacing: first->orig_line is , first->text() is 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] <===> - second->text() '(', [FPAREN_OPEN/FUNC_CLASS_DEF] : rule sp_func_class_paren[line ] +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] <===> + second->orig_line is , second->orig_col is , second->text() '(', [FPAREN_OPEN/FUNC_CLASS_DEF] : rule sp_func_class_paren[line ] space_col_align(): av is ignore len is => coldiff is space_col_align(): orig_line is , orig_col is , [FPAREN_OPEN/FUNC_CLASS_DEF] '(' <==> orig_line is , orig_col is [FPAREN_CLOSE/FUNC_CLASS_DEF] ')' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() '(', type is FPAREN_OPEN -log_rule(): Spacing: first->orig_line is , first->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===> - second->text() ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] : rule sp_inside_fparens[line ] +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===> + second->orig_line is , second->orig_col is , second->text() ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] : rule sp_inside_fparens[line ] space_col_align(): av is ignore len is => coldiff is @@ -415,36 +415,36 @@ space_col_align(): av is remove => coldiff is space_col_align(): orig_line is , orig_col is , [QUALIFIER/NONE] 'const' <==> orig_line is , orig_col is [TYPE/NONE] 'char' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'const', type is QUALIFIER -log_rule(): Spacing: first->orig_line is , first->text() is 'const', [QUALIFIER/NONE] <===> - second->text() 'char', [TYPE/NONE] : rule sp_after_type[line ] +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'const', [QUALIFIER/NONE] <===> + second->orig_line is , second->orig_col is , second->text() 'char', [TYPE/NONE] : rule sp_after_type[line ] space_col_align(): av is force len is => coldiff is space_col_align(): orig_line is , orig_col is , [TYPE/NONE] 'char' <==> orig_line is , orig_col is [PTR_TYPE/NONE] '*' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'char', type is TYPE -log_rule(): Spacing: first->orig_line is , first->text() is 'char', [TYPE/NONE] <===> - second->text() '*', [PTR_TYPE/NONE] : rule IGNORE[line ] +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'char', [TYPE/NONE] <===> + second->orig_line is , second->orig_col is , second->text() '*', [PTR_TYPE/NONE] : rule IGNORE[line ] space_col_align(): av is ignore len is => coldiff is space_col_align(): orig_line is , orig_col is , [PTR_TYPE/NONE] '*' <==> orig_line is , orig_col is [QUALIFIER/NONE] 'const' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() '*', type is PTR_TYPE -log_rule(): Spacing: first->orig_line is , first->text() is '*', [PTR_TYPE/NONE] <===> - second->text() 'const', [QUALIFIER/NONE] : rule IGNORE[line ] +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is '*', [PTR_TYPE/NONE] <===> + second->orig_line is , second->orig_col is , second->text() 'const', [QUALIFIER/NONE] : rule IGNORE[line ] space_col_align(): av is ignore len is => coldiff is space_col_align(): orig_line is , orig_col is , [QUALIFIER/NONE] 'const' <==> orig_line is , orig_col is [WORD/NONE] 'pTelName' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'const', type is QUALIFIER -log_rule(): Spacing: first->orig_line is , first->text() is 'const', [QUALIFIER/NONE] <===> - second->text() 'pTelName', [WORD/NONE] : rule sp_after_type[line ] +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'const', [QUALIFIER/NONE] <===> + second->orig_line is , second->orig_col is , second->text() 'pTelName', [WORD/NONE] : rule sp_after_type[line ] space_col_align(): av is force len is => coldiff is space_col_align(): orig_line is , orig_col is , [WORD/NONE] 'pTelName' <==> orig_line is , orig_col is [SEMICOLON/NONE] ';' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'pTelName', type is WORD -log_rule(): Spacing: first->orig_line is , first->text() is 'pTelName', [WORD/NONE] <===> - second->text() ';', [SEMICOLON/NONE] : rule sp_before_semi[line ] +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'pTelName', [WORD/NONE] <===> + second->orig_line is , second->orig_col is , second->text() ';', [SEMICOLON/NONE] : rule sp_before_semi[line ] space_col_align(): av is remove len is => coldiff is @@ -455,22 +455,22 @@ space_col_align(): av is remove => coldiff is space_col_align(): orig_line is , orig_col is , [TYPE/NONE] 'unsigned' <==> orig_line is , orig_col is [TYPE/NONE] 'long' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'unsigned', type is TYPE -log_rule(): Spacing: first->orig_line is , first->text() is 'unsigned', [TYPE/NONE] <===> - second->text() 'long', [TYPE/NONE] : rule sp_after_type[line ] +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'unsigned', [TYPE/NONE] <===> + second->orig_line is , second->orig_col is , second->text() 'long', [TYPE/NONE] : rule sp_after_type[line ] space_col_align(): av is force len is => coldiff is space_col_align(): orig_line is , orig_col is , [TYPE/NONE] 'long' <==> orig_line is , orig_col is [WORD/NONE] 'nTelIndex' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'long', type is TYPE -log_rule(): Spacing: first->orig_line is , first->text() is 'long', [TYPE/NONE] <===> - second->text() 'nTelIndex', [WORD/NONE] : rule sp_after_type[line ] +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'long', [TYPE/NONE] <===> + second->orig_line is , second->orig_col is , second->text() 'nTelIndex', [WORD/NONE] : rule sp_after_type[line ] space_col_align(): av is force len is => coldiff is space_col_align(): orig_line is , orig_col is , [WORD/NONE] 'nTelIndex' <==> orig_line is , orig_col is [SEMICOLON/NONE] ';' [CallStack:-DEBUG NOT SET-] do_space(): orig_line is , orig_col is , first->text() 'nTelIndex', type is WORD -log_rule(): Spacing: first->orig_line is , first->text() is 'nTelIndex', [WORD/NONE] <===> - second->text() ';', [SEMICOLON/NONE] : rule sp_before_semi[line ] +log_rule(): Spacing: first->orig_line is , first->orig_col is , first->text() is 'nTelIndex', [WORD/NONE] <===> + second->orig_line is , second->orig_col is , second->text() ';', [SEMICOLON/NONE] : rule sp_before_semi[line ] space_col_align(): av is remove len is => coldiff is diff --git a/tests/config/del_semicolon.cfg b/tests/config/del_semicolon.cfg index 72b40a7ca2..b06fbf1187 100644 --- a/tests/config/del_semicolon.cfg +++ b/tests/config/del_semicolon.cfg @@ -2,3 +2,6 @@ mod_remove_extra_semicolon = true sp_after_semi_for = remove sp_special_semi=force +# +#sp_before_semi = ignore +sp_before_semi = remove diff --git a/tests/config/sf538.cfg b/tests/config/sf538.cfg index 2c1d62127b..81b3190031 100644 --- a/tests/config/sf538.cfg +++ b/tests/config/sf538.cfg @@ -109,3 +109,4 @@ indent_with_tabs=0 sp_arith=remove sp_assign=remove sp_special_semi=force +sp_before_semi = force diff --git a/tests/config/sp_after_sparen.cfg b/tests/config/sp_after_sparen.cfg index 04abeb8e25..3a108bd745 100644 --- a/tests/config/sp_after_sparen.cfg +++ b/tests/config/sp_after_sparen.cfg @@ -1,3 +1,4 @@ # test for bug # 637 indent_with_tabs = 0 sp_after_sparen = force +sp_before_semi = force diff --git a/tests/cpp.test b/tests/cpp.test index bffea9c135..285ab419da 100644 --- a/tests/cpp.test +++ b/tests/cpp.test @@ -174,6 +174,7 @@ 30706 bug_1020.cfg cpp/bug_1020.cpp 30711 del_semicolon.cfg cpp/semicolons.cpp +30712 empty.cfg cpp/bug_1158.cpp 30720 wessex.cfg cpp/custom-open-2.cpp diff --git a/tests/input/cpp/bug_1158.cpp b/tests/input/cpp/bug_1158.cpp new file mode 100644 index 0000000000..e1dd5d2132 --- /dev/null +++ b/tests/input/cpp/bug_1158.cpp @@ -0,0 +1,4 @@ +void Class1::Func(void) +{ + while (Next()); +} diff --git a/tests/output/c/01011-semicolons.c b/tests/output/c/01011-semicolons.c index 8d7d2f4b56..962ec58868 100644 --- a/tests/output/c/01011-semicolons.c +++ b/tests/output/c/01011-semicolons.c @@ -51,7 +51,7 @@ void f2(void) { { i++; } - for (;;) ; + for (;;); for (;;) { } } diff --git a/tests/output/cpp/30712-bug_1158.cpp b/tests/output/cpp/30712-bug_1158.cpp new file mode 100644 index 0000000000..2a9ba76ddc --- /dev/null +++ b/tests/output/cpp/30712-bug_1158.cpp @@ -0,0 +1,4 @@ +void Class1::Func(void) +{ + while (Next()); +} From 8ed237ffad2a6d543b7892f6db981bc02ada2041 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Tue, 24 Oct 2017 21:58:29 +0200 Subject: [PATCH 048/136] add option_reducer.py --- scripts/option_reducer.py | 1125 +++++++++++++++++++++++++++++++++++++ 1 file changed, 1125 insertions(+) create mode 100644 scripts/option_reducer.py diff --git a/scripts/option_reducer.py b/scripts/option_reducer.py new file mode 100644 index 0000000000..1e6f5bd216 --- /dev/null +++ b/scripts/option_reducer.py @@ -0,0 +1,1125 @@ +#!/bin/python +""" +option_reducer.py + +reduces options in a given config file to the minimum while still maintaining +desired formatting + +:author: Daniel Chumak +:license: GPL v2+ +""" + +# Possible improvements: +# - parallelize add_back() +# - (maybe) reduce amount of written config file, see Uncrustify --set + +from __future__ import print_function # python >= 2.6 +import argparse + +from os import name as os_name, sep as os_path_sep, fdopen as os_fdopen, \ + remove as os_remove +from os.path import exists, join as path_join +from subprocess import Popen, PIPE +from sys import exit as sys_exit, stderr, stdout +from shutil import rmtree +from multiprocessing import cpu_count +from tempfile import mkdtemp, mkstemp +from contextlib import contextmanager +from collections import OrderedDict +from threading import Timer +from multiprocessing.pool import Pool +from itertools import combinations + +FLAGS = None +NULL_DEV = "/dev/null" if os_name != "nt" else "nul" + + +def enum(**enums): + return type('Enum', (), enums) + + +RESTULTSFLAG = enum(NONE=0, REMOVE=1, KEEP=2) +ERROR_CODE = enum(NONE=0, FLAGS=200, SANITY0=201, SANITY1=202) +MODES = ("reduce", "no-default") + + +@contextmanager +def make_temp_directory(): + """ + Wraps tempfile.mkdtemp to use it inside a with statement that auto deletes + the temporary directory with its content after the with block closes + + + :return: str + ---------------------------------------------------------------------------- + path to the generated directory + """ + temp_dir = mkdtemp() + try: + yield temp_dir + finally: + rmtree(temp_dir) + + +@contextmanager +def make_raw_temp_file(*args, **kwargs): + """ + Wraps tempfile.mkstemp to use it inside a with statement that auto deletes + the file after the with block closes + + + Parameters + ---------------------------------------------------------------------------- + :param args, kwargs: + arguments passed to mkstemp + + + :return: int, str + ---------------------------------------------------------------------------- + the file descriptor and the file path of the created temporary file + """ + fd, tmp_file_name = mkstemp(*args, **kwargs) + try: + yield (fd, tmp_file_name) + finally: + os_remove(tmp_file_name) + + +@contextmanager +def open_fd(*args, **kwargs): + """ + Wraps os.fdopen to use it inside a with statement that auto closes the + generated file descriptor after the with block closes + + + Parameters + ---------------------------------------------------------------------------- + :param args, kwargs: + arguments passed to os.fdopen + + + :return: TextIOWrapper + ---------------------------------------------------------------------------- + open file object connected to the file descriptor + """ + fp = os_fdopen(*args, **kwargs) + try: + yield fp + finally: + fp.close() + + +def term_proc(proc, timeout): + """ + helper function to terminate a process + + + Parameters + ---------------------------------------------------------------------------- + :param proc: process object + the process object that is going to be terminated + + :param timeout: dictionary + a dictionary (used as object reference) to set a flag that indicates + that the process is going to be terminated + """ + timeout["value"] = True + proc.terminate() + + +def uncrustify(unc_bin_path, cfg_file_path, unformatted_file_path, + lang=None, debug_file=None, check=False): + """ + executes Uncrustify and captures its stdout + + + Parameters + ---------------------------------------------------------------------------- + :param unc_bin_path: str + path to the Uncrustify binary + + :param cfg_file_path: str + path to a config file for Uncrustify + + :param unformatted_file_path: str + path to a file that is going to be formatted + + :param lang: str / None + Uncrustifys -l argument + + :param debug_file: str / None + Uncrustifys -p argument + + :param check: bool + Used to control whether Uncrustifys --check is going to be used + + + :return: str / None + ---------------------------------------------------------------------------- + returns the stdout from Uncrustify or None if the process takes to much + time (set to 5 sec) + """ + + args = [unc_bin_path, "-q", "-c", cfg_file_path, '-f', + unformatted_file_path] + if lang: + args.extend(("-l", lang)) + if debug_file: + args.extend(('-p', debug_file)) + if check: + args.append('--check') + + proc = Popen(args, stdout=PIPE, stderr=PIPE) + + timeout = {"value": False} + timer = Timer(5, term_proc, [proc, timeout]) + timer.start() + + output_b, error_txt_b = proc.communicate() + + timer.cancel() + + if timeout["value"]: + print("uncrustify proc timeout: %s" % ' '.join(args), file=stderr) + return None + + error = error_txt_b.decode("UTF-8") + if error: + print("Uncrustify %s stderr:\n %s" % (unformatted_file_path, error), + file=stderr) + + return output_b + + +def same_expected_generated(formatted_path, unc_bin_path, cfg_file_path, + input_path, lang=None): + """ + Calls uncrustify and compares its generated output with the content of a + file + + + Parameters + ---------------------------------------------------------------------------- + :param formatted_path: str + path to a file containing the expected content + + :params unc_bin_path, cfg_file_path, input_path, lang: str, str, str, + str / None + see uncrustify() + + + :return: bool + ---------------------------------------------------------------------------- + True if the strings match, False otherwise + """ + + expected_string = '' + with open(formatted_path, 'rb') as f: + expected_string = f.read() + + formatted_string = uncrustify(unc_bin_path, cfg_file_path, input_path, lang) + + return True if formatted_string == expected_string else False + + +def process_uncrustify(args): + """ + special wrapper for same_expected_generated() + + accesses global var(s): RESTULTSFLAG + + + Parameters + ---------------------------------------------------------------------------- + :param args: list / tuple< int, ... > + this function is intended to be called by multiprocessing.pool.map() + therefore all arguments are inside a list / tuple: + id: int + an index number needed by the caller to differentiate runs + + other parameters: + see same_expected_generated() + + + :return: tuple< int, RESTULTSFLAG > + ---------------------------------------------------------------------------- + returns a tuple containing the id and a RESTULTSFLAG, REMOVE if both + strings are equal, KEEP if not + """ + + id = args[0] + res = same_expected_generated(*args[1:]) + + return id, RESTULTSFLAG.REMOVE if res else RESTULTSFLAG.KEEP + + +def write_config_file(args): + """ + Writes all but one excluded option into a config file + + + Parameters + ---------------------------------------------------------------------------- + :param args: list / tuple< list< tuple< str, str > >, str, int > + this function is intended to be called by multiprocessing.pool.map() + therefore all arguments are inside a list / tuple: + + config_list: list< tuple< str, str > > + a list of tuples containing option names and values + + tmp_dir: str + path to a directory in which the config file is going to be + written + + exclude_idx: int + index for an option that is not going to be written into the + config file + """ + + config_list, tmp_dir, exclude_idx = args + + with open("%s%suncr-%d.cfg" % (tmp_dir, os_path_sep, exclude_idx), + 'w') as f: + print_config(config_list, target_file_obj=f, exclude_idx=exclude_idx) + + +def write_config_file2(args): + """ + Writes two option lists into a config file + + + Parameters + ---------------------------------------------------------------------------- + :param args: list< tuple< str, str > >, + list< tuple< str, str > >, str, int + this function is intended to be called by multiprocessing.pool.map() + therefore all arguments are inside a list / tuple: + + config_list: list< tuple< str, str > > + the first list of tuples containing option names and values + + test_list: list< tuple< str, str > > + the second list of tuples containing option names and values + + tmp_dir: str + path to a directory in which the config file is going to be + written + + idx: int + index that is going to be used for the filename + """ + + config_list0, config_list1, tmp_dir, idx = args + + with open("%s%suncr-r-%d.cfg" % (tmp_dir, os_path_sep, idx), 'w') as f: + print_config(config_list0, target_file_obj=f) + print("", end='\n', file=f) + print_config(config_list1, target_file_obj=f) + + +def gen_multi_combinations(elements, N): + """ + generator function that generates, based on a set of elements, all + combinations of 1..N elements + + + Parameters + ---------------------------------------------------------------------------- + :param elements: list / tuple + a list of elements from which the combinations will be generated + + :param N: + the max number of element in a combination + + + :return: list + ---------------------------------------------------------------------------- + yields a single combination of the elements + + >>> gen_multi_combinations(["a", "b", "c"], 3) + (a); (b); (c); (a,b); (a,c); (b,c); (a,b,c) + """ + + fields = len(elements) + if N > fields: + raise Exception("Error: N > len(options)") + if N <= 0: + raise Exception("Error: N <= 0") + + for n in range(1, N + 1): + yield combinations(elements, n) + + +def add_back(unc_bin_path, input_files, formatted_files, langs, options_r, + options_k, tmp_dir): + """ + lets Uncrustify format files with generated configs files until all + formatted files match their according expected files. + + Multiple config files are generated based on a (base) list of Uncrustify + options combined with additional (new) options derived from combinations of + another list of options. + + + accesses global var(s): RESTULTSFLAG + + + Parameters + ---------------------------------------------------------------------------- + :param unc_bin_path: str + path to the Uncrustify binary + + :param input_files: list / tuple< str > + a list containing paths to a files that are going to be formatted + + :param formatted_files: list / tuple< str > + a list containing paths to files containing the expected contents + + :param langs: list / tuple< str > / None + a list of languages the files, used as Uncrustifys -l argument + can be None or shorter than the amount of provided files + + :param options_r: list< tuple< str, str > > + the list of options from which combinations will be derived + + :param options_k: list< tuple< str, str > > + the (base) list of Uncrustify options + + :param tmp_dir: str + the directory in which the config files will be written to + + + :return: list< tuple< str, str > > / None + ---------------------------------------------------------------------------- + list of additional option that were needed to generate matching file + contents + """ + + lang_max_idx = -1 if langs is None else len(langs) - 1 + file_len = len(input_files) + + if len(formatted_files) != file_len: + raise Exception("len(input_files) != len(formatted_files)") + + for m_combination in gen_multi_combinations(options_r, len(options_r)): + for idx, (r_combination) in enumerate(m_combination): + write_config_file2((options_k, r_combination, tmp_dir, idx)) + + cfg_file_path = "%s%suncr-r-%d.cfg" % (tmp_dir, os_path_sep, idx) + res = [] + + for file_idx in range(file_len): + lang = None if idx > lang_max_idx else langs[file_idx] + + r = process_uncrustify( + (0, formatted_files[file_idx], unc_bin_path, cfg_file_path, + input_files[file_idx], lang)) + res.append(r[1]) + + # all files, flag = remove -> option can be removed -> equal output + if res.count(RESTULTSFLAG.REMOVE) == len(res): + return r_combination + return None + + +def sanity_raw_run(args): + """ + wrapper for same_expected_generated(), prints error message if the config + file does not generate the expected result + + Parameters + ---------------------------------------------------------------------------- + :param args: + see same_expected_generated + + + :return: + ---------------------------------------------------------------------------- + see same_expected_generated + """ + res = same_expected_generated(*args) + + if not res: + formatted_file_path = args[0] + config_file_path = args[2] + input_file_path = args[3] + + print("\nprovided config does not create formatted source file:\n" + " %s\n %s\n->| %s" + % (input_file_path, config_file_path, formatted_file_path), + file=stderr) + return res + + +def sanity_run(args): + """ + wrapper for same_expected_generated(), prints error message if the config + file does not generate the expected result + + + Parameters + ---------------------------------------------------------------------------- + :param args: + see same_expected_generated + + + :return: + ---------------------------------------------------------------------------- + see same_expected_generated + """ + res = same_expected_generated(*args) + + if not res: + formatted_file_path = args[0] + input_file_path = args[3] + + print("\ngenerated config does not create formatted source file:\n" + " %s\n %s" + % (input_file_path, formatted_file_path), file=stderr) + return res + + +def sanity_run_splitter(uncr_bin, config_list, input_files, formatted_files, + langs, tmp_dir, jobs): + """ + writes config option into a file and tests if every input file is formatted + so that is matches the content of the according expected file + + + Parameters + ---------------------------------------------------------------------------- + :param uncr_bin: str + path to the Uncrustify binary + + :param config_list: list< tuple< str, str > > + a list of tuples containing option names and values + + :param input_files: list / tuple< str > + a list containing paths to a files that are going to be formatted + + :param formatted_files: list / tuple< str > + a list containing paths to files containing the expected contents + + :param langs: list / tuple< str > / None + a list of languages the files, used as Uncrustifys -l argument + can be None or shorter than the amount of provided files + + :param tmp_dir: str + the directory in which the config files will be written to + + :param jobs: int + number of processes to use + + + :return: bool + ---------------------------------------------------------------------------- + True if all files generate correct results, False oterhwise + """ + + file_len = len(input_files) + if len(formatted_files) != file_len: + raise Exception("len(input_files) != len(formatted_files)") + + gen_cfg_path = path_join(tmp_dir, "gen.cfg") + with open(gen_cfg_path, 'w') as f: + print_config(config_list, target_file_obj=f) + + lang_max_idx = -1 if langs is None else len(langs) - 1 + args = [] + + for idx in range(file_len): + lang = None if idx > lang_max_idx else langs[idx] + + args.append((formatted_files[idx], uncr_bin, gen_cfg_path, + input_files[idx], lang)) + + pool = Pool(processes=jobs) + sr = pool.map(sanity_run, args) + + return False not in sr + + +def print_config(config_list, target_file_obj=stdout, exclude_idx=()): + """ + prints config options into a config file + + + Parameters + ---------------------------------------------------------------------------- + :param config_list: list< tuple< str, str > > + a list containing pairs of option names and option values + + :param target_file_obj: file object + see file param of print() + + :param exclude_idx: int / list< int > + index of option(s) that are not going to be printed + """ + + if not config_list: + return + config_list_len = len(config_list) + + # check if exclude_idx list is empty -> assign len + if type(exclude_idx) in (list, tuple) and not exclude_idx: + exclude_idx = [config_list_len] + else: + # sort it, unless it is an int -> transform into a list + try: + exclude_idx = sorted(exclude_idx) + except TypeError: + exclude_idx = [exclude_idx] + + # extracted first loop round: + # do not print '\n' for the ( here non-existing) previous line + if exclude_idx[0] != 0: + print("%s = %s" % (config_list[0][0].ljust(31, ' '), config_list[0][1]), + end='', file=target_file_obj) + # also print space if a single option was provided and it is going to be + # excluded. This is done in order to be able to differentiate between + # --empty-nochange and the case where all options can be removed + elif config_list_len == 1: + print(' ', end='', file=target_file_obj) + return + + start_idx = 1 + for end in exclude_idx: + end = min(end, config_list_len) + + for idx in range(start_idx, end): + print("\n%s = %s" + % (config_list[idx][0].ljust(31, ' '), config_list[idx][1]), + end='', file=target_file_obj) + + start_idx = min(end + 1, config_list_len) + + # after + for idx in range(start_idx, config_list_len): + print("\n%s = %s" + % (config_list[idx][0].ljust(31, ' '), config_list[idx][1]), + end='', file=target_file_obj) + + +def get_non_default_options(unc_bin_path, cfg_file_path): + """ + calls Uncrustify to generate a debug file from which a config only with + non default valued options are extracted + + accesses global var(s): NULL_DEV + + + Parameters + ---------------------------------------------------------------------------- + :param unc_bin_path: str + path to the Uncrustify binary + + :param cfg_file_path: str + path to a config file for Uncrustify + + + :return: list< str > + ---------------------------------------------------------------------------- + amount of lines in the provided and shortened config + """ + lines = [] + + with make_raw_temp_file(suffix='.unc') as (fd, file_path): + # make debug file + uncrustify(unc_bin_path, cfg_file_path, NULL_DEV, debug_file=file_path, + check=True) + + # extract non comment lines -> non default config lines + with open_fd(fd, 'r') as fp: + lines = fp.read().splitlines() + lines = [line for line in lines if not line[:1] == '#'] + + return lines + + +def parse_config_file(file_obj): + """ + Reads in a Uncrustify config file + + + Parameters + ---------------------------------------------------------------------------- + :param file_obj: + the file object of an opened config file + + + :return: list< tuple< str, str > > + ---------------------------------------------------------------------------- + a list containing pairs of option names and option values + """ + # dict used to only save the last option setting if the same option occurs + # multiple times, without this: + # optionA0 can be removed because optionA1 = s0, and + # optionA1 can be removed because optionA0 = s0 + # -> optionA0, optionA1 are both removed + config_map = OrderedDict() + + # special keys may not have this limitation, as for example + # 'set x y' and 'set x z' do not overwrite each other + special_keys = {'macro-open', 'macro-else', 'macro-close', 'set', 'type', + 'file_ext', 'define'} + special_list = [] + + for line in file_obj: + # cut comments + pound_pos = line.find('#') + if pound_pos != -1: + line = line[:pound_pos] + + split_pos = line.find('=') + if split_pos == -1: + split_pos = line.find(' ') + if split_pos == -1: + continue + + key = line[:split_pos].strip() + value = line[split_pos + 1:].strip() + + if key in special_keys: + special_list.append((key, value)) + else: + config_map[key] = value + + config_list = list(config_map.items()) + config_list += special_list + + return config_list + + +def count_lines(file_path): + """ + returns the count of lines in a file by counting '\n' chars + + Parameters + ---------------------------------------------------------------------------- + :param file_path: str + file in which the lines will be counted + + + :return: int + ---------------------------------------------------------------------------- + number a lines + """ + in_count = 0 + with open(file_path, 'r') as f: + in_count = f.read().count('\n') + 1 + return in_count + + +def reduce(options_list): + """ + Reduces the given options to a minimum + + accesses global var(s): FLAGS, RESTULTSFLAG, ERROR_CODE + + Parameters + ---------------------------------------------------------------------------- + :param options_list: list< tuple< str, str > > + the list of options that are going to be reduced + + :return: int, list< tuple< str, str > > + status return code, reduced options + """ + config_list_len = len(options_list) + ret_flag = ERROR_CODE.NONE + + file_count = len(FLAGS.input_file_path) + lang_max_idx = -1 if FLAGS.lang is None else len(FLAGS.lang) - 1 + + pool = Pool(processes=FLAGS.jobs) + with make_temp_directory() as tmp_dir: + # region sanity run ---------------------------------------------------- + args = [] + for idx in range(file_count): + lang = None if idx > lang_max_idx else FLAGS.lang[idx] + + args.append((FLAGS.formatted_file_path[idx], + FLAGS.uncrustify_binary_path, FLAGS.config_file_path, + FLAGS.input_file_path[idx], lang)) + sr = pool.map(sanity_raw_run, args) + del args[:] + + if False in sr: + return ERROR_CODE.SANITY0, [] + del sr[:] + + # endregion + # region config generator loop ----------------------------------------- + args = [] + + for e_idx in range(config_list_len): + args.append((options_list, tmp_dir, e_idx)) + pool.map(write_config_file, args) + + del args[:] + + # endregion + # region main loop ----------------------------------------------------- + args = [] + jobs = config_list_len * file_count + + for idx in range(jobs): + file_idx = idx // config_list_len + option_idx = idx % config_list_len + + cfg_file_path = "%s%suncr-%d.cfg" \ + % (tmp_dir, os_path_sep, option_idx) + lang = None if idx > lang_max_idx else FLAGS.lang[file_idx] + + args.append((idx, FLAGS.formatted_file_path[file_idx], + FLAGS.uncrustify_binary_path, cfg_file_path, + FLAGS.input_file_path[file_idx], lang)) + + results = pool.map(process_uncrustify, args) + del args[:] + # endregion + # region clean results ------------------------------------------------- + option_flags = [RESTULTSFLAG.NONE] * config_list_len + + for r in results: + idx = r[0] + flag = r[1] + + option_idx = idx % config_list_len + + if option_flags[option_idx] == RESTULTSFLAG.KEEP: + continue + + option_flags[option_idx] = flag + del results[:] + # endregion + + options_r = [options_list[idx] for idx, x in enumerate(option_flags) + if x == RESTULTSFLAG.REMOVE] + options_list = [options_list[idx] for idx, x in enumerate(option_flags) + if x == RESTULTSFLAG.KEEP] + + del option_flags[:] + + # region sanity run ---------------------------------------------------- + # options can be removed one at a time generating appropriate results, + # oddly enough sometimes a config generated this way can fail when a + # combination of multiple options is missing + s_flag = True + if options_r: + s_flag = sanity_run_splitter( + FLAGS.uncrustify_binary_path, options_list, + FLAGS.input_file_path, FLAGS.formatted_file_path, FLAGS.lang, + tmp_dir, FLAGS.jobs) + + if not s_flag: + ret_flag = ERROR_CODE.SANITY1 + print("\n\nstumbled upon complex option dependencies in \n" + " %s\n" + "trying to add back minimal amount of removed options\n" + % FLAGS.config_file_path, file=stderr) + + ret_options = add_back( + FLAGS.uncrustify_binary_path, FLAGS.input_file_path, + FLAGS.formatted_file_path, FLAGS.lang, options_r, + options_list, tmp_dir) + + if ret_options: + options_list.extend(ret_options) + + s_flag = sanity_run_splitter( + FLAGS.uncrustify_binary_path, options_list, + FLAGS.input_file_path, FLAGS.formatted_file_path, + FLAGS.lang, tmp_dir, FLAGS.jobs) + + if s_flag: + print("Success!", file=stderr) + ret_flag = ERROR_CODE.NONE + # endregion + return ret_flag, options_list if ret_flag == ERROR_CODE.NONE else [] + + +def reduce_mode(): + """ + the mode that minimizes a config file as much as possible + + accesses global var(s): FLAGS, ERROR_CODE + """ + ret_flag = ERROR_CODE.NONE + option_list = {} + + # gen & parse non default config + lines = get_non_default_options(FLAGS.uncrustify_binary_path, + FLAGS.config_file_path) + option_list = parse_config_file(lines) + config_list_len = len(option_list) + + config_lines_init = count_lines(FLAGS.config_file_path) + config_lines_ndef = len(lines) + del lines[:] + + # early return if all options are already removed at this point + if config_list_len == 0: + if not FLAGS.empty_nochange \ + or (config_lines_init - config_lines_ndef) > 0: + if not FLAGS.quiet: + print("\n%s" % '# '.ljust(78, '-')) + + print(" ") + + if not FLAGS.quiet: + print("%s" % '# '.ljust(78, '-')) + print("# initial config lines: %d,\n" + "# default options and unneeded lines: %d,\n" + "# unneeded options: 0,\n" + "# kept options: 0" + % (config_lines_init, config_lines_init)) + print("ret_flag: 0", file=stderr) + return ERROR_CODE.NONE + + # gen reduced options + config_lines_redu = -1 + for i in range(FLAGS.passes): + old_config_lines_redu = config_lines_redu + + ret_flag, option_list = reduce(option_list) + config_lines_redu = len(option_list) + + if ret_flag != ERROR_CODE.NONE \ + or config_lines_redu == old_config_lines_redu: + break + + if ret_flag == ERROR_CODE.NONE: + # use the debug file trick again to get correctly sorted options + with make_raw_temp_file(suffix='.unc') as (fd, file_path): + with open_fd(fd, 'w') as f: + print_config(option_list, target_file_obj=f) + + lines = get_non_default_options(FLAGS.uncrustify_binary_path, + file_path) + option_list = parse_config_file(lines) + + # print output + stats + if not FLAGS.empty_nochange or config_lines_ndef != config_lines_redu: + if not FLAGS.quiet: + print("\n%s" % '# '.ljust(78, '-')) + + print_config(option_list) + + if not FLAGS.quiet: + print("\n%s" % '# '.ljust(78, '-')) + print("# initial config lines: %d,\n" + "# default options and unneeded lines: %d,\n" + "# unneeded options: %d,\n" + "# kept options: %d" + % (config_lines_init, + config_lines_init - config_lines_ndef, + config_lines_ndef - config_lines_redu, + config_lines_redu)) + + print("ret_flag: %d" % ret_flag, file=stderr) + return ret_flag + + +def no_default_mode(): + """ + the mode removes all unnecessary lines and options with default values + + accesses global var(s): FLAGS, ERROR_CODE + """ + + lines = get_non_default_options(FLAGS.uncrustify_binary_path, + FLAGS.config_file_path, ) + config_lines_ndef = len(lines) + config_lines_init = count_lines(FLAGS.config_file_path) + + if not FLAGS.empty_nochange or (config_lines_ndef != config_lines_init): + if not FLAGS.quiet: + print("%s" % '# '.ljust(78, '-')) + + options_str = '\n'.join(lines) + if not options_str: + print(" ") + else: + print(options_str, file=stdout) + + if not FLAGS.quiet: + print("%s" % '# '.ljust(78, '-')) + print("# initial config lines: %d,\n" + "# default options and unneeded lines: %d,\n" + % (config_lines_init, config_lines_init - config_lines_ndef)) + + return ERROR_CODE.NONE + + +def main(): + """ + calls the mode that was specified by the -m script argument, + defaults to reduce_mode if not provided or unknown mode + + accesses global var(s): MODES, FLAGS + + + :return: int + ---------------------------------------------------------------------------- + return code + """ + if FLAGS.mode == MODES[1]: + return no_default_mode() + + return reduce_mode() + + +def valid_file(arg_parser, *args): + """ + checks if on of the provided paths is a file + + + Parameters + ---------------------------------------------------------------------------- + :param arg_parser: + argument parser object that is called if no file is found + + :param args: list< str > + a list of file path that is going to be checked + + + :return: str + ---------------------------------------------------------------------------- + path to an existing file + """ + arg = None + found_flag = False + for arg in args: + if exists(arg): + found_flag = True + break + if not found_flag: + arg_parser.error("file(s) do not exist: %s" % args) + + return arg + + +if __name__ == "__main__": + """ + parses all script arguments and calls main() + + accesses global var(s): FLAGS, ERROR_CODE, MODES + """ + arg_parser = argparse.ArgumentParser() + + group_general = arg_parser.add_argument_group( + 'general options', 'Options used by both modes') + + group_general.add_argument( + '-q', '--quiet', + default=False, + action='store_true', + help='Whether or not messages, other than the actual config output, ' + 'should be printed to stdout.' + ) + group_general.add_argument( + '--empty-nochange', + default=False, + action='store_true', + help='Do not print anything to stdout if no options could be removed' + ) + group_general.add_argument( + '-m', '--mode', + type=str, + choices=MODES, + default=MODES[0], + help="The script operation mode. Defaults to '%s'" % MODES[0] + ) + group_general.add_argument( + '-b', '--uncrustify_binary_path', + metavar='', + type=lambda x: valid_file( + arg_parser, x, + "../build/uncrustify.exe", + "../build/Debug/uncrustify", + "../build/Debug/uncrustify.exe", + "../build/Release/uncrustify", + "../build/Release/uncrustify.exe"), + default="../build/uncrustify", + help="The Uncrustify binary file path. Is searched in known locations " + "in the 'Uncrustify/build/' directory if no is provided." + ) + group_general.add_argument( + '-c', '--config_file_path', + metavar='', + type=lambda x: valid_file(arg_parser, x), + required=True, + help='Path to the config file.' + ) + + group_reduce = arg_parser.add_argument_group( + 'reduce mode', 'Options to reduce configuration file options') + + group_reduce.add_argument( + '-i', '--input_file_path', + metavar='', + type=lambda x: valid_file(arg_parser, x), + nargs='+', + action='append', + help="Path to the unformatted source file. " + "Required if mode '%s' is used" % MODES[0] + ) + group_reduce.add_argument( + '-f', '--formatted_file_path', + metavar='', + type=lambda x: valid_file(arg_parser, x), + nargs='+', + action='append', + help="Path to the formatted source file. " + "Required if mode '%s' is used" % MODES[0] + ) + group_reduce.add_argument( + '-l', '--lang', + metavar='', + nargs='+', + required=False, + action='append', + help='Uncrustify processing language for each input file' + ) + group_reduce.add_argument( + '-j', '--jobs', + metavar='', + type=int, + default=cpu_count(), + help='Number of concurrent jobs.' + ) + group_reduce.add_argument( + '-p', '--passes', + metavar='', + type=int, + default=5, + help='Max. number of cleaning passes.' + ) + + group_no_default = arg_parser.add_argument_group( + 'no-default mode', 'Options to remove configuration file option with ' + 'default values: ~~_Currently only the general' + ' options are used for this mode_~~') + FLAGS, unparsed = arg_parser.parse_known_args() + + if FLAGS.lang is not None: + FLAGS.lang = [j for i in FLAGS.lang for j in i] + + if FLAGS.mode == MODES[0]: + if not FLAGS.input_file_path or not FLAGS.formatted_file_path: + arg_parser.error("Flags -f and -i are required in Mode '%s'!" + % MODES[0]) + sys_exit(ERROR_CODE.FLAGS) + + # flatten 2 dimensional args: -f p -f p -f p -f p0 p1 p2 -> [[],[], ...] + FLAGS.input_file_path = [j for i in FLAGS.input_file_path for j in i] + + FLAGS.formatted_file_path = [j for i in + FLAGS.formatted_file_path for j in i] + + if len(FLAGS.input_file_path) != len(FLAGS.formatted_file_path): + print("Unequal amount of input and formatted file paths.", + file=stderr) + sys_exit(ERROR_CODE.FLAGS) + + sys_exit(main()) From b5df8bba4f0fe90d021a6813fca5770e29913182 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Thu, 26 Oct 2017 00:01:53 +0200 Subject: [PATCH 049/136] rename option UO_align_number_left to UO_align_number_right --- documentation/htdocs/ben.cfg.txt | 2 +- documentation/htdocs/config.txt | 4 ++-- documentation/htdocs/default.cfg | 4 ++-- emscripten/libUncrustify.d.ts | 2 +- etc/amxmodx.cfg | 2 +- etc/ben.cfg | 4 ++-- etc/ben2.cfg | 2 +- etc/d.cfg | 2 +- etc/defaults.cfg | 4 ++-- etc/freebsd.cfg | 2 +- etc/gnu-indent.cfg | 2 +- etc/klaus.cfg | 4 ++-- etc/kr-indent.cfg | 2 +- etc/mono.cfg | 2 +- etc/sun.cfg | 4 ++-- etc/xsupplicant.cfg | 2 +- forUncrustifySources.cfg | 2 +- src/align.cpp | 6 +++--- src/options.cpp | 4 ++-- src/options.h | 2 +- src/uncrustify_emscripten.cpp | 2 +- tests/cli/Output/mini_d_uc.txt | 2 +- tests/cli/Output/mini_d_ucwd.txt | 4 ++-- tests/cli/Output/mini_nd_uc.txt | 2 +- tests/cli/Output/mini_nd_ucwd.txt | 4 ++-- tests/cli/Output/show_config.txt | 4 ++-- tests/config/1liner-no-split.cfg | 4 ++-- tests/config/1liner-split.cfg | 4 ++-- tests/config/Uncrustify.Common-CStyle.cfg | 4 ++-- tests/config/al.cfg | 4 ++-- tests/config/align-1.cfg | 2 +- tests/config/align-2.cfg | 2 +- tests/config/align-3.cfg | 2 +- tests/config/align_fcall-2.cfg | 2 +- tests/config/amxmodx.cfg | 2 +- tests/config/avalon.cfg | 4 ++-- tests/config/avalon2.cfg | 4 ++-- tests/config/avalon3.cfg | 4 ++-- tests/config/avalon4.cfg | 4 ++-- tests/config/ben.cfg | 2 +- tests/config/ben2.cfg | 2 +- tests/config/bug_340.cfg | 4 ++-- tests/config/bug_489.cfg | 2 +- tests/config/bug_631.cfg | 2 +- tests/config/bug_657.cfg | 2 +- tests/config/bug_664.cfg | 2 +- tests/config/bug_670.cfg | 2 +- tests/config/bug_671.cfg | 4 ++-- tests/config/cast-sp-a.cfg | 2 +- tests/config/cast-sp-r.cfg | 2 +- tests/config/cast-type.cfg | 2 +- tests/config/cgal.cfg | 2 +- tests/config/clark.cfg | 4 ++-- tests/config/cu.cfg | 2 +- tests/config/d-tst2.cfg | 2 +- tests/config/d.cfg | 2 +- tests/config/d2.cfg | 2 +- tests/config/d3.cfg | 2 +- tests/config/d3a.cfg | 2 +- tests/config/doxy-comment-no.cfg | 2 +- tests/config/doxy-comment-yes.cfg | 2 +- tests/config/freebsd.cfg | 4 ++-- tests/config/func_call_user.cfg | 4 ++-- tests/config/ger.cfg | 2 +- tests/config/getset.cfg | 2 +- tests/config/indent-vbrace.cfg | 2 +- tests/config/indent_braces_no.cfg | 2 +- tests/config/indent_var_def.cfg | 4 ++-- tests/config/issue_574.cfg | 4 ++-- tests/config/java_foreach.cfg | 2 +- tests/config/kdepim.cfg | 2 +- tests/config/kw_subst3.cfg | 4 ++-- tests/config/label_colon_nl_1.cfg | 2 +- tests/config/label_colon_nl_2.cfg | 2 +- tests/config/lambda1.cfg | 2 +- tests/config/lambda2.cfg | 2 +- tests/config/lambda3.cfg | 2 +- tests/config/libd.cfg | 2 +- tests/config/mod-paren.cfg | 4 ++-- tests/config/mod-paren2.cfg | 4 ++-- tests/config/mod_case_brace_add.cfg | 4 ++-- tests/config/mod_case_brace_rm.cfg | 4 ++-- tests/config/mod_move_case_brace.cfg | 4 ++-- tests/config/mono.cfg | 2 +- tests/config/nSolve.cfg | 4 ++-- tests/config/nepenthes.cfg | 4 ++-- tests/config/newline_after_endif.cfg | 2 +- tests/config/nl-comment.cfg | 2 +- tests/config/nl_brace_test.cfg | 4 ++-- tests/config/nl_endif.cfg | 2 +- tests/config/nl_semicolon.cfg | 2 +- tests/config/obj-c.cfg | 2 +- tests/config/pp_ret.cfg | 4 ++-- tests/config/preproc-cleanup.cfg | 2 +- tests/config/rdan.cfg | 4 ++-- tests/config/sef.cfg | 2 +- tests/config/sf.3315874.cfg | 2 +- tests/config/sf537.cfg | 2 +- tests/config/sf538.cfg | 2 +- tests/config/sf562.cfg | 2 +- tests/config/sf574.cfg | 4 ++-- tests/config/sim.cfg | 4 ++-- tests/config/sp_after_cast.cfg | 2 +- tests/config/sp_before_tr_emb_cmt-a.cfg | 4 ++-- tests/config/sp_before_tr_emb_cmt-f.cfg | 4 ++-- tests/config/sp_func_call_empty.cfg | 2 +- tests/config/var_def_gap.cfg | 2 +- tests/config/wessex.cfg | 4 ++-- tests/config/xml-str.cfg | 2 +- 109 files changed, 152 insertions(+), 152 deletions(-) diff --git a/documentation/htdocs/ben.cfg.txt b/documentation/htdocs/ben.cfg.txt index 5340906bae..97229cb0e4 100644 --- a/documentation/htdocs/ben.cfg.txt +++ b/documentation/htdocs/ben.cfg.txt @@ -104,7 +104,7 @@ align_var_struct_span = 99 align_right_cmt_span = 3 align_pp_define_span = 3 align_pp_define_gap = 4 -align_number_left = TRUE +align_number_right = TRUE align_typedef_span = 5 align_typedef_gap = 3 diff --git a/documentation/htdocs/config.txt b/documentation/htdocs/config.txt index 67c0923fc4..ea5100b646 100644 --- a/documentation/htdocs/config.txt +++ b/documentation/htdocs/config.txt @@ -1557,8 +1557,8 @@ align_with_tabs { False, True } align_on_tabstop { False, True } Whether to bump out to the next tab when aligning -align_number_left { False, True } - Whether to left-align numbers +align_number_right { False, True } + Whether to right-align numbers align_keep_extra_space { False, True } Whether to keep whitespace not required for alignment. diff --git a/documentation/htdocs/default.cfg b/documentation/htdocs/default.cfg index 0814cbf8f6..5257131d98 100644 --- a/documentation/htdocs/default.cfg +++ b/documentation/htdocs/default.cfg @@ -1558,8 +1558,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = false # false/true +# Whether to right-align numbers +align_number_right = false # false/true # Whether to keep whitespace not required for alignment. align_keep_extra_space = false # false/true diff --git a/emscripten/libUncrustify.d.ts b/emscripten/libUncrustify.d.ts index 994c9d022a..4632e30212 100644 --- a/emscripten/libUncrustify.d.ts +++ b/emscripten/libUncrustify.d.ts @@ -529,7 +529,7 @@ declare namespace LibUncrustify UO_align_keep_tabs : EmscriptenEnumTypeObject; UO_align_with_tabs : EmscriptenEnumTypeObject; UO_align_on_tabstop : EmscriptenEnumTypeObject; - UO_align_number_left : EmscriptenEnumTypeObject; + UO_align_number_right : EmscriptenEnumTypeObject; UO_align_keep_extra_space : EmscriptenEnumTypeObject; UO_align_func_params : EmscriptenEnumTypeObject; UO_align_same_func_call_params : EmscriptenEnumTypeObject; diff --git a/etc/amxmodx.cfg b/etc/amxmodx.cfg index 1aafd9b1a7..7e435971f1 100644 --- a/etc/amxmodx.cfg +++ b/etc/amxmodx.cfg @@ -120,7 +120,7 @@ align_pp_define_gap = 1 # min space between define label and value "#defi align_struct_init_span = 1 # align structure initializer values align_func_proto_span = 1 # align function prototypes -align_number_left = false # left-align numbers (not fully supported, yet) +align_number_right = false # right-align numbers (not fully supported, yet) align_typedef_span = 1 # align single-line typedefs align_typedef_gap = 1 # minimum spacing align_typedef_star_style = 1 # Start aligning style diff --git a/etc/ben.cfg b/etc/ben.cfg index 8ab511219c..111fc00bab 100644 --- a/etc/ben.cfg +++ b/etc/ben.cfg @@ -829,8 +829,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = true # false/true +# Whether to right-align numbers +align_number_right = true # false/true # Whether to keep whitespace not required for alignment. align_keep_extra_space = false # false/true diff --git a/etc/ben2.cfg b/etc/ben2.cfg index 368e25943c..36831d5c15 100644 --- a/etc/ben2.cfg +++ b/etc/ben2.cfg @@ -72,7 +72,7 @@ align_var_struct_span = 3 align_right_cmt_span = 3 align_pp_define_span = 3 align_pp_define_gap = 4 -align_number_left = TRUE +align_number_right = TRUE align_typedef_span = 5 align_typedef_gap = 3 diff --git a/etc/d.cfg b/etc/d.cfg index a744083dd9..22690c473b 100644 --- a/etc/d.cfg +++ b/etc/d.cfg @@ -72,7 +72,7 @@ align_var_struct_span = 3 align_right_cmt_span = 3 align_pp_define_span = 3 align_pp_define_gap = 4 -align_number_left = TRUE +align_number_right = TRUE align_typedef_span = 5 align_typedef_gap = 3 diff --git a/etc/defaults.cfg b/etc/defaults.cfg index 0814cbf8f6..5257131d98 100644 --- a/etc/defaults.cfg +++ b/etc/defaults.cfg @@ -1558,8 +1558,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = false # false/true +# Whether to right-align numbers +align_number_right = false # false/true # Whether to keep whitespace not required for alignment. align_keep_extra_space = false # false/true diff --git a/etc/freebsd.cfg b/etc/freebsd.cfg index 8b60d4c0ec..79aeb0f040 100644 --- a/etc/freebsd.cfg +++ b/etc/freebsd.cfg @@ -169,7 +169,7 @@ sp_endif_cmt = ignore align_keep_tabs = false align_with_tabs = true align_on_tabstop = true -align_number_left = true +align_number_right = true align_func_params = false align_same_func_call_params = false align_var_def_span = 0 diff --git a/etc/gnu-indent.cfg b/etc/gnu-indent.cfg index d61c0bec29..d4e8efeaa0 100644 --- a/etc/gnu-indent.cfg +++ b/etc/gnu-indent.cfg @@ -71,7 +71,7 @@ sp_func_proto_paren = remove # "int foo ();" vs "int foo();" # align_right_cmt_span = 3 # align_pp_define_span = 3 # align_pp_define_gap = 4 -# align_number_left = TRUE +# align_number_right = TRUE # align_typedef_span = 5 # align_typedef_gap = 3 diff --git a/etc/klaus.cfg b/etc/klaus.cfg index 235771d578..97857198d1 100644 --- a/etc/klaus.cfg +++ b/etc/klaus.cfg @@ -229,8 +229,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = true # false/true +# Whether to right-align numbers +align_number_right = true # false/true # The span for aligning variable definitions (0=don't align) align_var_def_span = 1 # number diff --git a/etc/kr-indent.cfg b/etc/kr-indent.cfg index c9c396fd8f..5eea56c303 100644 --- a/etc/kr-indent.cfg +++ b/etc/kr-indent.cfg @@ -71,7 +71,7 @@ sp_func_proto_paren = remove # "int foo ();" vs "int foo();" # align_right_cmt_span = 3 # align_pp_define_span = 3 # align_pp_define_gap = 4 -# align_number_left = TRUE +# align_number_right = TRUE # align_typedef_span = 5 # align_typedef_gap = 3 diff --git a/etc/mono.cfg b/etc/mono.cfg index edb89993fb..9987e9d692 100644 --- a/etc/mono.cfg +++ b/etc/mono.cfg @@ -75,7 +75,7 @@ sp_func_proto_paren = force # "int foo ();" vs "int foo();" # align_right_cmt_span = 3 # align_pp_define_span = 3 # align_pp_define_gap = 4 -# align_number_left = TRUE +# align_number_right = TRUE # align_typedef_span = 5 # align_typedef_gap = 3 diff --git a/etc/sun.cfg b/etc/sun.cfg index 2a0c350d71..4a9d42418c 100644 --- a/etc/sun.cfg +++ b/etc/sun.cfg @@ -831,8 +831,8 @@ align_with_tabs = true # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = true # false/true -# Whether to left-align numbers -align_number_left = true # false/true +# Whether to right-align numbers +align_number_right = true # false/true # Whether to keep whitespace not required for alignment. align_keep_extra_space = false # false/true diff --git a/etc/xsupplicant.cfg b/etc/xsupplicant.cfg index fa95a45839..45d16fa66f 100644 --- a/etc/xsupplicant.cfg +++ b/etc/xsupplicant.cfg @@ -71,7 +71,7 @@ sp_func_proto_paren = remove # "int foo ();" vs "int foo();" # align_right_cmt_span = 3 # align_pp_define_span = 3 # align_pp_define_gap = 4 -# align_number_left = TRUE +# align_number_right = TRUE # align_typedef_span = 5 # align_typedef_gap = 3 diff --git a/forUncrustifySources.cfg b/forUncrustifySources.cfg index bcbf02680b..3dbf501a5f 100644 --- a/forUncrustifySources.cfg +++ b/forUncrustifySources.cfg @@ -53,7 +53,7 @@ sp_before_dc = remove sp_after_dc = remove sp_enum_assign = force sp_enum_colon = force -align_number_left = true +align_number_right = true align_func_params = true align_var_def_span = 2 align_var_def_star_style = 1 diff --git a/src/align.cpp b/src/align.cpp index 646b2d904d..ab65ce8ff8 100644 --- a/src/align.cpp +++ b/src/align.cpp @@ -1104,7 +1104,7 @@ static void align_same_func_call_params(void) { as.resize(idx + 1); as[idx].Start(3); - if (!cpd.settings[UO_align_number_left].b) + if (!cpd.settings[UO_align_number_right].b) { if ( (chunks[idx]->type == CT_NUMBER_FP) || (chunks[idx]->type == CT_NUMBER) @@ -1848,7 +1848,7 @@ static void align_init_brace(chunk_t *start) // next->text(), cpd.al[idx].col, cpd.al[idx].len); if ( (idx < (cpd.al_cnt - 1)) - && cpd.settings[UO_align_number_left].b + && cpd.settings[UO_align_number_right].b && ( next->type == CT_NUMBER_FP || next->type == CT_NUMBER || next->type == CT_POS @@ -1872,7 +1872,7 @@ static void align_init_brace(chunk_t *start) // see if we need to right-align a number if ( (idx < (cpd.al_cnt - 1)) - && cpd.settings[UO_align_number_left].b) + && cpd.settings[UO_align_number_right].b) { next = chunk_get_next(pc); if ( next != nullptr diff --git a/src/options.cpp b/src/options.cpp index 23b3351a85..568c54547a 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -1384,8 +1384,8 @@ void register_options(void) "Whether to use tabs for aligning."); unc_add_option("align_on_tabstop", UO_align_on_tabstop, AT_BOOL, "Whether to bump out to the next tab when aligning."); - unc_add_option("align_number_left", UO_align_number_left, AT_BOOL, - "Whether to left-align numbers."); + unc_add_option("align_number_right", UO_align_number_right, AT_BOOL, + "Whether to right-align numbers."); unc_add_option("align_keep_extra_space", UO_align_keep_extra_space, AT_BOOL, "Whether to keep whitespace not required for alignment."); unc_add_option("align_func_params", UO_align_func_params, AT_BOOL, diff --git a/src/options.h b/src/options.h index 5cde3112e5..192b2c4876 100644 --- a/src/options.h +++ b/src/options.h @@ -704,7 +704,7 @@ enum uncrustify_options UO_align_keep_tabs, // keep non-indenting tabs UO_align_with_tabs, // use tabs for aligning (0/1) UO_align_on_tabstop, // always align on tabstops - UO_align_number_left, // left-align numbers (not fully supported, yet) + UO_align_number_right, // right-align numbers (not fully supported, yet) UO_align_keep_extra_space, // don't squash extra whitespace UO_align_func_params, // align prototype variable defs on variable UO_align_func_params_span, // align parameter defs in function on parameter name diff --git a/src/uncrustify_emscripten.cpp b/src/uncrustify_emscripten.cpp index 1cea220a37..76a2fbe292 100644 --- a/src/uncrustify_emscripten.cpp +++ b/src/uncrustify_emscripten.cpp @@ -1110,7 +1110,7 @@ EMSCRIPTEN_BINDINGS(MainModule) .value(STRINGIFY(UO_align_keep_tabs), UO_align_keep_tabs) .value(STRINGIFY(UO_align_with_tabs), UO_align_with_tabs) .value(STRINGIFY(UO_align_on_tabstop), UO_align_on_tabstop) - .value(STRINGIFY(UO_align_number_left), UO_align_number_left) + .value(STRINGIFY(UO_align_number_right), UO_align_number_right) .value(STRINGIFY(UO_align_keep_extra_space), UO_align_keep_extra_space) .value(STRINGIFY(UO_align_func_params), UO_align_func_params) .value(STRINGIFY(UO_align_same_func_call_params), UO_align_same_func_call_params) diff --git a/tests/cli/Output/mini_d_uc.txt b/tests/cli/Output/mini_d_uc.txt index b9d0294451..4425dcf91b 100644 --- a/tests/cli/Output/mini_d_uc.txt +++ b/tests/cli/Output/mini_d_uc.txt @@ -473,7 +473,7 @@ ls_code_width = false align_keep_tabs = false align_with_tabs = false align_on_tabstop = false -align_number_left = false +align_number_right = false align_keep_extra_space = false align_func_params = false align_func_params_span = 0 diff --git a/tests/cli/Output/mini_d_ucwd.txt b/tests/cli/Output/mini_d_ucwd.txt index b0bafecb99..60bf3e145c 100644 --- a/tests/cli/Output/mini_d_ucwd.txt +++ b/tests/cli/Output/mini_d_ucwd.txt @@ -1581,8 +1581,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning. align_on_tabstop = false # false/true -# Whether to left-align numbers. -align_number_left = false # false/true +# Whether to right-align numbers. +align_number_right = false # false/true # Whether to keep whitespace not required for alignment. align_keep_extra_space = false # false/true diff --git a/tests/cli/Output/mini_nd_uc.txt b/tests/cli/Output/mini_nd_uc.txt index 089be36fc2..8f1c6a31df 100644 --- a/tests/cli/Output/mini_nd_uc.txt +++ b/tests/cli/Output/mini_nd_uc.txt @@ -473,7 +473,7 @@ ls_code_width = false align_keep_tabs = false align_with_tabs = false align_on_tabstop = false -align_number_left = false +align_number_right = false align_keep_extra_space = false align_func_params = false align_func_params_span = 0 diff --git a/tests/cli/Output/mini_nd_ucwd.txt b/tests/cli/Output/mini_nd_ucwd.txt index ee0fc45ee7..8f54bbf889 100644 --- a/tests/cli/Output/mini_nd_ucwd.txt +++ b/tests/cli/Output/mini_nd_ucwd.txt @@ -1581,8 +1581,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning. align_on_tabstop = false # false/true -# Whether to left-align numbers. -align_number_left = false # false/true +# Whether to right-align numbers. +align_number_right = false # false/true # Whether to keep whitespace not required for alignment. align_keep_extra_space = false # false/true diff --git a/tests/cli/Output/show_config.txt b/tests/cli/Output/show_config.txt index ce7cca98aa..96d7f89e5b 100644 --- a/tests/cli/Output/show_config.txt +++ b/tests/cli/Output/show_config.txt @@ -1580,8 +1580,8 @@ align_with_tabs { False, True } align_on_tabstop { False, True } Whether to bump out to the next tab when aligning. -align_number_left { False, True } - Whether to left-align numbers. +align_number_right { False, True } + Whether to right-align numbers. align_keep_extra_space { False, True } Whether to keep whitespace not required for alignment. diff --git a/tests/config/1liner-no-split.cfg b/tests/config/1liner-no-split.cfg index 7106d58ea4..88eda4f18b 100644 --- a/tests/config/1liner-no-split.cfg +++ b/tests/config/1liner-no-split.cfg @@ -235,8 +235,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = true # false/true +# Whether to right-align numbers +align_number_right = true # false/true align_func_params = true diff --git a/tests/config/1liner-split.cfg b/tests/config/1liner-split.cfg index 2292b5d4a4..63a7e3d3dd 100644 --- a/tests/config/1liner-split.cfg +++ b/tests/config/1liner-split.cfg @@ -233,8 +233,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = true # false/true +# Whether to right-align numbers +align_number_right = true # false/true align_func_params = true diff --git a/tests/config/Uncrustify.Common-CStyle.cfg b/tests/config/Uncrustify.Common-CStyle.cfg index a35abc6866..edf3f866cc 100644 --- a/tests/config/Uncrustify.Common-CStyle.cfg +++ b/tests/config/Uncrustify.Common-CStyle.cfg @@ -863,8 +863,8 @@ align_with_tabs=false # { False, True } align_on_tabstop=false # { False, True } # Whether to bump out to the next tab when aligning # -align_number_left=false # { False, True } -# Whether to left-align numbers +align_number_right=false # { False, True } +# Whether to right-align numbers # #align_keep_extra_space { False, True } # Whether to keep whitespace not required for alignment. diff --git a/tests/config/al.cfg b/tests/config/al.cfg index f8255e9c48..a56957d735 100644 --- a/tests/config/al.cfg +++ b/tests/config/al.cfg @@ -375,8 +375,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = false # false/true +# Whether to right-align numbers +align_number_right = false # false/true # Align variable definitions in prototypes and functions align_func_params = true # false/true diff --git a/tests/config/align-1.cfg b/tests/config/align-1.cfg index 504ff6eb95..4b9becac90 100644 --- a/tests/config/align-1.cfg +++ b/tests/config/align-1.cfg @@ -81,7 +81,7 @@ align_var_struct_thresh = 16 align_right_cmt_span = 3 align_pp_define_span = 3 align_pp_define_gap = 4 -align_number_left = TRUE +align_number_right = TRUE align_typedef_span = 5 align_typedef_gap = 3 diff --git a/tests/config/align-2.cfg b/tests/config/align-2.cfg index 9e39a47949..577ed45a79 100644 --- a/tests/config/align-2.cfg +++ b/tests/config/align-2.cfg @@ -81,7 +81,7 @@ align_var_struct_thresh = 3 align_right_cmt_span = 3 align_pp_define_span = 3 align_pp_define_gap = 4 -align_number_left = TRUE +align_number_right = TRUE align_typedef_span = 5 align_typedef_gap = 3 diff --git a/tests/config/align-3.cfg b/tests/config/align-3.cfg index 884ee3d71f..94ceeb4a66 100644 --- a/tests/config/align-3.cfg +++ b/tests/config/align-3.cfg @@ -81,7 +81,7 @@ align_var_struct_thresh = 3 align_right_cmt_span = 3 align_pp_define_span = 3 align_pp_define_gap = 4 -align_number_left = TRUE +align_number_right = TRUE align_typedef_span = 5 align_typedef_gap = 3 diff --git a/tests/config/align_fcall-2.cfg b/tests/config/align_fcall-2.cfg index f738ab7154..65d849331a 100644 --- a/tests/config/align_fcall-2.cfg +++ b/tests/config/align_fcall-2.cfg @@ -1,5 +1,5 @@ align_same_func_call_params = true sp_after_comma = force -align_number_left = true +align_number_right = true diff --git a/tests/config/amxmodx.cfg b/tests/config/amxmodx.cfg index d14bd0e5a6..d1fdd1d396 100644 --- a/tests/config/amxmodx.cfg +++ b/tests/config/amxmodx.cfg @@ -121,7 +121,7 @@ align_pp_define_gap = 1 # min space between define label and value "#defi align_struct_init_span = 1 # align structure initializer values align_func_proto_span = 1 # align function prototypes -align_number_left = false # left-align numbers (not fully supported, yet) +align_number_right = false # right-align numbers (not fully supported, yet) align_typedef_span = 1 # align single-line typedefs align_typedef_gap = 1 # minimum spacing align_typedef_star_style = 1 # Start aligning style diff --git a/tests/config/avalon.cfg b/tests/config/avalon.cfg index 1bdb57ab3d..845a6b416d 100644 --- a/tests/config/avalon.cfg +++ b/tests/config/avalon.cfg @@ -209,8 +209,8 @@ align_struct_init_span = 0 # number # Align function prototypes align_func_proto_span = 0 # number -# left-align numbers -#align_number_left: bool * a little buggy * +# right-align numbers +#align_number_right: bool * a little buggy * # align single-line typedefs #align_typedef_span: number diff --git a/tests/config/avalon2.cfg b/tests/config/avalon2.cfg index f84b11f595..b990a28586 100644 --- a/tests/config/avalon2.cfg +++ b/tests/config/avalon2.cfg @@ -212,8 +212,8 @@ align_struct_init_span = 0 # number # Align function prototypes align_func_proto_span = 0 # number -# left-align numbers -#align_number_left: bool * a little buggy * +# right-align numbers +#align_number_right: bool * a little buggy * # align single-line typedefs #align_typedef_span: number diff --git a/tests/config/avalon3.cfg b/tests/config/avalon3.cfg index 8ba05c966d..c5a84c133e 100644 --- a/tests/config/avalon3.cfg +++ b/tests/config/avalon3.cfg @@ -232,8 +232,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = false # false/true +# Whether to right-align numbers +align_number_right = false # false/true # The span for aligning variable definitions (0=don't align) align_var_def_span = 0 # number diff --git a/tests/config/avalon4.cfg b/tests/config/avalon4.cfg index 89d01d9650..a18cda75f3 100644 --- a/tests/config/avalon4.cfg +++ b/tests/config/avalon4.cfg @@ -296,8 +296,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = false # false/true +# Whether to right-align numbers +align_number_right = false # false/true # Align variable definitions in prototypes and functions align_func_params = false # false/true diff --git a/tests/config/ben.cfg b/tests/config/ben.cfg index 3c988ad984..a797d7dacb 100644 --- a/tests/config/ben.cfg +++ b/tests/config/ben.cfg @@ -89,7 +89,7 @@ sp_getset_brace = ignore align_keep_tabs = false align_with_tabs = false align_on_tabstop = false -align_number_left = true +align_number_right = true align_asm_colon = true align_func_params = true align_var_def_span = 2 diff --git a/tests/config/ben2.cfg b/tests/config/ben2.cfg index 48bfec52ad..1788500778 100644 --- a/tests/config/ben2.cfg +++ b/tests/config/ben2.cfg @@ -187,7 +187,7 @@ sp_after_new = ignore align_keep_tabs = false align_with_tabs = false align_on_tabstop = false -align_number_left = true +align_number_right = true align_func_params = true align_same_func_call_params = false align_var_def_span = 2 diff --git a/tests/config/bug_340.cfg b/tests/config/bug_340.cfg index 269a5d6dd2..53e935230a 100644 --- a/tests/config/bug_340.cfg +++ b/tests/config/bug_340.cfg @@ -593,8 +593,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = false # false/true +# Whether to right-align numbers +align_number_right = false # false/true # Align variable definitions in prototypes and functions align_func_params = false # false/true diff --git a/tests/config/bug_489.cfg b/tests/config/bug_489.cfg index aa2597d450..d3201a6ea9 100644 --- a/tests/config/bug_489.cfg +++ b/tests/config/bug_489.cfg @@ -27,7 +27,7 @@ sp_balance_nested_parens=false align_keep_tabs=false align_with_tabs=false align_on_tabstop=false -align_number_left=false +align_number_right=false align_func_params=false align_same_func_call_params=false align_var_def_colon=false diff --git a/tests/config/bug_631.cfg b/tests/config/bug_631.cfg index 649d96d0ab..41d48ab0a3 100644 --- a/tests/config/bug_631.cfg +++ b/tests/config/bug_631.cfg @@ -3,7 +3,7 @@ align_keep_tabs=false align_left_shift=true align_mix_var_proto=false align_nl_cont=true -align_number_left=false +align_number_right=false align_on_operator=false align_on_tabstop=false align_right_cmt_mix=false diff --git a/tests/config/bug_657.cfg b/tests/config/bug_657.cfg index 5f41ce52a5..50f8ed5903 100644 --- a/tests/config/bug_657.cfg +++ b/tests/config/bug_657.cfg @@ -3,7 +3,7 @@ align_assign_thresh=12 align_enum_equ_span=16 align_func_params=true align_nl_cont=true -align_number_left=true +align_number_right=true align_pp_define_gap=4 align_pp_define_span=3 align_right_cmt_span=3 diff --git a/tests/config/bug_664.cfg b/tests/config/bug_664.cfg index 07828c5607..135398adf3 100644 --- a/tests/config/bug_664.cfg +++ b/tests/config/bug_664.cfg @@ -35,7 +35,7 @@ sp_balance_nested_parens=false align_keep_tabs=false align_with_tabs=false align_on_tabstop=false -align_number_left=false +align_number_right=false align_func_params=false align_same_func_call_params=false align_var_def_colon=false diff --git a/tests/config/bug_670.cfg b/tests/config/bug_670.cfg index e199e8e501..10bda77bb1 100644 --- a/tests/config/bug_670.cfg +++ b/tests/config/bug_670.cfg @@ -57,7 +57,7 @@ sp_cmt_cpp_qttr=false align_keep_tabs=false align_with_tabs=false align_on_tabstop=false -align_number_left=false +align_number_right=false align_keep_extra_space=false align_func_params=true align_same_func_call_params=false diff --git a/tests/config/bug_671.cfg b/tests/config/bug_671.cfg index ec5f379260..7d63244bd1 100644 --- a/tests/config/bug_671.cfg +++ b/tests/config/bug_671.cfg @@ -784,8 +784,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = false # false/true +# Whether to right-align numbers +align_number_right = false # false/true # Whether to keep whitespace not required for alignment. align_keep_extra_space = false # false/true diff --git a/tests/config/cast-sp-a.cfg b/tests/config/cast-sp-a.cfg index a9efca3563..46b2050c41 100644 --- a/tests/config/cast-sp-a.cfg +++ b/tests/config/cast-sp-a.cfg @@ -85,7 +85,7 @@ sp_getset_brace = ignore align_keep_tabs = false align_with_tabs = false align_on_tabstop = false -align_number_left = true +align_number_right = true align_func_params = true align_var_def_span = 2 align_var_def_star_style = 1 diff --git a/tests/config/cast-sp-r.cfg b/tests/config/cast-sp-r.cfg index 948b6b9cb8..68ba6b26c7 100644 --- a/tests/config/cast-sp-r.cfg +++ b/tests/config/cast-sp-r.cfg @@ -85,7 +85,7 @@ sp_getset_brace = ignore align_keep_tabs = false align_with_tabs = false align_on_tabstop = false -align_number_left = true +align_number_right = true align_func_params = true align_var_def_span = 2 align_var_def_star_style = 1 diff --git a/tests/config/cast-type.cfg b/tests/config/cast-type.cfg index bf473fe03e..0f29b95883 100644 --- a/tests/config/cast-type.cfg +++ b/tests/config/cast-type.cfg @@ -85,7 +85,7 @@ sp_getset_brace = ignore align_keep_tabs = false align_with_tabs = false align_on_tabstop = false -align_number_left = true +align_number_right = true align_func_params = true align_var_def_span = 2 align_var_def_star_style = 1 diff --git a/tests/config/cgal.cfg b/tests/config/cgal.cfg index 5613a3578b..aeaf551eaf 100644 --- a/tests/config/cgal.cfg +++ b/tests/config/cgal.cfg @@ -87,7 +87,7 @@ sp_getset_brace = ignore align_keep_tabs = false align_with_tabs = false align_on_tabstop = false -align_number_left = true +align_number_right = true align_func_params = true align_var_def_span = 2 align_var_def_star_style = 1 diff --git a/tests/config/clark.cfg b/tests/config/clark.cfg index fcc2df4e96..20c2996bf3 100644 --- a/tests/config/clark.cfg +++ b/tests/config/clark.cfg @@ -223,8 +223,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = false # false/true +# Whether to right-align numbers +align_number_right = false # false/true # The span for aligning variable definitions (0=don't align) align_var_def_span = 0 # number diff --git a/tests/config/cu.cfg b/tests/config/cu.cfg index cd2d818e19..dfd94dca65 100644 --- a/tests/config/cu.cfg +++ b/tests/config/cu.cfg @@ -106,7 +106,7 @@ align_on_tabstop = true align_keep_tabs = true align_with_tabs = false align_on_tabstop = false -align_number_left = true +align_number_right = true align_func_params = true #align_same_func_call_params = true align_var_def_span = 0 diff --git a/tests/config/d-tst2.cfg b/tests/config/d-tst2.cfg index 1bac86b53a..8bc2baaf51 100644 --- a/tests/config/d-tst2.cfg +++ b/tests/config/d-tst2.cfg @@ -88,7 +88,7 @@ align_var_struct_span = 99 align_right_cmt_span = 3 align_pp_define_span = 3 align_pp_define_gap = 4 -align_number_left = TRUE +align_number_right = TRUE align_typedef_span = 5 align_typedef_gap = 3 diff --git a/tests/config/d.cfg b/tests/config/d.cfg index fb8245e886..866becec73 100644 --- a/tests/config/d.cfg +++ b/tests/config/d.cfg @@ -86,7 +86,7 @@ align_var_struct_span = 3 align_right_cmt_span = 3 align_pp_define_span = 3 align_pp_define_gap = 4 -align_number_left = TRUE +align_number_right = TRUE align_typedef_span = 5 align_typedef_gap = 3 align_typedef_star_style = 1 diff --git a/tests/config/d2.cfg b/tests/config/d2.cfg index 7d70aee249..1a0f2e8ee6 100644 --- a/tests/config/d2.cfg +++ b/tests/config/d2.cfg @@ -95,7 +95,7 @@ align_var_struct_span = 99 align_right_cmt_span = 3 align_pp_define_span = 3 align_pp_define_gap = 4 -align_number_left = TRUE +align_number_right = TRUE align_typedef_span = 5 align_typedef_gap = 3 diff --git a/tests/config/d3.cfg b/tests/config/d3.cfg index 939dbbc5e2..2730362bd4 100644 --- a/tests/config/d3.cfg +++ b/tests/config/d3.cfg @@ -78,7 +78,7 @@ align_var_struct_span = 3 align_right_cmt_span = 3 align_pp_define_span = 3 align_pp_define_gap = 4 -align_number_left = TRUE +align_number_right = TRUE align_typedef_span = 5 align_typedef_gap = 3 align_typedef_star_style = 1 diff --git a/tests/config/d3a.cfg b/tests/config/d3a.cfg index 4bb6a90f65..f315fb9e29 100644 --- a/tests/config/d3a.cfg +++ b/tests/config/d3a.cfg @@ -78,7 +78,7 @@ align_var_struct_span = 3 align_right_cmt_span = 3 align_pp_define_span = 3 align_pp_define_gap = 4 -align_number_left = TRUE +align_number_right = TRUE align_typedef_span = 5 align_typedef_gap = 3 align_typedef_star_style = 1 diff --git a/tests/config/doxy-comment-no.cfg b/tests/config/doxy-comment-no.cfg index b4b7c6af8b..2331a784cd 100644 --- a/tests/config/doxy-comment-no.cfg +++ b/tests/config/doxy-comment-no.cfg @@ -245,7 +245,7 @@ sp_annotation_paren = ignore align_keep_tabs = false align_with_tabs = false align_on_tabstop = true -align_number_left = false +align_number_right = false align_keep_extra_space = false align_func_params = true align_same_func_call_params = false diff --git a/tests/config/doxy-comment-yes.cfg b/tests/config/doxy-comment-yes.cfg index 312ab537e3..75bcb63137 100644 --- a/tests/config/doxy-comment-yes.cfg +++ b/tests/config/doxy-comment-yes.cfg @@ -245,7 +245,7 @@ sp_annotation_paren = ignore align_keep_tabs = false align_with_tabs = false align_on_tabstop = true -align_number_left = false +align_number_right = false align_keep_extra_space = false align_func_params = true align_same_func_call_params = false diff --git a/tests/config/freebsd.cfg b/tests/config/freebsd.cfg index 3053d2b4c9..7b8e362025 100644 --- a/tests/config/freebsd.cfg +++ b/tests/config/freebsd.cfg @@ -564,8 +564,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = true # false/true +# Whether to right-align numbers +align_number_right = true # false/true # Align variable definitions in prototypes and functions align_func_params = true # false/true diff --git a/tests/config/func_call_user.cfg b/tests/config/func_call_user.cfg index 7b9dd95822..5328c5b7a3 100644 --- a/tests/config/func_call_user.cfg +++ b/tests/config/func_call_user.cfg @@ -378,8 +378,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = false # false/true +# Whether to right-align numbers +align_number_right = false # false/true # Align variable definitions in prototypes and functions align_func_params = true # false/true diff --git a/tests/config/ger.cfg b/tests/config/ger.cfg index 7c9885f336..0788d793ba 100644 --- a/tests/config/ger.cfg +++ b/tests/config/ger.cfg @@ -159,7 +159,7 @@ sp_cmt_cpp_start = add align_keep_tabs = false align_with_tabs = false align_on_tabstop = false -align_number_left = false +align_number_right = false align_func_params = false align_same_func_call_params = false align_var_def_span = 3 diff --git a/tests/config/getset.cfg b/tests/config/getset.cfg index bf07098356..ab3956c887 100644 --- a/tests/config/getset.cfg +++ b/tests/config/getset.cfg @@ -75,7 +75,7 @@ align_var_def_star_style = 1 # align_right_cmt_span = 3 # align_pp_define_span = 3 # align_pp_define_gap = 4 -# align_number_left = TRUE +# align_number_right = TRUE # align_typedef_span = 5 # align_typedef_gap = 3 diff --git a/tests/config/indent-vbrace.cfg b/tests/config/indent-vbrace.cfg index 4be4b61638..be8abaa5d8 100644 --- a/tests/config/indent-vbrace.cfg +++ b/tests/config/indent-vbrace.cfg @@ -244,7 +244,7 @@ sp_annotation_paren = ignore align_keep_tabs = false align_with_tabs = false align_on_tabstop = false -align_number_left = false +align_number_right = false align_keep_extra_space = false align_func_params = true align_same_func_call_params = false diff --git a/tests/config/indent_braces_no.cfg b/tests/config/indent_braces_no.cfg index 0a39aa3ebe..8a7e78ff7f 100644 --- a/tests/config/indent_braces_no.cfg +++ b/tests/config/indent_braces_no.cfg @@ -29,7 +29,7 @@ sp_balance_nested_parens=false align_keep_tabs=false align_with_tabs=false align_on_tabstop=false -align_number_left=false +align_number_right=false align_func_params=false align_same_func_call_params=false align_var_def_colon=false diff --git a/tests/config/indent_var_def.cfg b/tests/config/indent_var_def.cfg index 18f4d57de3..6c3c888cb4 100644 --- a/tests/config/indent_var_def.cfg +++ b/tests/config/indent_var_def.cfg @@ -484,8 +484,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = true # false/true +# Whether to right-align numbers +align_number_right = true # false/true # Align variable definitions in prototypes and functions align_func_params = true # false/true diff --git a/tests/config/issue_574.cfg b/tests/config/issue_574.cfg index 06c4b48505..1e678acbb4 100644 --- a/tests/config/issue_574.cfg +++ b/tests/config/issue_574.cfg @@ -734,8 +734,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = false # false/true +# Whether to right-align numbers +align_number_right = false # false/true # Whether to keep whitespace not required for alignment. align_keep_extra_space = false # false/true diff --git a/tests/config/java_foreach.cfg b/tests/config/java_foreach.cfg index 1b4d9f3431..ca791b7adb 100644 --- a/tests/config/java_foreach.cfg +++ b/tests/config/java_foreach.cfg @@ -35,7 +35,7 @@ sp_balance_nested_parens=false align_keep_tabs=false align_with_tabs=false align_on_tabstop=false -align_number_left=false +align_number_right=false align_func_params=true align_same_func_call_params=false align_var_def_colon=false diff --git a/tests/config/kdepim.cfg b/tests/config/kdepim.cfg index 3b075d860e..7dad49ef1c 100644 --- a/tests/config/kdepim.cfg +++ b/tests/config/kdepim.cfg @@ -238,7 +238,7 @@ sp_annotation_paren=remove align_keep_tabs=false align_with_tabs=false align_on_tabstop=false -align_number_left=false +align_number_right=false align_keep_extra_space=false align_func_params=false align_same_func_call_params=false diff --git a/tests/config/kw_subst3.cfg b/tests/config/kw_subst3.cfg index c46b2964bb..cefd764e45 100644 --- a/tests/config/kw_subst3.cfg +++ b/tests/config/kw_subst3.cfg @@ -396,8 +396,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = false # false/true +# Whether to right-align numbers +align_number_right = false # false/true # Align variable definitions in prototypes and functions align_func_params = false # false/true diff --git a/tests/config/label_colon_nl_1.cfg b/tests/config/label_colon_nl_1.cfg index fd8f077eb8..67ee339922 100644 --- a/tests/config/label_colon_nl_1.cfg +++ b/tests/config/label_colon_nl_1.cfg @@ -13,7 +13,7 @@ align_var_struct_thresh = 16 align_right_cmt_span = 3 align_pp_define_span = 3 align_pp_define_gap = 4 -align_number_left = TRUE +align_number_right = TRUE align_typedef_span = 5 align_typedef_gap = 3 nl_before_case = TRUE diff --git a/tests/config/label_colon_nl_2.cfg b/tests/config/label_colon_nl_2.cfg index 067318bda6..5575864034 100644 --- a/tests/config/label_colon_nl_2.cfg +++ b/tests/config/label_colon_nl_2.cfg @@ -13,7 +13,7 @@ align_var_struct_thresh = 16 align_right_cmt_span = 3 align_pp_define_span = 3 align_pp_define_gap = 4 -align_number_left = TRUE +align_number_right = TRUE align_typedef_span = 5 align_typedef_gap = 3 nl_before_case = TRUE diff --git a/tests/config/lambda1.cfg b/tests/config/lambda1.cfg index 2a03ef9aac..42240ba583 100644 --- a/tests/config/lambda1.cfg +++ b/tests/config/lambda1.cfg @@ -87,7 +87,7 @@ sp_getset_brace = ignore align_keep_tabs = false align_with_tabs = false align_on_tabstop = false -align_number_left = true +align_number_right = true align_func_params = true align_var_def_span = 2 align_var_def_star_style = 1 diff --git a/tests/config/lambda2.cfg b/tests/config/lambda2.cfg index a1204e5eb0..fdd55b85d1 100644 --- a/tests/config/lambda2.cfg +++ b/tests/config/lambda2.cfg @@ -87,7 +87,7 @@ sp_getset_brace = ignore align_keep_tabs = false align_with_tabs = false align_on_tabstop = false -align_number_left = true +align_number_right = true align_func_params = true align_var_def_span = 2 align_var_def_star_style = 1 diff --git a/tests/config/lambda3.cfg b/tests/config/lambda3.cfg index 166c89e4a3..cb0cfbdd70 100644 --- a/tests/config/lambda3.cfg +++ b/tests/config/lambda3.cfg @@ -88,7 +88,7 @@ sp_getset_brace = ignore align_keep_tabs = false align_with_tabs = false align_on_tabstop = false -align_number_left = true +align_number_right = true align_func_params = true align_var_def_span = 2 align_var_def_star_style = 1 diff --git a/tests/config/libd.cfg b/tests/config/libd.cfg index 16c5f97465..662818d9af 100644 --- a/tests/config/libd.cfg +++ b/tests/config/libd.cfg @@ -37,7 +37,7 @@ sp_balance_nested_parens=false align_keep_tabs=false align_with_tabs=false align_on_tabstop=false -align_number_left=false +align_number_right=false align_func_params=false align_same_func_call_params=false align_var_def_colon=false diff --git a/tests/config/mod-paren.cfg b/tests/config/mod-paren.cfg index 0c7cfeafde..d62f9f8695 100644 --- a/tests/config/mod-paren.cfg +++ b/tests/config/mod-paren.cfg @@ -233,8 +233,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = true # false/true +# Whether to right-align numbers +align_number_right = true # false/true align_func_params = true diff --git a/tests/config/mod-paren2.cfg b/tests/config/mod-paren2.cfg index e186dc910b..e04715786d 100644 --- a/tests/config/mod-paren2.cfg +++ b/tests/config/mod-paren2.cfg @@ -235,8 +235,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = true # false/true +# Whether to right-align numbers +align_number_right = true # false/true align_func_params = true diff --git a/tests/config/mod_case_brace_add.cfg b/tests/config/mod_case_brace_add.cfg index ef4eba3329..ac412e7317 100644 --- a/tests/config/mod_case_brace_add.cfg +++ b/tests/config/mod_case_brace_add.cfg @@ -521,8 +521,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = true # false/true +# Whether to right-align numbers +align_number_right = true # false/true # Align variable definitions in prototypes and functions align_func_params = true # false/true diff --git a/tests/config/mod_case_brace_rm.cfg b/tests/config/mod_case_brace_rm.cfg index 2adeaf558a..190a7fa536 100644 --- a/tests/config/mod_case_brace_rm.cfg +++ b/tests/config/mod_case_brace_rm.cfg @@ -521,8 +521,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = true # false/true +# Whether to right-align numbers +align_number_right = true # false/true # Align variable definitions in prototypes and functions align_func_params = true # false/true diff --git a/tests/config/mod_move_case_brace.cfg b/tests/config/mod_move_case_brace.cfg index 3cb30dced5..46d52604b1 100644 --- a/tests/config/mod_move_case_brace.cfg +++ b/tests/config/mod_move_case_brace.cfg @@ -521,8 +521,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = true # false/true +# Whether to right-align numbers +align_number_right = true # false/true # Align variable definitions in prototypes and functions align_func_params = true # false/true diff --git a/tests/config/mono.cfg b/tests/config/mono.cfg index bd16f04b4b..c7f13b3777 100644 --- a/tests/config/mono.cfg +++ b/tests/config/mono.cfg @@ -76,7 +76,7 @@ align_var_def_star_style = 1 # align_right_cmt_span = 3 # align_pp_define_span = 3 # align_pp_define_gap = 4 -# align_number_left = TRUE +# align_number_right = TRUE # align_typedef_span = 5 # align_typedef_gap = 3 diff --git a/tests/config/nSolve.cfg b/tests/config/nSolve.cfg index cb34a0302b..afa170eeb8 100644 --- a/tests/config/nSolve.cfg +++ b/tests/config/nSolve.cfg @@ -601,8 +601,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = false # false/true +# Whether to right-align numbers +align_number_right = false # false/true # Align variable definitions in prototypes and functions align_func_params = false # false/true diff --git a/tests/config/nepenthes.cfg b/tests/config/nepenthes.cfg index 840d3c23bb..4376fa548a 100644 --- a/tests/config/nepenthes.cfg +++ b/tests/config/nepenthes.cfg @@ -549,8 +549,8 @@ align_with_tabs = true # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = false # false/true +# Whether to right-align numbers +align_number_right = false # false/true # Align variable definitions in prototypes and functions align_func_params = false # false/true diff --git a/tests/config/newline_after_endif.cfg b/tests/config/newline_after_endif.cfg index 177ecea7fd..e9bb5faa52 100644 --- a/tests/config/newline_after_endif.cfg +++ b/tests/config/newline_after_endif.cfg @@ -1,7 +1,7 @@ align_func_params=true align_keep_tabs=false align_nl_cont=false -align_number_left=false +align_number_right=false align_on_tabstop=false align_right_cmt_mix=false align_var_def_colon=false diff --git a/tests/config/nl-comment.cfg b/tests/config/nl-comment.cfg index 0e2130a404..c8366a0361 100644 --- a/tests/config/nl-comment.cfg +++ b/tests/config/nl-comment.cfg @@ -85,7 +85,7 @@ align_var_struct_span = 3 align_right_cmt_span = 3 align_pp_define_span = 3 align_pp_define_gap = 4 -align_number_left = TRUE +align_number_right = TRUE align_typedef_span = 5 align_typedef_gap = 3 diff --git a/tests/config/nl_brace_test.cfg b/tests/config/nl_brace_test.cfg index d47425ffa0..d4daa35059 100644 --- a/tests/config/nl_brace_test.cfg +++ b/tests/config/nl_brace_test.cfg @@ -499,8 +499,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = false # false/true +# Whether to right-align numbers +align_number_right = false # false/true # Align variable definitions in prototypes and functions align_func_params = true # false/true diff --git a/tests/config/nl_endif.cfg b/tests/config/nl_endif.cfg index 177ecea7fd..e9bb5faa52 100644 --- a/tests/config/nl_endif.cfg +++ b/tests/config/nl_endif.cfg @@ -1,7 +1,7 @@ align_func_params=true align_keep_tabs=false align_nl_cont=false -align_number_left=false +align_number_right=false align_on_tabstop=false align_right_cmt_mix=false align_var_def_colon=false diff --git a/tests/config/nl_semicolon.cfg b/tests/config/nl_semicolon.cfg index 22978fa2cd..333f5410cc 100644 --- a/tests/config/nl_semicolon.cfg +++ b/tests/config/nl_semicolon.cfg @@ -85,7 +85,7 @@ align_var_struct_span = 3 align_right_cmt_span = 3 align_pp_define_span = 3 align_pp_define_gap = 4 -align_number_left = TRUE +align_number_right = TRUE align_typedef_span = 5 align_typedef_gap = 3 diff --git a/tests/config/obj-c.cfg b/tests/config/obj-c.cfg index 4ed63f3ced..ea6bf3a92a 100644 --- a/tests/config/obj-c.cfg +++ b/tests/config/obj-c.cfg @@ -93,7 +93,7 @@ sp_getset_brace = ignore align_keep_tabs = false align_with_tabs = false align_on_tabstop = false -align_number_left = true +align_number_right = true align_func_params = true align_var_def_span = 2 align_var_def_star_style = 1 diff --git a/tests/config/pp_ret.cfg b/tests/config/pp_ret.cfg index 2c70622974..75f988f018 100644 --- a/tests/config/pp_ret.cfg +++ b/tests/config/pp_ret.cfg @@ -322,8 +322,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = false # false/true +# Whether to right-align numbers +align_number_right = false # false/true # Align variable definitions in prototypes and functions align_func_params = false # false/true diff --git a/tests/config/preproc-cleanup.cfg b/tests/config/preproc-cleanup.cfg index aaaab5b2ad..20bbeec439 100644 --- a/tests/config/preproc-cleanup.cfg +++ b/tests/config/preproc-cleanup.cfg @@ -109,7 +109,7 @@ align_var_struct_span = 99 align_right_cmt_span = 3 align_pp_define_span = 3 align_pp_define_gap = 4 -align_number_left = TRUE +align_number_right = TRUE align_typedef_span = 5 align_typedef_gap = 3 diff --git a/tests/config/rdan.cfg b/tests/config/rdan.cfg index fd98f64100..02d001aa5e 100644 --- a/tests/config/rdan.cfg +++ b/tests/config/rdan.cfg @@ -568,8 +568,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = true # false/true +# Whether to right-align numbers +align_number_right = true # false/true # Align variable definitions in prototypes and functions align_func_params = true # false/true diff --git a/tests/config/sef.cfg b/tests/config/sef.cfg index dae1097699..d457175d6b 100644 --- a/tests/config/sef.cfg +++ b/tests/config/sef.cfg @@ -104,7 +104,7 @@ sp_deref = remove align_keep_tabs = false align_with_tabs = true align_on_tabstop = true -align_number_left = false +align_number_right = false align_func_params = false align_var_def_span = 0 align_var_def_star_style = 0 diff --git a/tests/config/sf.3315874.cfg b/tests/config/sf.3315874.cfg index 71862111b4..14ac73be91 100644 --- a/tests/config/sf.3315874.cfg +++ b/tests/config/sf.3315874.cfg @@ -239,7 +239,7 @@ align_right_cmt_gap = 1 # number align_pp_define_span = 3 align_pp_define_gap = 4 -align_number_left = TRUE +align_number_right = TRUE align_typedef_span = 5 align_typedef_gap = 3 align_func_params = true diff --git a/tests/config/sf537.cfg b/tests/config/sf537.cfg index c6e902b375..b7be172170 100644 --- a/tests/config/sf537.cfg +++ b/tests/config/sf537.cfg @@ -35,7 +35,7 @@ sp_balance_nested_parens=false align_keep_tabs=false align_with_tabs=false align_on_tabstop=false -align_number_left=false +align_number_right=false align_func_params=false align_same_func_call_params=false align_var_def_colon=false diff --git a/tests/config/sf538.cfg b/tests/config/sf538.cfg index 2c1d62127b..0671408b43 100644 --- a/tests/config/sf538.cfg +++ b/tests/config/sf538.cfg @@ -35,7 +35,7 @@ sp_balance_nested_parens=false align_keep_tabs=false align_with_tabs=false align_on_tabstop=false -align_number_left=false +align_number_right=false align_func_params=false align_same_func_call_params=false align_var_def_colon=false diff --git a/tests/config/sf562.cfg b/tests/config/sf562.cfg index 0506b72694..ba06b17e0c 100644 --- a/tests/config/sf562.cfg +++ b/tests/config/sf562.cfg @@ -51,7 +51,7 @@ sp_balance_nested_parens=false align_keep_tabs=false align_with_tabs=false align_on_tabstop=false -align_number_left=false +align_number_right=false align_func_params=false align_same_func_call_params=false align_var_def_colon=false diff --git a/tests/config/sf574.cfg b/tests/config/sf574.cfg index 763aced010..8c7b5502a9 100644 --- a/tests/config/sf574.cfg +++ b/tests/config/sf574.cfg @@ -769,8 +769,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = false # false/true +# Whether to right-align numbers +align_number_right = false # false/true # Whether to keep whitespace not required for alignment. align_keep_extra_space = false # false/true diff --git a/tests/config/sim.cfg b/tests/config/sim.cfg index 9cf6bfe941..7896e39013 100644 --- a/tests/config/sim.cfg +++ b/tests/config/sim.cfg @@ -296,8 +296,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = false # false/true +# Whether to right-align numbers +align_number_right = false # false/true # Align variable definitions in prototypes and functions align_func_params = false # false/true diff --git a/tests/config/sp_after_cast.cfg b/tests/config/sp_after_cast.cfg index c6f85cd5ec..efe36a74f4 100644 --- a/tests/config/sp_after_cast.cfg +++ b/tests/config/sp_after_cast.cfg @@ -85,7 +85,7 @@ sp_getset_brace = ignore align_keep_tabs = false align_with_tabs = false align_on_tabstop = false -align_number_left = true +align_number_right = true align_func_params = true align_var_def_span = 2 align_var_def_star_style = 1 diff --git a/tests/config/sp_before_tr_emb_cmt-a.cfg b/tests/config/sp_before_tr_emb_cmt-a.cfg index 8d5fa67f7e..6c18eb6e73 100644 --- a/tests/config/sp_before_tr_emb_cmt-a.cfg +++ b/tests/config/sp_before_tr_emb_cmt-a.cfg @@ -546,8 +546,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = false # false/true +# Whether to right-align numbers +align_number_right = false # false/true # Align variable definitions in prototypes and functions align_func_params = false # false/true diff --git a/tests/config/sp_before_tr_emb_cmt-f.cfg b/tests/config/sp_before_tr_emb_cmt-f.cfg index 5d08a510cd..908228eb3e 100644 --- a/tests/config/sp_before_tr_emb_cmt-f.cfg +++ b/tests/config/sp_before_tr_emb_cmt-f.cfg @@ -546,8 +546,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = false # false/true +# Whether to right-align numbers +align_number_right = false # false/true # Align variable definitions in prototypes and functions align_func_params = false # false/true diff --git a/tests/config/sp_func_call_empty.cfg b/tests/config/sp_func_call_empty.cfg index 2e77d1b7c5..b34dbc6adc 100644 --- a/tests/config/sp_func_call_empty.cfg +++ b/tests/config/sp_func_call_empty.cfg @@ -88,7 +88,7 @@ sp_getset_brace = ignore align_keep_tabs = false align_with_tabs = false align_on_tabstop = false -align_number_left = true +align_number_right = true align_func_params = true align_var_def_span = 2 align_var_def_star_style = 1 diff --git a/tests/config/var_def_gap.cfg b/tests/config/var_def_gap.cfg index e3f12a2137..6edd9c29b7 100644 --- a/tests/config/var_def_gap.cfg +++ b/tests/config/var_def_gap.cfg @@ -12,7 +12,7 @@ sp_before_byref = remove # align_pp_define_span = 3 # align_pp_define_gap = 3 -align_number_left = true +align_number_right = true align_assign_span = 1 diff --git a/tests/config/wessex.cfg b/tests/config/wessex.cfg index cb56ba80ae..e490f7ee69 100644 --- a/tests/config/wessex.cfg +++ b/tests/config/wessex.cfg @@ -296,8 +296,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = true # false/true +# Whether to right-align numbers +align_number_right = true # false/true # Align variable definitions in prototypes and functions align_func_params = true # false/true diff --git a/tests/config/xml-str.cfg b/tests/config/xml-str.cfg index 1cba3643ca..0b9fad45c5 100644 --- a/tests/config/xml-str.cfg +++ b/tests/config/xml-str.cfg @@ -82,7 +82,7 @@ align_var_struct_span = 3 align_right_cmt_span = 3 align_pp_define_span = 3 align_pp_define_gap = 4 -align_number_left = TRUE +align_number_right = TRUE align_typedef_span = 5 align_typedef_gap = 3 From a6d0063946a3ae2a34c4be1f5e81c5b2f9c8c5ab Mon Sep 17 00:00:00 2001 From: Ethan Gao Date: Thu, 26 Oct 2017 18:02:20 +0800 Subject: [PATCH 050/136] * Fix out-of-bounds write The following code merely checks length greater than 200: if (length > BUFFERLENGTH) that means the length may equal to 200. so it will overrun array "buf" of 200 bytes at byte offset 200 for the following code when length is 200 and results in unexpected issue: memcpy(buf, fmt, length); buf[length] = 0; Signed-off-by: Ethan Gao --- src/logger.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/logger.cpp b/src/logger.cpp index b381e81b5a..f6a08dd6e7 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -216,7 +216,7 @@ void log_fmt(log_sev_t sev, const char *fmt, ...) char buf[BUFFERLENGTH]; // it MUST be a 'unsigned int' variable to be runable under windows unsigned int length = strlen(fmt); - if (length > BUFFERLENGTH) + if (length >= BUFFERLENGTH) { fprintf(stderr, "FATAL: The variable 'buf' is not big enought:\n"); fprintf(stderr, " it should be bigger as = %u\n", length); From bc41097ef6ce395a8cf312cc14c0830213d614be Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Thu, 26 Oct 2017 19:52:37 +0100 Subject: [PATCH 051/136] hide compilation warning in gcc < v5 (fixes #1098) The warning is a bug in gcc itself, per https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55805, so hiding it prevents people using older versions of GCC from assuming there's an issue with uncrustify, as happened in https://github.com/uncrustify/uncrustify/issues/1098. --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c605e0ee5..22c59a7630 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,6 +41,9 @@ elseif(CMAKE_COMPILER_IS_GNUCXX) endif() unset(flag_var) endforeach() + if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-field-initializers") + endif() unset(gcc_warning_flags) elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_definitions(-std=gnu++0x) From ad4890ed198a901f01c4d5ddefceadf1e69ffd16 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Fri, 27 Oct 2017 00:51:23 +0200 Subject: [PATCH 052/136] add UO_sp_arith_additive --- src/options.cpp | 2 ++ src/options.h | 1 + src/space.cpp | 22 ++++++++++++++++++++ tests/cli/Output/help.txt | 2 +- tests/cli/Output/mini_d_uc.txt | 1 + tests/cli/Output/mini_d_ucwd.txt | 3 +++ tests/cli/Output/mini_nd_uc.txt | 1 + tests/cli/Output/mini_nd_ucwd.txt | 3 +++ tests/cli/Output/show_config.txt | 3 +++ tests/config/sp_arith_additive-f.cfg | 3 +++ tests/config/sp_arith_additive-r.cfg | 3 +++ tests/cpp.test | 3 +++ tests/input/cpp/sp_arith_additive.cpp | 2 ++ tests/output/cpp/34194-sp_arith_additive.cpp | 2 ++ tests/output/cpp/34195-sp_arith_additive.cpp | 2 ++ 15 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 tests/config/sp_arith_additive-f.cfg create mode 100644 tests/config/sp_arith_additive-r.cfg create mode 100644 tests/input/cpp/sp_arith_additive.cpp create mode 100644 tests/output/cpp/34194-sp_arith_additive.cpp create mode 100644 tests/output/cpp/34195-sp_arith_additive.cpp diff --git a/src/options.cpp b/src/options.cpp index 23b3351a85..3775cf174d 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -314,6 +314,8 @@ void register_options(void) unc_add_option("sp_arith", UO_sp_arith, AT_IARF, "Add or remove space around arithmetic operator '+', '-', '/', '*', etc\n" "also '>>>' '<<' '>>' '%' '|'."); + unc_add_option("sp_arith_additive", UO_sp_arith_additive, AT_IARF, + "Add or remove space around arithmetic operator '+' and '-'. Overrides sp_arith"); unc_add_option("sp_assign", UO_sp_assign, AT_IARF, "Add or remove space around assignment operator '=', '+=', etc."); unc_add_option("sp_cpp_lambda_assign", UO_sp_cpp_lambda_assign, AT_IARF, diff --git a/src/options.h b/src/options.h index 5cde3112e5..57d6eea8af 100644 --- a/src/options.h +++ b/src/options.h @@ -149,6 +149,7 @@ enum uncrustify_options // group: UG_space, "Spacing options" 1 UO_sp_arith, // space around + - / * etc // also ">>>" "<<" ">>" "%" "|" + UO_sp_arith_additive, // space around + or - UO_sp_assign, // space around =, +=, etc UO_sp_cpp_lambda_assign, // space around the capture spec [=](...){...} UO_sp_cpp_lambda_paren, // space after the capture spec [] (...){...} diff --git a/src/space.cpp b/src/space.cpp index f6ca8d5945..8ded04918e 100644 --- a/src/space.cpp +++ b/src/space.cpp @@ -1246,6 +1246,17 @@ static argval_t do_space(chunk_t *first, chunk_t *second, int &min_sp, bool comp // Arith after a cast comes first if (second->type == CT_ARITH || second->type == CT_CARET) { + if (cpd.settings[UO_sp_arith_additive].a != AV_IGNORE) + { + auto arith_char = (first->type == CT_ARITH || first->type == CT_CARET) + ? first->str[0] : second->str[0]; + if (arith_char == '+' || arith_char == '-') + { + log_rule("sp_arith_additive"); + return(cpd.settings[UO_sp_arith_additive].a); + } + } + log_rule("sp_arith"); return(cpd.settings[UO_sp_arith].a); } @@ -1496,6 +1507,17 @@ static argval_t do_space(chunk_t *first, chunk_t *second, int &min_sp, bool comp || second->type == CT_ARITH || second->type == CT_CARET) { + if (cpd.settings[UO_sp_arith_additive].a != AV_IGNORE) + { + auto arith_char = (first->type == CT_ARITH || first->type == CT_CARET) + ? first->str[0] : second->str[0]; + if (arith_char == '+' || arith_char == '-') + { + log_rule("sp_arith_additive"); + return(cpd.settings[UO_sp_arith_additive].a); + } + } + log_rule("sp_arith"); return(cpd.settings[UO_sp_arith].a); } diff --git a/tests/cli/Output/help.txt b/tests/cli/Output/help.txt index 02b888c0ba..20b94e9860 100644 --- a/tests/cli/Output/help.txt +++ b/tests/cli/Output/help.txt @@ -69,6 +69,6 @@ Note: Use comments containing ' *INDENT-OFF*' and ' *INDENT-ON*' to disable processing of parts of the source file (these can be overridden with enable_processing_cmt and disable_processing_cmt). -There are currently 607 options and minimal documentation. +There are currently 608 options and minimal documentation. Try UniversalIndentGUI and good luck. diff --git a/tests/cli/Output/mini_d_uc.txt b/tests/cli/Output/mini_d_uc.txt index b9d0294451..d6fd1af0cc 100644 --- a/tests/cli/Output/mini_d_uc.txt +++ b/tests/cli/Output/mini_d_uc.txt @@ -13,6 +13,7 @@ utf8_bom = ignore utf8_byte = false utf8_force = false sp_arith = ignore +sp_arith_additive = ignore sp_assign = ignore sp_cpp_lambda_assign = ignore sp_cpp_lambda_paren = ignore diff --git a/tests/cli/Output/mini_d_ucwd.txt b/tests/cli/Output/mini_d_ucwd.txt index b0bafecb99..8406eb2808 100644 --- a/tests/cli/Output/mini_d_ucwd.txt +++ b/tests/cli/Output/mini_d_ucwd.txt @@ -53,6 +53,9 @@ utf8_force = false # false/true # also '>>>' '<<' '>>' '%' '|'. sp_arith = ignore # ignore/add/remove/force +# Add or remove space around arithmetic operator '+' and '-'. Overrides sp_arith +sp_arith_additive = ignore # ignore/add/remove/force + # Add or remove space around assignment operator '=', '+=', etc. sp_assign = ignore # ignore/add/remove/force diff --git a/tests/cli/Output/mini_nd_uc.txt b/tests/cli/Output/mini_nd_uc.txt index 089be36fc2..b48a105f27 100644 --- a/tests/cli/Output/mini_nd_uc.txt +++ b/tests/cli/Output/mini_nd_uc.txt @@ -13,6 +13,7 @@ utf8_bom = ignore utf8_byte = false utf8_force = false sp_arith = ignore +sp_arith_additive = ignore sp_assign = ignore sp_cpp_lambda_assign = ignore sp_cpp_lambda_paren = ignore diff --git a/tests/cli/Output/mini_nd_ucwd.txt b/tests/cli/Output/mini_nd_ucwd.txt index ee0fc45ee7..a5cb5c960e 100644 --- a/tests/cli/Output/mini_nd_ucwd.txt +++ b/tests/cli/Output/mini_nd_ucwd.txt @@ -53,6 +53,9 @@ utf8_force = false # false/true # also '>>>' '<<' '>>' '%' '|'. sp_arith = ignore # ignore/add/remove/force +# Add or remove space around arithmetic operator '+' and '-'. Overrides sp_arith +sp_arith_additive = ignore # ignore/add/remove/force + # Add or remove space around assignment operator '=', '+=', etc. sp_assign = ignore # ignore/add/remove/force diff --git a/tests/cli/Output/show_config.txt b/tests/cli/Output/show_config.txt index ce7cca98aa..e8ded8f28c 100644 --- a/tests/cli/Output/show_config.txt +++ b/tests/cli/Output/show_config.txt @@ -52,6 +52,9 @@ sp_arith { Ignore, Add, Remove, Force } Add or remove space around arithmetic operator '+', '-', '/', '*', etc also '>>>' '<<' '>>' '%' '|'. +sp_arith_additive { Ignore, Add, Remove, Force } + Add or remove space around arithmetic operator '+' and '-'. Overrides sp_arith + sp_assign { Ignore, Add, Remove, Force } Add or remove space around assignment operator '=', '+=', etc. diff --git a/tests/config/sp_arith_additive-f.cfg b/tests/config/sp_arith_additive-f.cfg new file mode 100644 index 0000000000..8e6f05854d --- /dev/null +++ b/tests/config/sp_arith_additive-f.cfg @@ -0,0 +1,3 @@ +# sp_arith_additive overwrites sp_arith +sp_arith = remove +sp_arith_additive = force \ No newline at end of file diff --git a/tests/config/sp_arith_additive-r.cfg b/tests/config/sp_arith_additive-r.cfg new file mode 100644 index 0000000000..e01e86f704 --- /dev/null +++ b/tests/config/sp_arith_additive-r.cfg @@ -0,0 +1,3 @@ +# sp_arith_additive overwrites sp_arith +sp_arith = force +sp_arith_additive = remove \ No newline at end of file diff --git a/tests/cpp.test b/tests/cpp.test index bffea9c135..e1fbca5634 100644 --- a/tests/cpp.test +++ b/tests/cpp.test @@ -496,3 +496,6 @@ 34191 empty.cfg cpp/comment-align-multiline.cpp 34192 mod_remove_extra_semicolon-t.cfg cpp/i1207.cpp 34193 code_width-25.cfg cpp/i1218.cpp + +34194 sp_arith_additive-f.cfg cpp/sp_arith_additive.cpp +34195 sp_arith_additive-r.cfg cpp/sp_arith_additive.cpp diff --git a/tests/input/cpp/sp_arith_additive.cpp b/tests/input/cpp/sp_arith_additive.cpp new file mode 100644 index 0000000000..ab2096c8c0 --- /dev/null +++ b/tests/input/cpp/sp_arith_additive.cpp @@ -0,0 +1,2 @@ +int i = 0 + 3 - 4 * 3 % 3; +int ii = 0+3-4*3%3; \ No newline at end of file diff --git a/tests/output/cpp/34194-sp_arith_additive.cpp b/tests/output/cpp/34194-sp_arith_additive.cpp new file mode 100644 index 0000000000..5ecb2ec809 --- /dev/null +++ b/tests/output/cpp/34194-sp_arith_additive.cpp @@ -0,0 +1,2 @@ +int i = 0 + 3 - 4*3%3; +int ii = 0 + 3 - 4*3%3; \ No newline at end of file diff --git a/tests/output/cpp/34195-sp_arith_additive.cpp b/tests/output/cpp/34195-sp_arith_additive.cpp new file mode 100644 index 0000000000..f419a3ed31 --- /dev/null +++ b/tests/output/cpp/34195-sp_arith_additive.cpp @@ -0,0 +1,2 @@ +int i = 0+3-4 * 3 % 3; +int ii = 0+3-4 * 3 % 3; \ No newline at end of file From e26b44fcc0a840d7bfa87492099706b2741804fd Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Fri, 27 Oct 2017 11:22:39 +0100 Subject: [PATCH 053/136] fix typos: ident --> ident --- documentation/htdocs/index.html | 2 +- documentation/htdocs/uncrustify.html | 2 +- src/indent.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/documentation/htdocs/index.html b/documentation/htdocs/index.html index 6afb8459c2..dd7b813aa8 100644 --- a/documentation/htdocs/index.html +++ b/documentation/htdocs/index.html @@ -44,7 +44,7 @@

Introduction

Features

    -
  • Ident code, aligning on parens, assignments, etc
    • +
  • Indent code, aligning on parens, assignments, etc
  • Align on '=' and variable definitions
  • Align structure initializers
  • Align #define stuff
    • diff --git a/documentation/htdocs/uncrustify.html b/documentation/htdocs/uncrustify.html index 48c93bf133..0528eb63c3 100644 --- a/documentation/htdocs/uncrustify.html +++ b/documentation/htdocs/uncrustify.html @@ -12,7 +12,7 @@

    Uncrustify Uncrustify 0.0.3

    What it does:
      -
    • Ident code +
    • Indent code
    • Align code on '=' and variable definitions
    • Align #define stuff
    • Align backslash-newline stuff diff --git a/src/indent.cpp b/src/indent.cpp index 477515c624..96570ba66a 100644 --- a/src/indent.cpp +++ b/src/indent.cpp @@ -2432,8 +2432,8 @@ void indent_text(void) } else { - bool use_ident = true; - size_t ttidx = frm.pse_tos; + bool use_indent = true; + size_t ttidx = frm.pse_tos; if (ttidx > 0) { //if (strcasecmp(get_token_name(frm.pse[ttidx].pc->parent_type), "FUNC_CALL") == 0) @@ -2447,13 +2447,13 @@ void indent_text(void) else { LOG_FMT(LINDPC, "use is false [%d]\n", __LINE__); - use_ident = false; + use_indent = false; } } } if (pc->column != indent_column) { - if (use_ident && pc->type != CT_PP_IGNORE) // Leave indentation alone for PP_IGNORE tokens + if (use_indent && pc->type != CT_PP_IGNORE) // Leave indentation alone for PP_IGNORE tokens { LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, indent set to %zu, for '%s'\n", __func__, __LINE__, pc->orig_line, indent_column, pc->text()); From 7f6c64ea24f0af8565c4b43e0ec203dc24e990bf Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Fri, 27 Oct 2017 11:29:11 +0100 Subject: [PATCH 054/136] =?UTF-8?q?distinguish=20=E2=80=98ident=E2=80=99?= =?UTF-8?q?=20from=20=E2=80=98identifier=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/pclint/co-gcc.lnt | 2 +- tests/input/cpp/gh555.cpp | 2 +- tests/input/d/Lexer.d | 16 ++++++++-------- tests/output/cpp/33090-gh555.cpp | 2 +- tests/output/d/40006-Lexer.d | 20 ++++++++++---------- tests/output/d/40007-Lexer.d | 20 ++++++++++---------- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/scripts/pclint/co-gcc.lnt b/scripts/pclint/co-gcc.lnt index 05b5bba474..575aa14e5c 100644 --- a/scripts/pclint/co-gcc.lnt +++ b/scripts/pclint/co-gcc.lnt @@ -93,7 +93,7 @@ // ========================================================= // +rw and -d options to cope with GNU syntax: -+ppw(ident) // Tolerate #ident ++ppw(ident) // Tolerate #ident keyword definitions for SCCS/RCS +ppw(warning) // GCC provides alternative spellings of certain keywords: diff --git a/tests/input/cpp/gh555.cpp b/tests/input/cpp/gh555.cpp index 852d4ce492..feb059d33c 100644 --- a/tests/input/cpp/gh555.cpp +++ b/tests/input/cpp/gh555.cpp @@ -4,5 +4,5 @@ class \u005FClass // underscore character int main() { - string IdentContainingTwoUCNCharacters\u1234\U00001234 = "\u005FClass"; + string IdentifierContainingTwoUCNCharacters\u1234\U00001234 = "\u005FClass"; } diff --git a/tests/input/d/Lexer.d b/tests/input/d/Lexer.d index cbbd6fd1ea..004d9d8a7e 100644 --- a/tests/input/d/Lexer.d +++ b/tests/input/d/Lexer.d @@ -353,7 +353,7 @@ class Lexer case 'r': // debug writefln( " wysiwyg" ); if( p[1] != '"') - goto case_ident; + goto case_identifier; p++; case '`': t.value = wysiwygStringConstant(t, *p); @@ -362,7 +362,7 @@ class Lexer case 'x': // debug writefln( " hex string" ); if( p[1] != '"') - goto case_ident; + goto case_identifier; p++; t.value = hexStringConstant(t); return; @@ -409,7 +409,7 @@ class Lexer case 'U': case 'V': case 'W': case 'X': case 'Y': case 'Z': case '_': - case_ident: + case_identifier: { // debug writefln( " identifier" ); ubyte c; @@ -435,7 +435,7 @@ class Lexer stringtable[tmp] = id; } - t.ident = id; + t.identifier = id; t.value = cast(TOK) id.value; anyToken = 1; @@ -467,7 +467,7 @@ class Lexer if( loc.filename.length ) t.ustring = loc.filename; else - t.ustring = mod.ident.toChars(); + t.ustring = mod.identifier.toChars(); goto Llen; } else if( mod && id == Id.LINE ) @@ -952,7 +952,7 @@ class Lexer uint u = decodeUTF(); // Check for start of unicode identifier if( isUniAlpha(u) ) - goto case_ident; + goto case_identifier; if( u == PS || u == LS ) { @@ -2035,7 +2035,7 @@ class Lexer scan(&tok); - if( tok.value != TOK.TOKidentifier || tok.ident != Id.line ) + if( tok.value != TOK.TOKidentifier || tok.identifier != Id.line ) goto Lerr; scan(&tok); @@ -2076,7 +2076,7 @@ class Lexer if( mod && memcmp(p, cast(char*)"__FILE__", 8) == 0) { p += 8; -//! filespec = mem.strdup(loc.filename ? loc.filename : mod.ident.toChars()); +//! filespec = mem.strdup(loc.filename ? loc.filename : mod.identifier.toChars()); } continue; diff --git a/tests/output/cpp/33090-gh555.cpp b/tests/output/cpp/33090-gh555.cpp index 99e8838ccf..32147190e2 100644 --- a/tests/output/cpp/33090-gh555.cpp +++ b/tests/output/cpp/33090-gh555.cpp @@ -4,5 +4,5 @@ class \u005FClass // underscore character int main() { - string IdentContainingTwoUCNCharacters\u1234\U00001234 = "\u005FClass"; + string IdentifierContainingTwoUCNCharacters\u1234\U00001234 = "\u005FClass"; } diff --git a/tests/output/d/40006-Lexer.d b/tests/output/d/40006-Lexer.d index 415d3390e1..4a70f0ca73 100644 --- a/tests/output/d/40006-Lexer.d +++ b/tests/output/d/40006-Lexer.d @@ -361,7 +361,7 @@ class Lexer case 'r': // debug writefln( " wysiwyg" ); if (p[1] != '"') - goto case_ident; + goto case_identifier; p++; case '`': @@ -371,7 +371,7 @@ class Lexer case 'x': // debug writefln( " hex string" ); if (p[1] != '"') - goto case_ident; + goto case_identifier; p++; t.value = hexStringConstant(t); return; @@ -454,7 +454,7 @@ class Lexer case 'Y': case 'Z': case '_': - case_ident: + case_identifier: { // debug writefln( " identifier" ); ubyte c; @@ -480,9 +480,9 @@ class Lexer stringtable[tmp] = id; } - t.ident = id; - t.value = cast(TOK)id.value; - anyToken = 1; + t.identifier = id; + t.value = cast(TOK)id.value; + anyToken = 1; // if special identifier token if (*t.ptr == '_') @@ -512,7 +512,7 @@ class Lexer if (loc.filename.length) t.ustring = loc.filename; else - t.ustring = mod.ident.toChars(); + t.ustring = mod.identifier.toChars(); goto Llen; } else if (mod && id == Id.LINE) @@ -1048,7 +1048,7 @@ class Lexer uint u = decodeUTF(); // Check for start of unicode identifier if (isUniAlpha(u)) - goto case_ident; + goto case_identifier; if (u == PS || u == LS) { @@ -2161,7 +2161,7 @@ class Lexer scan(&tok); - if (tok.value != TOK.TOKidentifier || tok.ident != Id.line) + if (tok.value != TOK.TOKidentifier || tok.identifier != Id.line) goto Lerr; scan(&tok); @@ -2203,7 +2203,7 @@ class Lexer if (mod && memcmp(p, cast(char *)"__FILE__", 8) == 0) { p += 8; -//! filespec = mem.strdup(loc.filename ? loc.filename : mod.ident.toChars()); +//! filespec = mem.strdup(loc.filename ? loc.filename : mod.identifier.toChars()); } continue; diff --git a/tests/output/d/40007-Lexer.d b/tests/output/d/40007-Lexer.d index bda00c6f6f..a3cfc23685 100644 --- a/tests/output/d/40007-Lexer.d +++ b/tests/output/d/40007-Lexer.d @@ -346,7 +346,7 @@ class Lexer case 'r': // debug writefln( " wysiwyg" ); if (p[1] != '"') { - goto case_ident; + goto case_identifier; } p++; @@ -357,7 +357,7 @@ class Lexer case 'x': // debug writefln( " hex string" ); if (p[1] != '"') { - goto case_ident; + goto case_identifier; } p++; t.value = hexStringConstant(t); @@ -440,7 +440,7 @@ class Lexer case 'Y': case 'Z': case '_': -case_ident: +case_identifier: { // debug writefln( " identifier" ); ubyte c; @@ -463,9 +463,9 @@ case_ident: stringtable[tmp] = id; } - t.ident = id; - t.value = cast(TOK)id.value; - anyToken = 1; + t.identifier = id; + t.value = cast(TOK)id.value; + anyToken = 1; // if special identifier token if (*t.ptr == '_') { @@ -493,7 +493,7 @@ case_ident: t.ustring = loc.filename; } else { - t.ustring = mod.ident.toChars(); + t.ustring = mod.identifier.toChars(); } goto Llen; } @@ -1001,7 +1001,7 @@ Llen: uint u = decodeUTF(); // Check for start of unicode identifier if (isUniAlpha(u)) { - goto case_ident; + goto case_identifier; } if (u == PS || u == LS) { @@ -2104,7 +2104,7 @@ done: scan(&tok); - if (tok.value != TOK.TOKidentifier || tok.ident != Id.line) { + if (tok.value != TOK.TOKidentifier || tok.identifier != Id.line) { goto Lerr; } @@ -2146,7 +2146,7 @@ Lnewline: case '_': if (mod && memcmp(p, cast(char*)"__FILE__", 8) == 0) { p += 8; -//! filespec = mem.strdup(loc.filename ? loc.filename : mod.ident.toChars()); +//! filespec = mem.strdup(loc.filename ? loc.filename : mod.identifier.toChars()); } continue; From b97a67af12483e9c5fa9b91903f61d2e50ee4dc1 Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Fri, 27 Oct 2017 11:30:08 +0100 Subject: [PATCH 055/136] fix alignment in co-gcc.lnt --- scripts/pclint/co-gcc.lnt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/pclint/co-gcc.lnt b/scripts/pclint/co-gcc.lnt index 575aa14e5c..f7bd38dd5e 100644 --- a/scripts/pclint/co-gcc.lnt +++ b/scripts/pclint/co-gcc.lnt @@ -78,10 +78,10 @@ // Begin: System Dependent Options // ------------------------------- --a#machine(i386) // #assert's machine(i386) (SVR4 facility). -+fdi // Use the directory of the including file --si4 // size of int --sp4 // size of pointer +-a#machine(i386) // #assert's machine(i386) (SVR4 facility). ++fdi // Use the directory of the including file +-si4 // size of int +-sp4 // size of pointer // ----------------------------- // End: System Dependent Options From f77f54de83b9243be9b79774152c3dc4254c3e60 Mon Sep 17 00:00:00 2001 From: Joergen Ibsen Date: Tue, 31 Oct 2017 14:26:56 +0100 Subject: [PATCH 056/136] Support multiple MSVC versions on AppVeyor --- appveyor.yml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 1c7dd0d52b..6cb558108b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,8 +2,13 @@ version: "{build}" platform: x64 environment: matrix: - - CONFIG: Debug - - CONFIG: Release + # MSVC + - GENERATOR: Visual Studio 15 2017 Win64 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + - GENERATOR: Visual Studio 14 2015 Win64 +configuration: + - Debug + - Release clone_folder: C:\projects\uncrustify branches: only: @@ -16,17 +21,15 @@ skip_tags: true install: - "SET PATH=C:/Python35-x64;C:/Python35-x64/Scripts;%PATH%" -build_script: - - echo Running CMake... +before_build: - cd c:\projects\uncrustify - mkdir build - cd build - - cmake -G "Visual Studio 14 2015 Win64" .. - - set MSBuildLogger="C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" - - set MSBuildOptions=/v:m /p:Configuration=%CONFIG% /logger:%MSBuildLogger% - - msbuild %MSBuildOptions% uncrustify.sln + - cmake -DCMAKE_BUILD_TYPE=%CONFIGURATION% -G "%GENERATOR%" .. +build_script: + - cmake --build . --config %CONFIGURATION% test_script: # - echo This is for test only # - C:/projects/uncrustify/build/Debug/uncrustify.exe -c C:/projects/uncrustify/tests/config/mono.cfg -f C:/projects/uncrustify/tests/input/cs/simple.cs -L 66 - - ctest -C %CONFIG% -V + - ctest -C %CONFIGURATION% -V deploy: off From 81ce3ff37dca0ef7d4d637ace444a3782a9673bc Mon Sep 17 00:00:00 2001 From: Viktor Kireev Date: Sun, 29 Oct 2017 16:59:59 +0300 Subject: [PATCH 057/136] Add CT_BRACED_INIT_LIST for C++ 'braced-init-list' Quick fix for a 'braced-init-list'. Added examples for a 'braced-init-list'. --- src/combine.cpp | 43 +++-- src/newlines.cpp | 7 +- src/space.cpp | 6 +- src/token_enum.h | 1 + tests/cpp.test | 3 +- tests/input/cpp/braced_init_list.cpp | 226 +++++++++++++++++++++++++++ 6 files changed, 266 insertions(+), 20 deletions(-) create mode 100644 tests/input/cpp/braced_init_list.cpp diff --git a/src/combine.cpp b/src/combine.cpp index fe0fa906e1..502f47b603 100644 --- a/src/combine.cpp +++ b/src/combine.cpp @@ -1375,26 +1375,39 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next) if ((cpd.lang_flags & LANG_CPP) != 0) { - // check for type initializer list: auto a = ... int{0}; - if (pc->type == CT_WORD || pc->type == CT_TYPE) + // Detect a braced-init-list + if ( pc->type == CT_WORD + || pc->type == CT_TYPE + || pc->type == CT_ASSIGN + || pc->type == CT_COMMA + || pc->type == CT_ANGLE_CLOSE + || pc->type == CT_SQUARE_CLOSE + || pc->type == CT_TSQUARE + || ( pc->type == CT_BRACE_OPEN + && ( pc->parent_type == CT_NONE + || pc->parent_type == CT_BRACED_INIT_LIST))) { auto brace_open = chunk_get_next_ncnl(pc); if ( brace_open != nullptr && brace_open->type == CT_BRACE_OPEN - && brace_open->parent_type != CT_STRUCT - && brace_open->parent_type != CT_ENUM - && brace_open->parent_type != CT_CLASS - && brace_open->parent_type != CT_NAMESPACE - && brace_open->parent_type != CT_FUNC_DEF // guard arrow return type - && brace_open->parent_type != CT_FUNC_PROTO // --||-- - && brace_open->parent_type != CT_CPP_LAMBDA) // --||-- + && ( brace_open->parent_type == CT_NONE + || brace_open->parent_type == CT_ASSIGN + || brace_open->parent_type == CT_BRACED_INIT_LIST)) { auto brace_close = chunk_skip_to_match(next); if (brace_close != nullptr && brace_close->type == CT_BRACE_CLOSE) { - pc->type = CT_TYPE; - brace_close->parent_type = CT_TYPE; - brace_open->parent_type = CT_TYPE; + set_chunk_parent(brace_open, CT_BRACED_INIT_LIST); + set_chunk_parent(brace_close, CT_BRACED_INIT_LIST); + + // TODO: Change pc->type CT_WORD -> CT_TYPE + // for the case CT_ASSIGN (and others). + + // TODO: Move this block to the fix_fcn_call_args function. + if (pc->type == CT_WORD && (pc->flags & PCF_IN_FCN_CALL)) + { + set_chunk_type(pc, CT_TYPE); + } } } } @@ -3455,6 +3468,12 @@ static chunk_t *fix_var_def(chunk_t *start) return(nullptr); } + if ( cs.Len() == 1 + && end->type == CT_BRACE_OPEN && end->parent_type == CT_BRACED_INIT_LIST) + { + set_chunk_type(cs.Get(0)->m_pc, CT_TYPE); + } + // Function defs are handled elsewhere if ( (cs.Len() <= 1) || end->type == CT_FUNC_DEF diff --git a/src/newlines.cpp b/src/newlines.cpp index d0ffd8bc89..37051ca750 100644 --- a/src/newlines.cpp +++ b/src/newlines.cpp @@ -2805,7 +2805,7 @@ void newlines_cleanup_braces(bool first) break; } - case CT_TYPE: + case CT_BRACED_INIT_LIST: { newline_iarf_pair(chunk_get_prev_nnl(pc), pc, cpd.settings[UO_nl_type_brace_init_lst].a); break; @@ -2851,8 +2851,7 @@ void newlines_cleanup_braces(bool first) next = chunk_get_next_ncnl(pc); // Handle unnamed temporary direct-list-initialization - if ( pc->parent_type == CT_TYPE - && cpd.settings[UO_nl_type_brace_init_lst_open].a != AV_IGNORE) + if (pc->parent_type == CT_BRACED_INIT_LIST) { newline_iarf_pair(pc, chunk_get_next_nnl(pc), cpd.settings[UO_nl_type_brace_init_lst_open].a); @@ -2932,7 +2931,7 @@ void newlines_cleanup_braces(bool first) } // newline before a close brace - if ( pc->parent_type == CT_TYPE + if ( pc->parent_type == CT_BRACED_INIT_LIST && cpd.settings[UO_nl_type_brace_init_lst_close].a != AV_IGNORE) { // Handle unnamed temporary direct-list-initialization diff --git a/src/space.cpp b/src/space.cpp index f6ca8d5945..579844de04 100644 --- a/src/space.cpp +++ b/src/space.cpp @@ -1058,7 +1058,7 @@ static argval_t do_space(chunk_t *first, chunk_t *second, int &min_sp, bool comp return(cpd.settings[UO_sp_inside_braces_empty].a); } - if (second->type == CT_BRACE_OPEN && second->parent_type == CT_TYPE) + if (second->type == CT_BRACE_OPEN && second->parent_type == CT_BRACED_INIT_LIST) { // 'int{9}' vs 'int {9}' return(cpd.settings[UO_sp_type_brace_init_lst].a); @@ -1076,7 +1076,7 @@ static argval_t do_space(chunk_t *first, chunk_t *second, int &min_sp, bool comp log_rule("sp_inside_braces_struct"); return(cpd.settings[UO_sp_inside_braces_struct].a); } - if (second->parent_type == CT_TYPE) + if (second->parent_type == CT_BRACED_INIT_LIST) { if (cpd.settings[UO_sp_before_type_brace_init_lst_close].a != AV_IGNORE) { @@ -1667,7 +1667,7 @@ static argval_t do_space(chunk_t *first, chunk_t *second, int &min_sp, bool comp log_rule("sp_inside_braces_struct"); return(cpd.settings[UO_sp_inside_braces_struct].a); } - if (first->parent_type == CT_TYPE) + if (first->parent_type == CT_BRACED_INIT_LIST) { if (cpd.settings[UO_sp_after_type_brace_init_lst_open].a != AV_IGNORE) { diff --git a/src/token_enum.h b/src/token_enum.h index b5722580d3..1bb4006d76 100644 --- a/src/token_enum.h +++ b/src/token_enum.h @@ -153,6 +153,7 @@ enum c_token_t CT_THROW, CT_NOEXCEPT, CT_TRY, + CT_BRACED_INIT_LIST, CT_USING, CT_USING_STMT, // using (xxx) ... CT_D_WITH, // D: paren+braced diff --git a/tests/cpp.test b/tests/cpp.test index bffea9c135..2b8b404e16 100644 --- a/tests/cpp.test +++ b/tests/cpp.test @@ -161,7 +161,8 @@ 30301 al.cfg cpp/enum_class.h 30302 bug_1315.cfg cpp/bug_1315.cpp -# TODO find a better example for 30310, 30311 +# TODO: Make a tests for a braced_init_list. See also 34153-34166. +#30310 sp_word_brace_force.cfg cpp/braced_init_list.cpp #30310 sp_word_brace_force.cfg cpp/uniform_initialization.cpp #30311 sp_word_brace_remove.cfg cpp/uniform_initialization.cpp diff --git a/tests/input/cpp/braced_init_list.cpp b/tests/input/cpp/braced_init_list.cpp new file mode 100644 index 0000000000..469b5dce69 --- /dev/null +++ b/tests/input/cpp/braced_init_list.cpp @@ -0,0 +1,226 @@ +#include +#include + +using some_type = int; +namespace Ns { +using some_type = int; +} + +class BracedInitListBase { +public: +virtual int getA() const { + return a; +} +private: +int a{}; +int b{1}; +int c = {1}; +int d = int{1}; +some_type e{1}; +some_type f = {1}; +some_type g = some_type{1}; +std::vector h{some_type{4}, 5}; +::std::vector i = ::std::vector{4, some_type{5}}; +some_type j = ::std::vector{4, some_type{5}}[1]; +some_type k[2]{1, 2}; +some_type l[2] = {1, 2}; + +union SomeUnion { +int a; +some_type b{}; +}; +}; + +class BracedInitListDerived : public BracedInitListBase { +public: +int getA() const override { + return BracedInitListBase::getA(); +} +}; + +some_type inc(some_type a) +{ + return some_type{++a}; +} + +some_type sum(some_type a, some_type b = some_type{1}) +{ + return a + inc(some_type{b - some_type{1}}); +} + +void braced_init_list_int() +{ + { + int a{}; + int b = {}; + int c = int{}; + int d = int{int{}}; + int{}; + int{int{}}; + } + { + int a{1}; + int b = {1}; + int c = int{1}; + int d = int{int{1}}; + int{1}; + int{int{1}}; + } +} + +void braced_init_list_some_type() +{ + { + some_type a{}; + some_type b = {}; + some_type c = some_type{}; + some_type d = some_type{some_type{}}; + some_type{}; + some_type{some_type{}}; + } + { + some_type a{1}; + some_type b = {1}; + some_type c = some_type{1}; + some_type d = some_type{some_type{1}}; + some_type{1}; + some_type{some_type{1}}; + } + { + ::some_type a{1}; + ::some_type b = {1}; + ::some_type c = ::some_type{1}; + ::some_type d = ::some_type{::some_type{1}}; + ::some_type{1}; + ::some_type{::some_type{1}}; + } + { + Ns::some_type a{1}; + Ns::some_type b = {1}; + Ns::some_type c = Ns::some_type{1}; + Ns::some_type d = Ns::some_type{Ns::some_type{1}}; + Ns::some_type{1}; + Ns::some_type{Ns::some_type{1}}; + } + { + ::Ns::some_type a{1}; + ::Ns::some_type b = {1}; + ::Ns::some_type c = ::Ns::some_type{1}; + ::Ns::some_type d = ::Ns::some_type{::Ns::some_type{1}}; + ::Ns::some_type{1}; + ::Ns::some_type{::Ns::some_type{1}}; + } +} + +void braced_init_list_some_type_auto() +{ + { + auto b = some_type{}; + auto c = some_type{some_type{}}; + } + { + auto a = {1}; + auto b = some_type{1}; + auto c = some_type{some_type{1}}; + } + { + auto b = ::some_type{1}; + auto c = ::some_type{::some_type{1}}; + } + { + auto b = Ns::some_type{1}; + auto c = Ns::some_type{Ns::some_type{1}}; + } + { + auto b = ::Ns::some_type{1}; + auto c = ::Ns::some_type{::Ns::some_type{1}}; + } +} + +void braced_init_list_function_call() +{ + { + some_type a{sum(some_type{}, some_type{})}; + some_type b = sum(some_type{}, some_type{}); + some_type c = some_type{sum(some_type{}, some_type{})}; + some_type{sum(some_type{}, some_type{})}; + some_type{some_type{sum(some_type{}, some_type{})}}; + } + { + some_type a{sum(some_type{1}, some_type{1})}; + some_type b = sum(some_type{1}, some_type{1}); + some_type c = some_type{sum(some_type{1}, some_type{1})}; + some_type{sum(some_type{a}, some_type{b})}; + some_type{some_type{sum(some_type{a}, some_type{b})}}; + } + { + ::some_type a{sum(::some_type{1}, ::some_type{1})}; + ::some_type b = sum(::some_type{1}, ::some_type{1}); + ::some_type c = ::some_type{sum(::some_type{1}, ::some_type{1})}; + ::some_type{sum(::some_type{a}, ::some_type{b})}; + ::some_type{::some_type{sum(::some_type{a}, ::some_type{b})}}; + } + { + Ns::some_type a{sum(Ns::some_type{1}, Ns::some_type{1})}; + Ns::some_type b = sum(Ns::some_type{1}, Ns::some_type{1}); + Ns::some_type c = Ns::some_type{sum(Ns::some_type{1}, Ns::some_type{1})}; + Ns::some_type{sum(Ns::some_type{a}, Ns::some_type{b})}; + Ns::some_type{Ns::some_type{sum(Ns::some_type{a}, Ns::some_type{b})}}; + } + { + ::Ns::some_type a{sum(::Ns::some_type{1}, ::Ns::some_type{1})}; + ::Ns::some_type b = sum(::Ns::some_type{1}, ::Ns::some_type{1}); + ::Ns::some_type c = ::Ns::some_type{sum(::Ns::some_type{1}, ::Ns::some_type{1})}; + ::Ns::some_type{sum(::Ns::some_type{a}, ::Ns::some_type{b})}; + ::Ns::some_type{::Ns::some_type{sum(::Ns::some_type{a}, ::Ns::some_type{b})}}; + } +} + +void braced_init_list_array() +{ + { + some_type a[]{}; + some_type b[] = {}; + some_type c[] = {{}, {}}; + } + { + some_type a[]{1, 2}; + some_type b[] = {1, 2}; + some_type c[] = {some_type{1}, some_type{2}}; + } +} + +void braced_init_list_template() +{ + { + std::vector a{}; + std::vector b = {}; + std::vector c = {{}, {}}; + std::vector d = std::vector{}; + std::vector e = std::vector{{}, {}}; + std::vector f = std::vector{some_type{}, some_type{}}; + std::vector{}; + std::vector{{}, {}}; + std::vector{some_type{}, some_type{}}; + } + { + std::vector a{1, 2}; + std::vector b = {1, 2}; + std::vector c = std::vector{1, 2}; + std::vector d = std::vector{some_type{1}, some_type{2}}; + std::vector{1, 2}; + std::vector{some_type{1}, some_type{2}}; + } +} + +void braced_init_list_lambda() +{ + std::vector a{1, 2}; + some_type b{2}; + + auto c = []{return true;}; + auto d = [](){return true;}; + + std::find_if(a.begin(), a.end(), [&b](const some_type &v){return v == b;}); + std::find_if(a.begin(), a.end(), [](const some_type &v){some_type b{2}; return v == b;}); +} From 76ff9be8158cbb10d92ef22290e64ab7cb58ab8d Mon Sep 17 00:00:00 2001 From: Viktor Kireev Date: Wed, 1 Nov 2017 02:33:09 +0300 Subject: [PATCH 058/136] Fix the double indentation with C++ 'using' Fixes the issue #1318. --- src/indent.cpp | 2 +- tests/output/cpp/30211-indent_comment_align_thresh.cpp | 6 +++--- tests/output/cpp/30212-indent_comment_align_thresh.cpp | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/indent.cpp b/src/indent.cpp index 477515c624..3e96110238 100644 --- a/src/indent.cpp +++ b/src/indent.cpp @@ -1901,7 +1901,7 @@ void indent_text(void) } else if ( pc->type == CT_ASSIGN || pc->type == CT_IMPORT - || pc->type == CT_USING) + || (pc->type == CT_USING && (cpd.lang_flags & LANG_CS))) { /* * if there is a newline after the '=' or the line starts with a '=', diff --git a/tests/output/cpp/30211-indent_comment_align_thresh.cpp b/tests/output/cpp/30211-indent_comment_align_thresh.cpp index 74b3d7e43e..bc25f6b43f 100644 --- a/tests/output/cpp/30211-indent_comment_align_thresh.cpp +++ b/tests/output/cpp/30211-indent_comment_align_thresh.cpp @@ -74,9 +74,9 @@ namespace FooNamespace class FooClass { using FooUsing = FooTemplate< - param1, - param2 - >; // FooTemplate + param1, + param2 + >; // FooTemplate // Foo description void foo() { diff --git a/tests/output/cpp/30212-indent_comment_align_thresh.cpp b/tests/output/cpp/30212-indent_comment_align_thresh.cpp index b2af08eed7..abddd42e7b 100644 --- a/tests/output/cpp/30212-indent_comment_align_thresh.cpp +++ b/tests/output/cpp/30212-indent_comment_align_thresh.cpp @@ -74,9 +74,9 @@ namespace FooNamespace class FooClass { using FooUsing = FooTemplate< - param1, - param2 - >; // FooTemplate + param1, + param2 + >; // FooTemplate // Foo description void foo() { From 633576a429dd516042faae3697e0916b1b00d44a Mon Sep 17 00:00:00 2001 From: Viktor Kireev Date: Tue, 31 Oct 2017 22:04:28 +0300 Subject: [PATCH 059/136] Fix the detection of lambda-expression without lambda-declarator Lambda-declarator '( params )' in the lambda-expression is optional. The minimum lambda-expression can have the form: [captures] {body}. --- src/combine.cpp | 41 +++++++++++++++++++++--------- tests/cpp.test | 2 ++ tests/input/cpp/lambda.cpp | 20 +++++++++++++++ tests/input/cpp/lambda2.cpp | 21 +++++++++++++++ tests/output/cpp/30750-lambda.cpp | 23 +++++++++++++++++ tests/output/cpp/30751-lambda.cpp | 19 ++++++++++++++ tests/output/cpp/30752-lambda.cpp | 26 +++++++++++++++++++ tests/output/cpp/30753-lambda2.cpp | 20 +++++++++++++++ 8 files changed, 160 insertions(+), 12 deletions(-) diff --git a/src/combine.cpp b/src/combine.cpp index 502f47b603..39ce407743 100644 --- a/src/combine.cpp +++ b/src/combine.cpp @@ -5024,6 +5024,13 @@ static void handle_cpp_lambda(chunk_t *sq_o) chunk_t *ret = nullptr; + // make sure there isn't an array with braced-init-list: int a[]{}; + chunk_t *prev = chunk_get_prev_ncnl(sq_o); + if (prev && prev->type == CT_WORD) + { + return; + } + chunk_t *sq_c = sq_o; // assuming '[]' if (sq_o->type == CT_SQUARE_OPEN) { @@ -5035,21 +5042,25 @@ static void handle_cpp_lambda(chunk_t *sq_o) } } - // Make sure a '(' is next + // lambda-declarator '( params )' is optional chunk_t *pa_o = chunk_get_next_ncnl(sq_c); - if (!pa_o || pa_o->type != CT_PAREN_OPEN) + if (!pa_o) { return; } - // and now find the ')' - chunk_t *pa_c = chunk_skip_to_match(pa_o); - if (!pa_c) + chunk_t *pa_c = nullptr; + if (pa_o->type == CT_PAREN_OPEN) { - return; + // and now find the ')' + pa_c = chunk_skip_to_match(pa_o); + if (!pa_c) + { + return; + } } // Check if keyword 'mutable' is before '->' - chunk_t *br_o = chunk_get_next_ncnl(pa_c); + chunk_t *br_o = pa_c ? chunk_get_next_ncnl(pa_c) : pa_o; if (chunk_is_str(br_o, "mutable", 7)) { br_o = chunk_get_next_ncnl(br_o); @@ -5100,10 +5111,13 @@ static void handle_cpp_lambda(chunk_t *sq_o) } set_chunk_parent(sq_o, CT_CPP_LAMBDA); set_chunk_parent(sq_c, CT_CPP_LAMBDA); - set_chunk_type(pa_o, CT_FPAREN_OPEN); - set_chunk_parent(pa_o, CT_CPP_LAMBDA); - set_chunk_type(pa_c, CT_FPAREN_CLOSE); - set_chunk_parent(pa_c, CT_CPP_LAMBDA); + if (pa_c) + { + set_chunk_type(pa_o, CT_FPAREN_OPEN); + set_chunk_parent(pa_o, CT_CPP_LAMBDA); + set_chunk_type(pa_c, CT_FPAREN_CLOSE); + set_chunk_parent(pa_c, CT_CPP_LAMBDA); + } set_chunk_parent(br_o, CT_CPP_LAMBDA); set_chunk_parent(br_c, CT_CPP_LAMBDA); @@ -5118,7 +5132,10 @@ static void handle_cpp_lambda(chunk_t *sq_o) } } - fix_fcn_def_params(pa_o); + if (pa_c) + { + fix_fcn_def_params(pa_o); + } } // handle_cpp_lambda diff --git a/tests/cpp.test b/tests/cpp.test index b3e32ef6b2..f8215eb9e4 100644 --- a/tests/cpp.test +++ b/tests/cpp.test @@ -186,6 +186,8 @@ 30741 al.cfg cpp/al.cpp 30742 delete.cfg cpp/delete.cpp +# TODO: Reduce the number of options, leave only those that affect lambda. +# TODO: Add tests for nested lambdas. 30750 ben.cfg cpp/lambda.cpp 30751 lambda1.cfg cpp/lambda.cpp 30752 lambda2.cfg cpp/lambda.cpp diff --git a/tests/input/cpp/lambda.cpp b/tests/input/cpp/lambda.cpp index 3f26d1fd8d..60ea385033 100644 --- a/tests/input/cpp/lambda.cpp +++ b/tests/input/cpp/lambda.cpp @@ -35,6 +35,26 @@ void f2() }); } +void f3a() +{ + auto a = [] {}; + auto b = []{return true;}; +} + +void f3b() +{ + Invoke(a, b, + [&one, two] + { + std::cout << "blah: " << one << two; + }); +} + +void f3c() +{ + int a[]{}; +} + void g1() { auto a = [ = ](int* a, Something &b) { std::cout << "blah: " << *a; }; diff --git a/tests/input/cpp/lambda2.cpp b/tests/input/cpp/lambda2.cpp index 1a5ea6926e..d641c281f3 100644 --- a/tests/input/cpp/lambda2.cpp +++ b/tests/input/cpp/lambda2.cpp @@ -38,6 +38,27 @@ void f2() ); } +void f3a() +{ + auto a = [] {}; + auto b = []{return true;}; +} + +void f3b() +{ + Invoke(a, b, + [&one, two] + { + std::cout << "blah: " << one << two; + } + ); +} + +void f3c() +{ + int a[]{}; +} + void g1() { auto a = [ = ](int* a, Something &b) { std::cout << "blah: " << *a; }; diff --git a/tests/output/cpp/30750-lambda.cpp b/tests/output/cpp/30750-lambda.cpp index e2bbb4e07e..045a63d8a0 100644 --- a/tests/output/cpp/30750-lambda.cpp +++ b/tests/output/cpp/30750-lambda.cpp @@ -35,6 +35,29 @@ void f2() }); } +void f3a() +{ + auto a = [] { + }; + auto b = [] { + return(true); + }; +} + +void f3b() +{ + Invoke(a, b, + [&one, two] + { + std::cout << "blah: " << one << two; + }); +} + +void f3c() +{ + int a[]{}; +} + void g1() { auto a = [ = ](int *a, Something&b) { diff --git a/tests/output/cpp/30751-lambda.cpp b/tests/output/cpp/30751-lambda.cpp index 6b899c62a1..e62245857b 100644 --- a/tests/output/cpp/30751-lambda.cpp +++ b/tests/output/cpp/30751-lambda.cpp @@ -31,6 +31,25 @@ void f2() }); } +void f3a() +{ + auto a = [] {}; + auto b = [] { return(true); }; +} + +void f3b() +{ + Invoke(a, b, + [&one, two] { + std::cout << "blah: " << one << two; + }); +} + +void f3c() +{ + int a[]{}; +} + void g1() { auto a = [=] (int *a, Something&b) { std::cout << "blah: " << *a; }; diff --git a/tests/output/cpp/30752-lambda.cpp b/tests/output/cpp/30752-lambda.cpp index 57ca97e1eb..e0ce310107 100644 --- a/tests/output/cpp/30752-lambda.cpp +++ b/tests/output/cpp/30752-lambda.cpp @@ -38,6 +38,32 @@ void f2() ); } +void f3a() +{ + auto a = [] + { + }; + auto b = [] + { + return(true); + }; +} + +void f3b() +{ + Invoke(a, b, + [&one, two] + { + std::cout << "blah: " << one << two; + } + ); +} + +void f3c() +{ + int a[]{}; +} + void g1() { auto a = [=] (int *a, Something&b) diff --git a/tests/output/cpp/30753-lambda2.cpp b/tests/output/cpp/30753-lambda2.cpp index c98771b527..2749f40644 100644 --- a/tests/output/cpp/30753-lambda2.cpp +++ b/tests/output/cpp/30753-lambda2.cpp @@ -34,6 +34,26 @@ void f2() ); } +void f3a() +{ + auto a = [] {}; + auto b = [] { return(true); }; +} + +void f3b() +{ + Invoke(a, b, + [&one, two] { + std::cout << "blah: " << one << two; + } + ); +} + +void f3c() +{ + int a[]{}; +} + void g1() { auto a = [=] (int *a, Something&b) { std::cout << "blah: " << *a; }; From f77a41bf2da1c929c89bf6d6ba8e0c990636c90a Mon Sep 17 00:00:00 2001 From: Viktor Kireev Date: Tue, 31 Oct 2017 19:14:33 +0300 Subject: [PATCH 060/136] Fix 'override' as CT_QUALIFIER for LANG_CPP --- src/keywords.cpp | 2 +- tests/cpp.test | 3 +++ tests/input/cpp/override_virtual.cpp | 16 ++++++++++++++++ tests/output/cpp/34210-override_virtual.cpp | 16 ++++++++++++++++ 4 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 tests/input/cpp/override_virtual.cpp create mode 100644 tests/output/cpp/34210-override_virtual.cpp diff --git a/src/keywords.cpp b/src/keywords.cpp index 3a09270fe5..66df4c93d9 100644 --- a/src/keywords.cpp +++ b/src/keywords.cpp @@ -239,7 +239,7 @@ static const chunk_tag_t keywords[] = { "or", CT_SBOOL, LANG_CPP }, { "or_eq", CT_SASSIGN, LANG_CPP }, { "out", CT_QUALIFIER, LANG_CS | LANG_D | LANG_VALA }, - { "override", CT_QUALIFIER, LANG_CS | LANG_D | LANG_VALA }, + { "override", CT_QUALIFIER, LANG_CPP | LANG_CS | LANG_D | LANG_VALA }, { "package", CT_PRIVATE, LANG_D }, { "package", CT_PACKAGE, LANG_ECMA | LANG_JAVA }, { "params", CT_TYPE, LANG_CS | LANG_VALA }, diff --git a/tests/cpp.test b/tests/cpp.test index b3e32ef6b2..8668ddffc2 100644 --- a/tests/cpp.test +++ b/tests/cpp.test @@ -501,3 +501,6 @@ 34194 sp_arith_additive-f.cfg cpp/sp_arith_additive.cpp 34195 sp_arith_additive-r.cfg cpp/sp_arith_additive.cpp + +# TODO: Find relevant test cases for 'override'. +34210 empty.cfg cpp/override_virtual.cpp diff --git a/tests/input/cpp/override_virtual.cpp b/tests/input/cpp/override_virtual.cpp new file mode 100644 index 0000000000..537454b168 --- /dev/null +++ b/tests/input/cpp/override_virtual.cpp @@ -0,0 +1,16 @@ +struct A +{ + virtual void foo(); + virtual void bar() = 0; + virtual void baz() const { + } +}; + +struct B : public A +{ + virtual void foo() override; + void bar() override { + } + void baz() const override { + } +}; diff --git a/tests/output/cpp/34210-override_virtual.cpp b/tests/output/cpp/34210-override_virtual.cpp new file mode 100644 index 0000000000..537454b168 --- /dev/null +++ b/tests/output/cpp/34210-override_virtual.cpp @@ -0,0 +1,16 @@ +struct A +{ + virtual void foo(); + virtual void bar() = 0; + virtual void baz() const { + } +}; + +struct B : public A +{ + virtual void foo() override; + void bar() override { + } + void baz() const override { + } +}; From 3636f40cbefd22dfc79c3c60d7aca541e86847fc Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Wed, 1 Nov 2017 18:35:02 +0100 Subject: [PATCH 061/136] Remove header using directives Set up 'using namespace' directives are passed into everything that includes the header. This can potentially lead to problems if that is not anticipated. All using directives therefore are removed from the headers and added, where needed, in the cpp files. --- src/ChunkStack.h | 2 +- src/ListManager.h | 2 +- src/align.cpp | 3 +++ src/backup.cpp | 3 +++ src/backup.h | 2 +- src/combine.cpp | 3 +++ src/indent.cpp | 3 +++ src/keywords.h | 2 +- src/newlines.cpp | 3 +++ src/options.cpp | 4 ++++ src/options.h | 22 +++++++++++----------- src/punctuators.cpp | 4 ++++ src/space.cpp | 3 +++ src/tokenize.cpp | 3 +++ src/tokenize.h | 2 +- src/unc_text.cpp | 3 +++ src/unc_text.h | 19 +++++++++---------- src/uncrustify.cpp | 3 +++ src/uncrustify_types.h | 10 +++++----- src/unicode.cpp | 3 +++ src/unicode.h | 4 ++-- src/universalindentgui.cpp | 3 +++ 22 files changed, 73 insertions(+), 33 deletions(-) diff --git a/src/ChunkStack.h b/src/ChunkStack.h index 2201f594e0..cf0778a8c0 100644 --- a/src/ChunkStack.h +++ b/src/ChunkStack.h @@ -42,7 +42,7 @@ class ChunkStack }; protected: - deque m_cse; + std::deque m_cse; size_t m_seqnum; //! current sequence number public: diff --git a/src/ListManager.h b/src/ListManager.h index 5cb1f7fbc3..b91d047cb0 100644 --- a/src/ListManager.h +++ b/src/ListManager.h @@ -12,7 +12,7 @@ /* * TODO: why do we provide this template class? can't we use - * a double linked list deque from the standard library ? + * a double linked list std::deque from the standard library ? */ /** * A simple list manager for a double-linked list. diff --git a/src/align.cpp b/src/align.cpp index ab65ce8ff8..beeefbf0fb 100644 --- a/src/align.cpp +++ b/src/align.cpp @@ -22,6 +22,9 @@ #include "space.h" +using namespace std; + + /* * Here are the items aligned: * diff --git a/src/backup.cpp b/src/backup.cpp index 415aa0b112..81fb620627 100644 --- a/src/backup.cpp +++ b/src/backup.cpp @@ -33,6 +33,9 @@ #include "uncrustify.h" +using namespace std; + + int backup_copy_file(const char *filename, const vector &data) { char newpath[1024]; diff --git a/src/backup.h b/src/backup.h index c96be296ab..3e51f86303 100644 --- a/src/backup.h +++ b/src/backup.h @@ -42,7 +42,7 @@ * @retval EX_OK successfully created backup file * @retval EX_IOERR could not create backup file */ -int backup_copy_file(const char *filename, const vector &data); +int backup_copy_file(const char *filename, const std::vector &data); /** diff --git a/src/combine.cpp b/src/combine.cpp index 502f47b603..05eabbfb36 100644 --- a/src/combine.cpp +++ b/src/combine.cpp @@ -23,6 +23,9 @@ #include +using namespace std; + + /** * Flags everything from the open paren to the close paren. * diff --git a/src/indent.cpp b/src/indent.cpp index 96570ba66a..b02d1665db 100644 --- a/src/indent.cpp +++ b/src/indent.cpp @@ -24,6 +24,9 @@ #include "helper_for_print.h" +using namespace std; + + /** * General indenting approach: * Indenting levels are put into a stack. diff --git a/src/keywords.h b/src/keywords.h index 17e42ce2d5..c6a641df14 100644 --- a/src/keywords.h +++ b/src/keywords.h @@ -47,7 +47,7 @@ void add_keyword(const char *tag, c_token_t type); * * @param tag The tag (string) */ -void remove_keyword(const string &tag); +void remove_keyword(const std::string &tag); void print_keywords(FILE *pfile); diff --git a/src/newlines.cpp b/src/newlines.cpp index 37051ca750..a846a60d0d 100644 --- a/src/newlines.cpp +++ b/src/newlines.cpp @@ -34,6 +34,9 @@ #include "options.h" +using namespace std; + + static void mark_change(const char *func, size_t line); diff --git a/src/options.cpp b/src/options.cpp index 6e54d78d26..e7c744ddfd 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -24,6 +24,10 @@ #include #include "unc_ctype.h" + +using namespace std; + + static const char *DOC_TEXT_END = R"___( # Meaning of the settings: # Ignore - do not do any changes diff --git a/src/options.h b/src/options.h index 7028fa456f..f41ee9e882 100644 --- a/src/options.h +++ b/src/options.h @@ -898,9 +898,9 @@ enum uncrustify_options #ifdef EMSCRIPTEN -#define group_map_value_options_t vector +#define group_map_value_options_t std::vector #else -#define group_map_value_options_t list +#define group_map_value_options_t std::list #endif struct group_map_value @@ -1007,42 +1007,42 @@ void print_options(FILE *pfile); * * @param val argument type to convert */ -string argtype_to_string(argtype_e argtype); +std::string argtype_to_string(argtype_e argtype); /** * convert a boolean to a string * * @param val boolean to convert */ -string bool_to_string(bool val); +std::string bool_to_string(bool val); /** * convert an argument value to a string * * @param val argument value to convert */ -string argval_to_string(argval_t argval); +std::string argval_to_string(argval_t argval); /** * convert an integer number to a string * * @param val integer number to convert */ -string number_to_string(int number); +std::string number_to_string(int number); /** * convert a line ending type to a string * * @param val line ending type to convert */ -string lineends_to_string(lineends_e linends); +std::string lineends_to_string(lineends_e linends); /** * convert a token to a string * * @param val token to convert */ -string tokenpos_to_string(tokenpos_e tokenpos); +std::string tokenpos_to_string(tokenpos_e tokenpos); /** * convert an argument of a given type to a string @@ -1050,11 +1050,11 @@ string tokenpos_to_string(tokenpos_e tokenpos); * @param argtype type of argument * @param op_val_t value of argument */ -string op_val_to_string(argtype_e argtype, op_val_t op_val); +std::string op_val_to_string(argtype_e argtype, op_val_t op_val); -typedef map::iterator option_name_map_it; -typedef map::iterator group_map_it; +typedef std::map::iterator option_name_map_it; +typedef std::map::iterator group_map_it; typedef group_map_value_options_t::iterator option_list_it; typedef group_map_value_options_t::const_iterator option_list_cit; diff --git a/src/punctuators.cpp b/src/punctuators.cpp index 4c8a632766..d9477bf254 100644 --- a/src/punctuators.cpp +++ b/src/punctuators.cpp @@ -9,6 +9,10 @@ #include "prototypes.h" #include + +using namespace std; + + /** * * The file "punctuator_table.h" was generated by punc.py from this file. diff --git a/src/space.cpp b/src/space.cpp index c66a9533dd..fbb668e73a 100644 --- a/src/space.cpp +++ b/src/space.cpp @@ -30,6 +30,9 @@ #include "uncrustify.h" +using namespace std; + + static void log_rule2(size_t line, const char *rule, chunk_t *first, chunk_t *second, bool complete); diff --git a/src/tokenize.cpp b/src/tokenize.cpp index dedb4b5541..7a7c11ca7e 100644 --- a/src/tokenize.cpp +++ b/src/tokenize.cpp @@ -20,6 +20,9 @@ #include "keywords.h" +using namespace std; + + struct tok_info { tok_info() diff --git a/src/tokenize.h b/src/tokenize.h index 367d745866..309ae0c51b 100644 --- a/src/tokenize.h +++ b/src/tokenize.h @@ -24,7 +24,7 @@ * All the tokens are inserted before ref. If ref is NULL, they are inserted * at the end of the list. Line numbers are relative to the start of the data. */ -void tokenize(const deque &data, chunk_t *ref); +void tokenize(const std::deque &data, chunk_t *ref); #endif /* TOKENIZE_H_INCLUDED */ diff --git a/src/unc_text.cpp b/src/unc_text.cpp index d033d7ca50..1624b35be7 100644 --- a/src/unc_text.cpp +++ b/src/unc_text.cpp @@ -10,6 +10,9 @@ #include "unicode.h" // encode_utf8() +using namespace std; + + static void fix_len_idx(size_t size, size_t &idx, size_t &len); diff --git a/src/unc_text.h b/src/unc_text.h index 0dbfd955ab..5ca0b39350 100644 --- a/src/unc_text.h +++ b/src/unc_text.h @@ -1,8 +1,8 @@ /** * @file unc_text.h * A simple class that handles the chunk text. - * At the start of processing, the entire file is decoded into a vector of ints. - * This class is intended to hold sections of that large vector. + * At the start of processing, the entire file is decoded into a std::vector of ints. + * This class is intended to hold sections of that large std::vector. * * @author Ben Gardner * @license GPL v2+ @@ -14,7 +14,6 @@ #include #include #include -using namespace std; /** * abbreviations used: @@ -24,7 +23,7 @@ using namespace std; class unc_text { public: - typedef deque value_type; // double encoded list of int values + typedef std::deque value_type; // double encoded list of int values public: unc_text() @@ -56,7 +55,7 @@ class unc_text } - unc_text(const string &ascii_text) + unc_text(const std::string &ascii_text) { set(ascii_text); } @@ -90,7 +89,7 @@ class unc_text void set(const unc_text &ref, size_t idx, size_t len = 0); - void set(const string &ascii_text); + void set(const std::string &ascii_text); void set(const char *ascii_text); @@ -113,7 +112,7 @@ class unc_text } - unc_text &operator =(const string &ascii_text) + unc_text &operator =(const std::string &ascii_text) { set(ascii_text); return(*this); @@ -144,7 +143,7 @@ class unc_text //! Add a string to an unc_text - void append(const string &ascii_text); + void append(const std::string &ascii_text); /** @@ -175,7 +174,7 @@ class unc_text } - unc_text &operator +=(const string &ascii_text) + unc_text &operator +=(const std::string &ascii_text) { append(ascii_text); return(*this); @@ -310,7 +309,7 @@ class unc_text value_type m_chars; //! this contains the non-encoded 31-bit chars - vector m_logtext; //! logging text, utf8 encoded - updated in c_str() + std::vector m_logtext; //! logging text, utf8 encoded - updated in c_str() bool m_logok; }; diff --git a/src/uncrustify.cpp b/src/uncrustify.cpp index d7d7aa05ca..7ba842925c 100644 --- a/src/uncrustify.cpp +++ b/src/uncrustify.cpp @@ -66,6 +66,9 @@ #endif +using namespace std; + + // Global data cp_data_t cpd; diff --git a/src/uncrustify_types.h b/src/uncrustify_types.h index e0de9ea341..cd9b0631b8 100644 --- a/src/uncrustify_types.h +++ b/src/uncrustify_types.h @@ -11,7 +11,6 @@ #include #include -using namespace std; #include "base_types.h" #include "options.h" @@ -25,6 +24,7 @@ using namespace std; #include #endif + /** * abbreviations used: * SS = star style @@ -38,7 +38,7 @@ using namespace std; #define UNCRUSTIFY_ON_TEXT " *INDENT-ON*" //! returns type (with removed reference) of a variable -#define noref_decl_t(X) remove_reference::type +#define noref_decl_t(X) std::remove_reference::type //! static casts Y to the type (with removed reference) of X #define s_cast_noref_decl_t(X, Y) static_cast(Y) @@ -388,8 +388,8 @@ struct align_t //! holds information and data of a file struct file_mem { - vector raw; //! raw content of file - deque data; //! processed content of file + std::vector raw; //! raw content of file + std::deque data; //! processed content of file bool bom; char_encoding_e enc; //! character encoding of file ASCII, utf, etc. #ifdef HAVE_UTIME_H @@ -415,7 +415,7 @@ enum class unc_stage_e : unsigned int struct cp_data_t { - deque *bout; + std::deque *bout; FILE *fout; int last_char; bool do_check; diff --git a/src/unicode.cpp b/src/unicode.cpp index dc4b3dcf2c..6ac137b187 100644 --- a/src/unicode.cpp +++ b/src/unicode.cpp @@ -14,6 +14,9 @@ #include +using namespace std; + + //! See if all characters are ASCII (0-127) static bool is_ascii(const vector &data, size_t &non_ascii_cnt, size_t &zero_cnt); diff --git a/src/unicode.h b/src/unicode.h index c45893038d..d8bf2a23cc 100644 --- a/src/unicode.h +++ b/src/unicode.h @@ -25,10 +25,10 @@ void write_string(const unc_text &text); //! Figure out the encoding and convert to an int sequence -bool decode_unicode(const vector &in_data, deque &out_data, char_encoding_e &enc, bool &has_bom); +bool decode_unicode(const std::vector &in_data, std::deque &out_data, char_encoding_e &enc, bool &has_bom); -void encode_utf8(int ch, vector &res); +void encode_utf8(int ch, std::vector &res); #endif /* UNICODE_H_INCLUDED */ diff --git a/src/universalindentgui.cpp b/src/universalindentgui.cpp index da72dfefe3..29bc7660d7 100644 --- a/src/universalindentgui.cpp +++ b/src/universalindentgui.cpp @@ -17,6 +17,9 @@ #include +using namespace std; + + void print_universal_indent_cfg(FILE *pfile) { const group_map_value *p_grp; From cd8d808ed8e31431f361b0970b022f96d1267af7 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Wed, 1 Nov 2017 18:49:55 +0100 Subject: [PATCH 062/136] appy Uncrustify --- src/ChunkStack.h | 2 +- src/options.h | 4 +- src/unc_text.h | 4 +- src/uncrustify_types.h | 104 ++++++++++++++++++++--------------------- 4 files changed, 57 insertions(+), 57 deletions(-) diff --git a/src/ChunkStack.h b/src/ChunkStack.h index cf0778a8c0..38850b102c 100644 --- a/src/ChunkStack.h +++ b/src/ChunkStack.h @@ -43,7 +43,7 @@ class ChunkStack protected: std::deque m_cse; - size_t m_seqnum; //! current sequence number + size_t m_seqnum; //! current sequence number public: ChunkStack() diff --git a/src/options.h b/src/options.h index f41ee9e882..1f43a987e1 100644 --- a/src/options.h +++ b/src/options.h @@ -1055,8 +1055,8 @@ std::string op_val_to_string(argtype_e argtype, op_val_t op_val); typedef std::map::iterator option_name_map_it; typedef std::map::iterator group_map_it; -typedef group_map_value_options_t::iterator option_list_it; -typedef group_map_value_options_t::const_iterator option_list_cit; +typedef group_map_value_options_t::iterator option_list_it; +typedef group_map_value_options_t::const_iterator option_list_cit; #endif /* OPTIONS_H_INCLUDED */ diff --git a/src/unc_text.h b/src/unc_text.h index 5ca0b39350..8a9a1fdbb4 100644 --- a/src/unc_text.h +++ b/src/unc_text.h @@ -308,9 +308,9 @@ class unc_text void update_logtext(); - value_type m_chars; //! this contains the non-encoded 31-bit chars + value_type m_chars; //! this contains the non-encoded 31-bit chars std::vector m_logtext; //! logging text, utf8 encoded - updated in c_str() - bool m_logok; + bool m_logok; }; diff --git a/src/uncrustify_types.h b/src/uncrustify_types.h index cd9b0631b8..1e71bb1511 100644 --- a/src/uncrustify_types.h +++ b/src/uncrustify_types.h @@ -388,12 +388,12 @@ struct align_t //! holds information and data of a file struct file_mem { - std::vector raw; //! raw content of file - std::deque data; //! processed content of file - bool bom; - char_encoding_e enc; //! character encoding of file ASCII, utf, etc. + std::vector raw; //! raw content of file + std::deque data; //! processed content of file + bool bom; + char_encoding_e enc; //! character encoding of file ASCII, utf, etc. #ifdef HAVE_UTIME_H - struct utimbuf utb; + struct utimbuf utb; #endif }; @@ -415,72 +415,72 @@ enum class unc_stage_e : unsigned int struct cp_data_t { - std::deque *bout; - FILE *fout; - int last_char; - bool do_check; - unc_stage_e unc_stage; - int check_fail_cnt; //! total failure count - bool if_changed; + std::deque *bout; + FILE *fout; + int last_char; + bool do_check; + unc_stage_e unc_stage; + int check_fail_cnt; //! total failure count + bool if_changed; - UINT32 error_count; //! counts how many errors occurred so far - const char *filename; + UINT32 error_count; //! counts how many errors occurred so far + const char *filename; - file_mem file_hdr; // for cmt_insert_file_header - file_mem file_ftr; // for cmt_insert_file_footer - file_mem func_hdr; // for cmt_insert_func_header - file_mem oc_msg_hdr; // for cmt_insert_oc_msg_header - file_mem class_hdr; // for cmt_insert_class_header + file_mem file_hdr; // for cmt_insert_file_header + file_mem file_ftr; // for cmt_insert_file_footer + file_mem func_hdr; // for cmt_insert_func_header + file_mem oc_msg_hdr; // for cmt_insert_oc_msg_header + file_mem class_hdr; // for cmt_insert_class_header - size_t lang_flags; //! defines the language of the source input - bool lang_forced; //! overwrites automatic language detection + size_t lang_flags; //! defines the language of the source input + bool lang_forced; //! overwrites automatic language detection - bool unc_off; - bool unc_off_used; //! to check if "unc_off" is used - UINT32 line_number; - size_t column; //! column for parsing - UINT16 spaces; //! space count on output + bool unc_off; + bool unc_off_used; //! to check if "unc_off" is used + UINT32 line_number; + size_t column; //! column for parsing + UINT16 spaces; //! space count on output - int ifdef_over_whole_file; + int ifdef_over_whole_file; - bool frag; //! activates code fragment option - uint32_t frag_cols; + bool frag; //! activates code fragment option + uint32_t frag_cols; // stuff to auto-detect line endings - UINT32 le_counts[LE_AUTO]; - unc_text newline; + UINT32 le_counts[LE_AUTO]; + unc_text newline; - bool consumed; + bool consumed; - int did_newline; //! flag indicates if a newline was added or converted - c_token_t in_preproc; - int preproc_ncnl_count; - bool output_trailspace; - bool output_tab_as_space; + int did_newline; //! flag indicates if a newline was added or converted + c_token_t in_preproc; + int preproc_ncnl_count; + bool output_trailspace; + bool output_tab_as_space; - bool bom; - char_encoding_e enc; + bool bom; + char_encoding_e enc; // bumped up when a line is split or indented - int changes; - int pass_count; //! indicates how often the chunk list shall be processed + int changes; + int pass_count; //! indicates how often the chunk list shall be processed - align_t al[80]; - size_t al_cnt; - bool al_c99_array; + align_t al[80]; + size_t al_cnt; + bool al_c99_array; - bool warned_unable_string_replace_tab_chars; + bool warned_unable_string_replace_tab_chars; - op_val_t settings[UO_option_count]; //! array with all uncrustify option settings + op_val_t settings[UO_option_count]; //! array with all uncrustify option settings - parse_frame_t frames[16]; - int frame_count; - int pp_level; // TODO: can this ever be -1? + parse_frame_t frames[16]; + int frame_count; + int pp_level; // TODO: can this ever be -1? // the default values for settings - op_val_t defaults[UO_option_count]; - const char *phase_name; - const char *dumped_file; + op_val_t defaults[UO_option_count]; + const char *phase_name; + const char *dumped_file; }; extern cp_data_t cpd; // TODO: can we avoid this external variable? From 25406280554cc447a1313b199c021e6fbfbee248 Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Thu, 2 Nov 2017 18:31:09 +0100 Subject: [PATCH 063/136] Prepare a better logging for issue #1142 --- src/chunk_list.cpp | 12 ++--- src/chunk_list.h | 2 +- src/combine.cpp | 116 ++++++++++++++++++++-------------------- tests/cli/Output/36.txt | 28 +++++----- tests/cli/Output/92.txt | 34 ++++++------ 5 files changed, 97 insertions(+), 95 deletions(-) diff --git a/src/chunk_list.cpp b/src/chunk_list.cpp index a6ca533cc0..3af8af7ef1 100644 --- a/src/chunk_list.cpp +++ b/src/chunk_list.cpp @@ -714,13 +714,13 @@ chunk_t *chunk_get_prev_nvb(chunk_t *cur, const scope_e scope) void set_chunk_type_real(chunk_t *pc, c_token_t tt) { - set_chunk_real(pc, tt, LSETTYP, "set_chunk_type"); + set_chunk_real(pc, tt, LSETTYP); } void set_chunk_parent_real(chunk_t *pc, c_token_t pt) { - set_chunk_real(pc, pt, LSETPAR, "set_chunk_parent"); + set_chunk_real(pc, pt, LSETPAR); } @@ -732,8 +732,8 @@ void chunk_flags_set_real(chunk_t *pc, UINT64 clr_bits, UINT64 set_bits) UINT64 nflags = (pc->flags & ~clr_bits) | set_bits; if (pc->flags != nflags) { - LOG_FMT(LSETFLG, "set_chunk_flags(%d): %016" PRIx64 "^%016" PRIx64 "=%016" PRIx64 " %zu:%zu '%s' %s:%s", - __LINE__, pc->flags, pc->flags ^ nflags, nflags, + LOG_FMT(LSETFLG, "%s(%d): %016" PRIx64 "^%016" PRIx64 "=%016" PRIx64 " orig_line is %zu, orig_col is %zu, text() '%s', type is %s, parent_type is %s", + __func__, __LINE__, pc->flags, pc->flags ^ nflags, nflags, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type), get_token_name(pc->parent_type)); log_func_stack_inline(LSETFLG); @@ -743,7 +743,7 @@ void chunk_flags_set_real(chunk_t *pc, UINT64 clr_bits, UINT64 set_bits) } -void set_chunk_real(chunk_t *pc, c_token_t token, log_sev_t what, const char *str) +void set_chunk_real(chunk_t *pc, c_token_t token, log_sev_t what) { LOG_FUNC_ENTRY(); @@ -772,7 +772,7 @@ void set_chunk_real(chunk_t *pc, c_token_t token, log_sev_t what, const char *st if (pc != nullptr && *where != token) { LOG_FMT(what, "%s(%d): orig_line is %zu, orig_col is %zu, pc->text() '%s'\n", - str, __LINE__, pc->orig_line, pc->orig_col, pc->text()); + __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text()); LOG_FMT(what, " pc->type is %s, pc->parent_type is %s => *type is %s, *parent_type is %s", get_token_name(pc->type), get_token_name(pc->parent_type), get_token_name(*type), get_token_name(*parent_type)); diff --git a/src/chunk_list.h b/src/chunk_list.h index 5d5336c1a1..a4c5c3a75c 100644 --- a/src/chunk_list.h +++ b/src/chunk_list.h @@ -40,7 +40,7 @@ enum class scope_e : unsigned int }; -void set_chunk_real(chunk_t *pc, c_token_t token, log_sev_t what, const char *str); +void set_chunk_real(chunk_t *pc, c_token_t token, log_sev_t what); /** diff --git a/src/combine.cpp b/src/combine.cpp index 502f47b603..b382420960 100644 --- a/src/combine.cpp +++ b/src/combine.cpp @@ -547,15 +547,15 @@ static chunk_t *flag_parens(chunk_t *po, UINT64 flags, c_token_t opentype, paren_close = chunk_skip_to_match(po, scope_e::PREPROC); if (paren_close == nullptr) { - LOG_FMT(LERR, "flag_parens: no match for [%s] at [%zu:%zu]", - po->text(), po->orig_line, po->orig_col); + LOG_FMT(LERR, "%s(%d): no match for '%s' at [%zu:%zu]", + __func__, __LINE__, po->text(), po->orig_line, po->orig_col); log_func_stack_inline(LERR); cpd.error_count++; return(nullptr); } - LOG_FMT(LFLPAREN, "flag_parens: %zu:%zu [%s] and %zu:%zu [%s] type=%s ptype=%s", - po->orig_line, po->orig_col, po->text(), + LOG_FMT(LFLPAREN, "%s(%d): %zu:%zu '%s' and %zu:%zu '%s' type is %s, parent_type is %s", + __func__, __LINE__, po->orig_line, po->orig_col, po->text(), paren_close->orig_line, paren_close->orig_col, paren_close->text(), get_token_name(opentype), get_token_name(parenttype)); //log_func_stack_inline(LSETTYP); @@ -607,8 +607,8 @@ chunk_t *set_paren_parent(chunk_t *start, c_token_t parent) end = chunk_skip_to_match(start, scope_e::PREPROC); if (end != nullptr) { - LOG_FMT(LFLPAREN, "set_paren_parent: %zu:%zu [%s] and %zu:%zu [%s] type=%s ptype=%s", - start->orig_line, start->orig_col, start->text(), + LOG_FMT(LFLPAREN, "%s(%d): %zu:%zu '%s' and %zu:%zu '%s' type is %s, parent_type is %s", + __func__, __LINE__, start->orig_line, start->orig_col, start->text(), end->orig_line, end->orig_col, end->text(), get_token_name(start->type), get_token_name(parent)); log_func_stack_inline(LFLPAREN); @@ -699,8 +699,8 @@ static bool chunk_ends_type(chunk_t *start) for ( ; pc != nullptr; pc = chunk_get_prev_ncnl(pc)) { - LOG_FMT(LFTYPE, "%s: [%s] %s flags %" PRIx64 " on line %zu, col %zu\n", - __func__, get_token_name(pc->type), pc->text(), + LOG_FMT(LFTYPE, "%s(%d): type is %s, text() '%s', flags %" PRIx64 " on orig_line %zu, orig_col %zu\n", + __func__, __LINE__, get_token_name(pc->type), pc->text(), pc->flags, pc->orig_line, pc->orig_col); if ( pc->type == CT_WORD @@ -733,7 +733,7 @@ static bool chunk_ends_type(chunk_t *start) ret = true; } - LOG_FMT(LFTYPE, "%s verdict: %s\n", __func__, ret ? "yes" : "no"); + LOG_FMT(LFTYPE, "%s(%d): verdict: %s\n", __func__, __LINE__, ret ? "yes" : "no"); return(ret); } // chunk_ends_type @@ -1719,9 +1719,9 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next) { if (tmp->type == CT_ATTRIBUTE) { - LOG_FMT(LGUY, "ATTRIBUTE found %s:%s\n", - get_token_name(tmp->type), tmp->text()); - LOG_FMT(LGUY, "for token %s:%s\n", get_token_name(pc->type), pc->text()); + LOG_FMT(LGUY, "%s(%d): ATTRIBUTE found, type is %s, text() '%s'\n", + __func__, __LINE__, get_token_name(tmp->type), tmp->text()); + LOG_FMT(LGUY, "for token, type is %s, text() '%s'\n", get_token_name(pc->type), pc->text()); // change CT_WORD => CT_TYPE set_chunk_type(pc, CT_TYPE); // change CT_STAR => CT_PTR_TYPE @@ -1751,7 +1751,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next) static void check_double_brace_init(chunk_t *bo1) { LOG_FUNC_ENTRY(); - LOG_FMT(LJDBI, "%s: %zu:%zu", __func__, bo1->orig_line, bo1->orig_col); + LOG_FMT(LJDBI, "%s(%d): orig_line is %zu, orig_col is %zu", __func__, __LINE__, bo1->orig_line, bo1->orig_col); chunk_t *pc = chunk_get_prev_ncnl(bo1); if (pc == nullptr) { @@ -1779,7 +1779,7 @@ static void check_double_brace_init(chunk_t *bo1) } if (chunk_is_token(bc1, CT_BRACE_CLOSE)) { - LOG_FMT(LJDBI, " - end %zu:%zu\n", bc2->orig_line, bc2->orig_col); + LOG_FMT(LJDBI, " - end, orig_line is %zu, orig_col is %zu\n", bc2->orig_line, bc2->orig_col); // delete bo2 and bc1 bo1->str += bo2->str; bo1->orig_col_end = bo2->orig_col_end; @@ -1945,8 +1945,8 @@ static void mark_function_return_type(chunk_t *fname, chunk_t *start, c_token_t if (pc != nullptr) { // Step backwards from pc and mark the parent of the return type - LOG_FMT(LFCNR, "%s: (backwards) return type for '%s' @ %zu:%zu", - __func__, fname->text(), fname->orig_line, fname->orig_col); + LOG_FMT(LFCNR, "%s(%d): (backwards) return type for '%s' @ orig_line is %zu, orig_col is %zu", + __func__, __LINE__, fname->text(), fname->orig_line, fname->orig_col); #ifdef DEBUG LOG_FMT(LFCN, "\n"); #endif @@ -1955,7 +1955,7 @@ static void mark_function_return_type(chunk_t *fname, chunk_t *start, c_token_t chunk_t *save; while (pc != nullptr) { - LOG_FMT(LFCNR, "%s(%d): pc: %s, type is %s\n", __func__, __LINE__, pc->text(), get_token_name(pc->type)); + LOG_FMT(LFCNR, "%s(%d): text() '%s', type is %s\n", __func__, __LINE__, pc->text(), get_token_name(pc->type)); #ifdef DEBUG log_pcf_flags(LFCNR, pc->flags); #endif @@ -2002,7 +2002,7 @@ static void mark_function_return_type(chunk_t *fname, chunk_t *start, c_token_t pc = first; while (pc != nullptr) { - LOG_FMT(LFCNR, " [%s|%s]", pc->text(), get_token_name(pc->type)); + LOG_FMT(LFCNR, " text() '%s', type is %s", pc->text(), get_token_name(pc->type)); if (parent_type != CT_NONE) { @@ -2023,8 +2023,8 @@ static void mark_function_return_type(chunk_t *fname, chunk_t *start, c_token_t static bool mark_function_type(chunk_t *pc) { LOG_FUNC_ENTRY(); - LOG_FMT(LFTYPE, "%s: [%s] %s @ %zu:%zu\n", - __func__, get_token_name(pc->type), pc->text(), + LOG_FMT(LFTYPE, "%s(%d): type is %s, text() '%s' @ orig_line is %zu, orig_col is %zu\n", + __func__, __LINE__, get_token_name(pc->type), pc->text(), pc->orig_line, pc->orig_col); size_t star_count = 0; @@ -2050,8 +2050,8 @@ static bool mark_function_type(chunk_t *pc) } else { - LOG_FMT(LFTYPE, "%s: not a word '%s' [%s] @ %zu:%zu\n", - __func__, varcnk->text(), get_token_name(varcnk->type), + LOG_FMT(LFTYPE, "%s(%d): not a word: text() '%s', type is %s, @ orig_line is %zu:, orig_col is %zu\n", + __func__, __LINE__, varcnk->text(), get_token_name(varcnk->type), varcnk->orig_line, varcnk->orig_col); goto nogo_exit; } @@ -2067,7 +2067,7 @@ static bool mark_function_type(chunk_t *pc) && ( !chunk_is_paren_open(apo) || ((apc = chunk_skip_to_match(apo)) == nullptr))) { - LOG_FMT(LFTYPE, "%s: not followed by parens\n", __func__); + LOG_FMT(LFTYPE, "%s(%d): not followed by parens\n", __func__, __LINE__); goto nogo_exit; } aft = chunk_get_next_ncnl(apc); @@ -2081,7 +2081,7 @@ static bool mark_function_type(chunk_t *pc) } else { - LOG_FMT(LFTYPE, "%s: not followed by '{' or ';'\n", __func__); + LOG_FMT(LFTYPE, "%s(%d): not followed by '{' or ';'\n", __func__, __LINE__); goto nogo_exit; } ptp = (pc->flags & PCF_IN_TYPEDEF) ? CT_FUNC_TYPE : CT_FUNC_VAR; @@ -2089,7 +2089,7 @@ static bool mark_function_type(chunk_t *pc) tmp = pc; while ((tmp = chunk_get_prev_ncnl(tmp)) != nullptr) { - LOG_FMT(LFTYPE, " -- [%s] %s on line %zu, col %zu", + LOG_FMT(LFTYPE, " -- type is %s, %s on orig_line %zu, orig_col is %zu", get_token_name(tmp->type), tmp->text(), tmp->orig_line, tmp->orig_col); @@ -2120,7 +2120,7 @@ static bool mark_function_type(chunk_t *pc) } else { - LOG_FMT(LFTYPE, " -- unexpected token [%s] %s on line %zu, col %zu\n", + LOG_FMT(LFTYPE, " -- unexpected token: type is %s, text() '%s', on orig_line %zu, orig_col %zu\n", get_token_name(tmp->type), tmp->text(), tmp->orig_line, tmp->orig_col); goto nogo_exit; @@ -2131,8 +2131,8 @@ static bool mark_function_type(chunk_t *pc) || word_count > 1 || ((star_count + word_count) == 0)) { - LOG_FMT(LFTYPE, "%s: bad counts word:%zu, star:%zu\n", __func__, - word_count, star_count); + LOG_FMT(LFTYPE, "%s(%d): bad counts word: %zu, star: %zu\n", + __func__, __LINE__, word_count, star_count); goto nogo_exit; } @@ -2180,7 +2180,7 @@ static bool mark_function_type(chunk_t *pc) tmp = pc; while ((tmp = chunk_get_prev_ncnl(tmp)) != nullptr) { - LOG_FMT(LFTYPE, " ++ [%s] %s on line %zu, col %zu\n", + LOG_FMT(LFTYPE, " ++ type is %s, text() '%s', on orig_line %zu, orig_col %zu\n", get_token_name(tmp->type), tmp->text(), tmp->orig_line, tmp->orig_col); @@ -2216,7 +2216,7 @@ static bool mark_function_type(chunk_t *pc) tmp = chunk_get_next_ncnl(pc); if (chunk_is_paren_open(tmp)) { - LOG_FMT(LFTYPE, "%s:%d setting FUNC_CALL on %zu:%zu\n", + LOG_FMT(LFTYPE, "%s(%d): setting FUNC_CALL on orig_line is %zu, orig_col is %zu\n", __func__, __LINE__, tmp->orig_line, tmp->orig_col); flag_parens(tmp, 0, CT_FPAREN_OPEN, CT_FUNC_CALL, false); } @@ -2281,8 +2281,8 @@ static chunk_t *process_return(chunk_t *pc) { if (cpd.settings[UO_mod_paren_on_return].a == AV_REMOVE) { - LOG_FMT(LRETURN, "%s: removing parens on line %zu\n", - __func__, pc->orig_line); + LOG_FMT(LRETURN, "%s(%d): removing parens on orig_line %zu\n", + __func__, __LINE__, pc->orig_line); // lower the level of everything for (temp = next; temp != cpar; temp = chunk_get_next(temp)) @@ -2301,8 +2301,8 @@ static chunk_t *process_return(chunk_t *pc) } else { - LOG_FMT(LRETURN, "%s: keeping parens on line %zu\n", - __func__, pc->orig_line); + LOG_FMT(LRETURN, "%s(%d): keeping parens on orig_line %zu\n", + __func__, __LINE__, pc->orig_line); // mark & keep them set_chunk_parent(next, CT_RETURN); @@ -2345,8 +2345,8 @@ static chunk_t *process_return(chunk_t *pc) chunk.orig_line = semi->orig_line; cpar = chunk_add_before(&chunk, semi); - LOG_FMT(LRETURN, "%s: added parens on line %zu\n", - __func__, pc->orig_line); + LOG_FMT(LRETURN, "%s(%d): added parens on orig_line %zu\n", + __func__, __LINE__, pc->orig_line); for (temp = next; temp != cpar; temp = chunk_get_next(temp)) { @@ -2401,7 +2401,8 @@ static void fix_casts(chunk_t *start) bool doubtful_cast = false; - LOG_FMT(LCASTS, "%s:line %zu, col %zu:", __func__, start->orig_line, start->orig_col); + LOG_FMT(LCASTS, "%s(%d): orig_line is %zu, orig_col is %zu:", + __func__, __LINE__, start->orig_line, start->orig_col); prev = chunk_get_prev_ncnl(start); if (prev == nullptr) @@ -2447,7 +2448,7 @@ static void fix_casts(chunk_t *start) || pc->type != CT_PAREN_CLOSE || prev->type == CT_OC_CLASS) { - LOG_FMT(LCASTS, " -- not a cast, hit [%s]\n", + LOG_FMT(LCASTS, " -- not a cast, hit type is %s\n", pc == NULL ? "NULL" : get_token_name(pc->type)); return; } @@ -2571,14 +2572,14 @@ static void fix_casts(chunk_t *start) && (!( pc->type == CT_SQUARE_OPEN && (cpd.lang_flags & LANG_OC)))) { - LOG_FMT(LCASTS, " -- not a cast - followed by '%s' %s\n", + LOG_FMT(LCASTS, " -- not a cast - followed by text() '%s', type is %s\n", pc->text(), get_token_name(pc->type)); return; } if (nope) { - LOG_FMT(LCASTS, " -- not a cast - '%s' followed by %s\n", + LOG_FMT(LCASTS, " -- not a cast - text() '%s' followed by type %s\n", pc->text(), get_token_name(after->type)); return; } @@ -2594,7 +2595,7 @@ static void fix_casts(chunk_t *start) || chunk_is_token(pc, CT_COMMA) || chunk_is_paren_close(pc)) { - LOG_FMT(LCASTS, " -- not a cast - followed by %s\n", get_token_name(pc->type)); + LOG_FMT(LCASTS, " -- not a cast - followed by type %s\n", get_token_name(pc->type)); return; } @@ -2821,7 +2822,8 @@ static void fix_typedef(chunk_t *start) return; } - LOG_FMT(LTYPEDEF, "%s: typedef @ %zu:%zu\n", __func__, start->orig_line, start->orig_col); + LOG_FMT(LTYPEDEF, "%s(%d): typedef @ orig_line %zu, orig_col %zu\n", + __func__, __LINE__, start->orig_line, start->orig_col); chunk_t *the_type = nullptr; chunk_t *open_paren; @@ -2895,8 +2897,8 @@ static void fix_typedef(chunk_t *start) } set_chunk_parent(the_type, CT_TYPEDEF); - LOG_FMT(LTYPEDEF, "%s: fcn typedef [%s] on line %zu\n", - __func__, the_type->text(), the_type->orig_line); + LOG_FMT(LTYPEDEF, "%s(%d): fcn typedef text() '%s', on orig_line %zu\n", + __func__, __LINE__, the_type->text(), the_type->orig_line); // If we are aligning on the open parenthesis, grab that instead if (open_paren && cpd.settings[UO_align_typedef_func].u == 1) @@ -2905,8 +2907,8 @@ static void fix_typedef(chunk_t *start) } if (cpd.settings[UO_align_typedef_func].u != 0) { - LOG_FMT(LTYPEDEF, "%s: -- align anchor on [%s] @ %zu:%zu\n", - __func__, the_type->text(), the_type->orig_line, the_type->orig_col); + LOG_FMT(LTYPEDEF, "%s(%d): -- align anchor on text() %s, @ orig_line %zu, orig_col %zu\n", + __func__, __LINE__, the_type->text(), the_type->orig_line, the_type->orig_col); chunk_flags_set(the_type, PCF_ANCHOR); } @@ -2930,8 +2932,8 @@ static void fix_typedef(chunk_t *start) if (the_type != nullptr) { // We have just a regular typedef - LOG_FMT(LTYPEDEF, "%s: regular typedef [%s] on line %zu\n", - __func__, the_type->text(), the_type->orig_line); + LOG_FMT(LTYPEDEF, "%s(%d): regular typedef text() %s, on orig_line %zu\n", + __func__, __LINE__, the_type->text(), the_type->orig_line); chunk_flags_set(the_type, PCF_ANCHOR); } return; @@ -2967,8 +2969,8 @@ static void fix_typedef(chunk_t *start) if (the_type != nullptr) { - LOG_FMT(LTYPEDEF, "%s: %s typedef [%s] on line %zu\n", - __func__, get_token_name(tag), the_type->text(), the_type->orig_line); + LOG_FMT(LTYPEDEF, "%s(%d): %s typedef text() %s, on orig_line %zu\n", + __func__, __LINE__, get_token_name(tag), the_type->text(), the_type->orig_line); chunk_flags_set(the_type, PCF_ANCHOR); } } // fix_typedef @@ -3285,8 +3287,8 @@ static void mark_variable_stack(ChunkStack &cs, log_sev_t sev) if (var_name != nullptr) { - LOG_FMT(LFCNP, "%s: parameter on line %zu :", - __func__, var_name->orig_line); + LOG_FMT(LFCNP, "%s(%d): parameter on orig_line %zu :", + __func__, __LINE__, var_name->orig_line); size_t word_cnt = 0; chunk_t *word_type; @@ -3329,7 +3331,7 @@ static void fix_fcn_def_params(chunk_t *start) return; } - LOG_FMT(LFCNP, "%s(%d): text() '%s', type is [%s], on orig_line %zu, level is %zu\n", + LOG_FMT(LFCNP, "%s(%d): text() '%s', type is %s, on orig_line %zu, level is %zu\n", __func__, __LINE__, start->text(), get_token_name(start->type), start->orig_line, start->level); while (start != nullptr && !chunk_is_paren_open(start)) @@ -3353,12 +3355,12 @@ static void fix_fcn_def_params(chunk_t *start) if ( ((start->len() == 1) && (start->str[0] == ')')) || pc->level < level) { - LOG_FMT(LFCNP, "%s(%d): bailed on '%s', on orig_line %zu\n", + LOG_FMT(LFCNP, "%s(%d): bailed on text() '%s', on orig_line %zu\n", __func__, __LINE__, pc->text(), pc->orig_line); break; } - LOG_FMT(LFCNP, "%s(%d): %s '%s' on orig_line %zu, level %zu\n", + LOG_FMT(LFCNP, "%s(%d): %s, text() '%s' on orig_line %zu, level %zu\n", __func__, __LINE__, (pc->level > level) ? "skipping" : "looking at", pc->text(), pc->orig_line, pc->level); @@ -4750,8 +4752,8 @@ static void mark_class_ctor(chunk_t *start) if (next != nullptr && next->type == CT_PAREN_OPEN) { set_chunk_type(pc, CT_FUNC_CLASS_DEF); - LOG_FMT(LFTOR, "%s(%d): type is %s, orig_line is %zu, orig_col is %zu, Marked CTor/DTor '%s'\n", - __func__, __LINE__, get_token_name(pc->type), pc->orig_line, pc->orig_col, pc->text()); + LOG_FMT(LFTOR, "%s(%d): orig_line is %zu, orig_col is %zu, type is %s, Marked CTor/DTor text() '%s'\n", + __func__, __LINE__, pc->orig_line, pc->orig_col, get_token_name(pc->type), pc->text()); mark_cpp_constructor(pc); } else diff --git a/tests/cli/Output/36.txt b/tests/cli/Output/36.txt index ca03a6e9d6..01069e267a 100644 --- a/tests/cli/Output/36.txt +++ b/tests/cli/Output/36.txt @@ -1,14 +1,14 @@ -fix_fcn_def_params(): text() '(', type is [PAREN_OPEN], on orig_line , level is -fix_fcn_def_params(): looking at 'const' on orig_line , level -fix_fcn_def_params(): looking at 'char' on orig_line , level -fix_fcn_def_params(): looking at '*' on orig_line , level -fix_fcn_def_params(): looking at 'pN' on orig_line , level -fix_fcn_def_params(): looking at ',' on orig_line , level -mark_variable_stack: parameter on line : [pN] -fix_fcn_def_params(): looking at 'unsigned' on orig_line , level -fix_fcn_def_params(): looking at 'long' on orig_line , level -fix_fcn_def_params(): looking at 'nI' on orig_line , level -fix_fcn_def_params(): bailed on ')', on orig_line -mark_variable_stack: parameter on line : [nI] -fix_fcn_def_params(): text() '(', type is [PAREN_OPEN], on orig_line , level is -fix_fcn_def_params(): bailed on ')', on orig_line +fix_fcn_def_params(): text() '(', type is PAREN_OPEN, on orig_line , level is +fix_fcn_def_params(): looking at, text() 'const' on orig_line , level +fix_fcn_def_params(): looking at, text() 'char' on orig_line , level +fix_fcn_def_params(): looking at, text() '*' on orig_line , level +fix_fcn_def_params(): looking at, text() 'pN' on orig_line , level +fix_fcn_def_params(): looking at, text() ',' on orig_line , level +mark_variable_stack(): parameter on orig_line : [pN] +fix_fcn_def_params(): looking at, text() 'unsigned' on orig_line , level +fix_fcn_def_params(): looking at, text() 'long' on orig_line , level +fix_fcn_def_params(): looking at, text() 'nI' on orig_line , level +fix_fcn_def_params(): bailed on text() ')', on orig_line +mark_variable_stack(): parameter on orig_line : [nI] +fix_fcn_def_params(): text() '(', type is PAREN_OPEN, on orig_line , level is +fix_fcn_def_params(): bailed on text() ')', on orig_line diff --git a/tests/cli/Output/92.txt b/tests/cli/Output/92.txt index f146dd561e..d5221b73d7 100644 --- a/tests/cli/Output/92.txt +++ b/tests/cli/Output/92.txt @@ -1,34 +1,34 @@ -set_chunk_type(): orig_line is , orig_col is , pc->text() 'TelegramIndex' +set_chunk_real(): orig_line is , orig_col is , pc->text() 'TelegramIndex' pc->type is WORD, pc->parent_type is NONE => *type is TYPE, *parent_type is NONE [CallStack:-DEBUG NOT SET-] -set_chunk_type(): orig_line is , orig_col is , pc->text() '*' +set_chunk_real(): orig_line is , orig_col is , pc->text() '*' pc->type is STAR, pc->parent_type is NONE => *type is PTR_TYPE, *parent_type is NONE [CallStack:-DEBUG NOT SET-] -set_chunk_type(): orig_line is , orig_col is , pc->text() '*' +set_chunk_real(): orig_line is , orig_col is , pc->text() '*' pc->type is STAR, pc->parent_type is NONE => *type is PTR_TYPE, *parent_type is NONE [CallStack:-DEBUG NOT SET-] -set_chunk_type(): orig_line is , orig_col is , pc->text() 'TelegramIndex' +set_chunk_real(): orig_line is , orig_col is , pc->text() 'TelegramIndex' pc->type is WORD, pc->parent_type is NONE => *type is FUNC_CLASS_DEF, *parent_type is NONE [CallStack:-DEBUG NOT SET-] -set_chunk_type(): orig_line is , orig_col is , pc->text() '(' +set_chunk_real(): orig_line is , orig_col is , pc->text() '(' pc->type is PAREN_OPEN, pc->parent_type is NONE => *type is FPAREN_OPEN, *parent_type is NONE [CallStack:-DEBUG NOT SET-] -set_chunk_type(): orig_line is , orig_col is , pc->text() ')' +set_chunk_real(): orig_line is , orig_col is , pc->text() ')' pc->type is PAREN_CLOSE, pc->parent_type is NONE => *type is FPAREN_CLOSE, *parent_type is NONE [CallStack:-DEBUG NOT SET-] -set_chunk_type(): orig_line is , orig_col is , pc->text() ':' +set_chunk_real(): orig_line is , orig_col is , pc->text() ':' pc->type is COLON, pc->parent_type is NONE => *type is CONSTR_COLON, *parent_type is NONE [CallStack:-DEBUG NOT SET-] -set_chunk_type(): orig_line is , orig_col is , pc->text() 'pTelName' +set_chunk_real(): orig_line is , orig_col is , pc->text() 'pTelName' pc->type is WORD, pc->parent_type is NONE => *type is FUNC_CTOR_VAR, *parent_type is NONE [CallStack:-DEBUG NOT SET-] -set_chunk_type(): orig_line is , orig_col is , pc->text() '(' +set_chunk_real(): orig_line is , orig_col is , pc->text() '(' pc->type is PAREN_OPEN, pc->parent_type is NONE => *type is FPAREN_OPEN, *parent_type is NONE [CallStack:-DEBUG NOT SET-] -set_chunk_type(): orig_line is , orig_col is , pc->text() ')' +set_chunk_real(): orig_line is , orig_col is , pc->text() ')' pc->type is PAREN_CLOSE, pc->parent_type is NONE => *type is FPAREN_CLOSE, *parent_type is NONE [CallStack:-DEBUG NOT SET-] -set_chunk_type(): orig_line is , orig_col is , pc->text() 'nTelIndex' +set_chunk_real(): orig_line is , orig_col is , pc->text() 'nTelIndex' pc->type is WORD, pc->parent_type is NONE => *type is FUNC_CTOR_VAR, *parent_type is NONE [CallStack:-DEBUG NOT SET-] -set_chunk_type(): orig_line is , orig_col is , pc->text() '(' +set_chunk_real(): orig_line is , orig_col is , pc->text() '(' pc->type is PAREN_OPEN, pc->parent_type is NONE => *type is FPAREN_OPEN, *parent_type is NONE [CallStack:-DEBUG NOT SET-] -set_chunk_type(): orig_line is , orig_col is , pc->text() ')' +set_chunk_real(): orig_line is , orig_col is , pc->text() ')' pc->type is PAREN_CLOSE, pc->parent_type is NONE => *type is FPAREN_CLOSE, *parent_type is NONE [CallStack:-DEBUG NOT SET-] -set_chunk_type(): orig_line is , orig_col is , pc->text() 'TelegramIndex' +set_chunk_real(): orig_line is , orig_col is , pc->text() 'TelegramIndex' pc->type is WORD, pc->parent_type is NONE => *type is FUNC_CLASS_DEF, *parent_type is NONE [CallStack:-DEBUG NOT SET-] -set_chunk_type(): orig_line is , orig_col is , pc->text() '~' +set_chunk_real(): orig_line is , orig_col is , pc->text() '~' pc->type is INV, pc->parent_type is NONE => *type is DESTRUCTOR, *parent_type is NONE [CallStack:-DEBUG NOT SET-] -set_chunk_type(): orig_line is , orig_col is , pc->text() '(' +set_chunk_real(): orig_line is , orig_col is , pc->text() '(' pc->type is PAREN_OPEN, pc->parent_type is NONE => *type is FPAREN_OPEN, *parent_type is NONE [CallStack:-DEBUG NOT SET-] -set_chunk_type(): orig_line is , orig_col is , pc->text() ')' +set_chunk_real(): orig_line is , orig_col is , pc->text() ')' pc->type is PAREN_CLOSE, pc->parent_type is NONE => *type is FPAREN_CLOSE, *parent_type is NONE [CallStack:-DEBUG NOT SET-] From 7640cf6d61c17dd1190bb28868cb6bf787d109e4 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Mon, 30 Oct 2017 22:07:53 +0100 Subject: [PATCH 064/136] refactor unc_text::fix_len_idx simplifies the function by replacing the parameter reference with a returned value adds early return check to minimize indent --- src/unc_text.cpp | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/src/unc_text.cpp b/src/unc_text.cpp index 1624b35be7..fa815104fa 100644 --- a/src/unc_text.cpp +++ b/src/unc_text.cpp @@ -13,23 +13,18 @@ using namespace std; -static void fix_len_idx(size_t size, size_t &idx, size_t &len); +static size_t fix_len_idx(size_t size, size_t idx, size_t len); -static void fix_len_idx(size_t size, size_t &idx, size_t &len) +static size_t fix_len_idx(size_t size, size_t idx, size_t len) { if (idx >= size) { - len = 0; - } - else - { - size_t left = size - idx; - if (len > left) - { - len = left; - } + return(0); } + + const size_t left = size - idx; + return((len > left) ? left : len); } @@ -145,7 +140,7 @@ void unc_text::set(const unc_text &ref, size_t idx, size_t len) { size_t ref_size = ref.size(); - fix_len_idx(ref_size, idx, len); + len = fix_len_idx(ref_size, idx, len); m_logok = false; if (len == ref_size) { @@ -195,7 +190,7 @@ void unc_text::set(const value_type &data, size_t idx, size_t len) { size_t data_size = data.size(); - fix_len_idx(data_size, idx, len); + len = fix_len_idx(data_size, idx, len); m_chars.resize(len); size_t di = 0; while (len-- > 0) From d6e535a780d5e0b7ebfa4455c65f7d64b0f6953f Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Mon, 30 Oct 2017 23:01:48 +0100 Subject: [PATCH 065/136] refactor unc_text::compare Calculates max value outside of loop to reduce checks, adds underflow safe return subtraction. --- src/unc_text.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/unc_text.cpp b/src/unc_text.cpp index fa815104fa..3687d5ed60 100644 --- a/src/unc_text.cpp +++ b/src/unc_text.cpp @@ -8,7 +8,7 @@ #include "unc_text.h" #include "unc_ctype.h" #include "unicode.h" // encode_utf8() - +#include using namespace std; @@ -55,15 +55,12 @@ void unc_text::update_logtext() int unc_text::compare(const unc_text &ref1, const unc_text &ref2, size_t len) { - size_t idx; - size_t len1 = ref1.size(); - size_t len2 = ref2.size(); - - for (idx = 0; - ( idx < len1 - && idx < len2 - && idx < len); - idx++) + const size_t len1 = ref1.size(); + const size_t len2 = ref2.size(); + const auto max_idx = std::min({ len, len1, len2 }); + size_t idx = 0; + + for ( ; idx < max_idx; idx++) { // exactly the same character ? if (ref1.m_chars[idx] == ref2.m_chars[idx]) @@ -91,7 +88,8 @@ int unc_text::compare(const unc_text &ref1, const unc_text &ref2, size_t len) return(0); } - return(len1 - len2); + // underflow save: return(len1 - len2); + return((len1 > len2) ? (len1 - len2) : -static_cast(len2 - len1)); } From 3a88c1a14c445175642f5cffda75c3a6a6cc9e55 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Mon, 30 Oct 2017 23:02:45 +0100 Subject: [PATCH 066/136] refactor unc_text::update_logtext Uses early return check to minimize indent. Adds comments about the symbols that are replaced. --- src/unc_text.cpp | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/unc_text.cpp b/src/unc_text.cpp index 3687d5ed60..29eb722cdc 100644 --- a/src/unc_text.cpp +++ b/src/unc_text.cpp @@ -30,26 +30,28 @@ static size_t fix_len_idx(size_t size, size_t idx, size_t len) void unc_text::update_logtext() { - if (!m_logok) + if (m_logok) { - // make a pessimistic guess at the size - m_logtext.clear(); - m_logtext.reserve(m_chars.size() * 3); - for (int m_char : m_chars) + return; + } + + // make a pessimistic guess at the size + m_logtext.clear(); + m_logtext.reserve(m_chars.size() * 3); + for (int m_char : m_chars) + { + if (m_char == '\n') { - if (m_char == '\n') - { - m_char = 0x2424; - } - else if (m_char == '\r') - { - m_char = 0x240d; - } - encode_utf8(m_char, m_logtext); + m_char = 0x2424; // NL symbol + } + else if (m_char == '\r') + { + m_char = 0x240d; // CR symbol } - m_logtext.push_back(0); - m_logok = true; + encode_utf8(m_char, m_logtext); } + m_logtext.push_back(0); + m_logok = true; } From 5f10b12d40932e4ae10acbf0614fcdf638fc1064 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Mon, 30 Oct 2017 23:04:01 +0100 Subject: [PATCH 067/136] refactor unc_text::equals --- src/unc_text.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/unc_text.cpp b/src/unc_text.cpp index 29eb722cdc..1998bef16a 100644 --- a/src/unc_text.cpp +++ b/src/unc_text.cpp @@ -97,12 +97,13 @@ int unc_text::compare(const unc_text &ref1, const unc_text &ref2, size_t len) bool unc_text::equals(const unc_text &ref) const { - size_t len = size(); + const size_t len = size(); if (ref.size() != len) { return(false); } + for (size_t idx = 0; idx < len; idx++) { if (m_chars[idx] != ref.m_chars[idx]) From 7c76a3bd9458ad0317668ac58517237115c48a9c Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Wed, 1 Nov 2017 19:10:11 +0100 Subject: [PATCH 068/136] refactor unc_text::set adds early return check to minimize indent replaces while loop with more appropriate for loops removes useless size_t casts --- src/unc_text.cpp | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/src/unc_text.cpp b/src/unc_text.cpp index 1998bef16a..91c7d0629f 100644 --- a/src/unc_text.cpp +++ b/src/unc_text.cpp @@ -139,33 +139,33 @@ void unc_text::set(const unc_text &ref) void unc_text::set(const unc_text &ref, size_t idx, size_t len) { - size_t ref_size = ref.size(); - - len = fix_len_idx(ref_size, idx, len); m_logok = false; + + const auto ref_size = ref.size(); + if (len == ref_size) { m_chars = ref.m_chars; + return; } - else + + m_chars.resize(len); + + len = fix_len_idx(ref_size, idx, len); + for (size_t di = 0; + len > 0; + di++, idx++, len--) { - m_chars.resize(len); - size_t di = 0; - while (len-- > 0) - { - m_chars[di] = ref.m_chars[idx]; - di++; - idx++; - } + m_chars[di] = ref.m_chars[idx]; } } void unc_text::set(const string &ascii_text) { - size_t len = ascii_text.size(); + const size_t len = ascii_text.size(); - m_chars.resize((size_t)len); + m_chars.resize(len); for (size_t idx = 0; idx < len; idx++) { m_chars[idx] = ascii_text[idx]; @@ -176,9 +176,9 @@ void unc_text::set(const string &ascii_text) void unc_text::set(const char *ascii_text) { - size_t len = strlen(ascii_text); + const size_t len = strlen(ascii_text); - m_chars.resize((size_t)len); + m_chars.resize(len); for (size_t idx = 0; idx < len; idx++) { m_chars[idx] = *ascii_text++; @@ -189,17 +189,16 @@ void unc_text::set(const char *ascii_text) void unc_text::set(const value_type &data, size_t idx, size_t len) { - size_t data_size = data.size(); - - len = fix_len_idx(data_size, idx, len); m_chars.resize(len); - size_t di = 0; - while (len-- > 0) + + len = fix_len_idx(data.size(), idx, len); + for (size_t di = 0; + len > 0; + di++, idx++, len--) { m_chars[di] = data[idx]; - di++; - idx++; } + m_logok = false; } From 8732d87152a250294d34ff551fd707f17ac8385b Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Wed, 1 Nov 2017 20:30:41 +0100 Subject: [PATCH 069/136] refactor unc_text::resize adds early return check to minimize indent --- src/unc_text.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/unc_text.cpp b/src/unc_text.cpp index 91c7d0629f..0a8928f2c0 100644 --- a/src/unc_text.cpp +++ b/src/unc_text.cpp @@ -205,11 +205,13 @@ void unc_text::set(const value_type &data, size_t idx, size_t len) void unc_text::resize(size_t new_size) { - if (size() != new_size) + if (size() == new_size) { - m_chars.resize(new_size); - m_logok = false; + return; } + + m_chars.resize(new_size); + m_logok = false; } From e073a1b36568feb02f6862880e925623bf1934b8 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Wed, 1 Nov 2017 20:31:49 +0100 Subject: [PATCH 070/136] refactor unc_text::insert removes useless casts --- src/unc_text.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/unc_text.cpp b/src/unc_text.cpp index 0a8928f2c0..5efbcad9ea 100644 --- a/src/unc_text.cpp +++ b/src/unc_text.cpp @@ -224,14 +224,14 @@ void unc_text::clear() void unc_text::insert(size_t idx, int ch) { - m_chars.insert(m_chars.begin() + static_cast(idx), ch); + m_chars.insert(m_chars.begin() + idx, ch); m_logok = false; } void unc_text::insert(size_t idx, const unc_text &ref) { - m_chars.insert(m_chars.begin() + static_cast(idx), ref.m_chars.begin(), ref.m_chars.end()); + m_chars.insert(m_chars.begin() + idx, ref.m_chars.begin(), ref.m_chars.end()); m_logok = false; } From c3bf684343fdde0f716e8a38a47c9fb60d382c8c Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Wed, 1 Nov 2017 20:28:00 +0100 Subject: [PATCH 071/136] refactor unc_text::erase removes useless casts adds early return check to minimize indent --- src/unc_text.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/unc_text.cpp b/src/unc_text.cpp index 5efbcad9ea..e08f077979 100644 --- a/src/unc_text.cpp +++ b/src/unc_text.cpp @@ -374,10 +374,12 @@ int unc_text::rfind(const char *text, size_t sidx) const void unc_text::erase(size_t idx, size_t len) { - if (len >= 1) + if (len == 0) { - m_chars.erase(m_chars.begin() + static_cast(idx), m_chars.begin() + static_cast(idx) + static_cast(len)); + return; } + + m_chars.erase(m_chars.begin() + idx, m_chars.begin() + idx + len); } From 6aa63dbe23c4b5384a2b11364d61fefcc1dcbf34 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Wed, 1 Nov 2017 20:28:32 +0100 Subject: [PATCH 072/136] refactor unc_text::replace --- src/unc_text.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/unc_text.cpp b/src/unc_text.cpp index e08f077979..14271673b9 100644 --- a/src/unc_text.cpp +++ b/src/unc_text.cpp @@ -385,10 +385,11 @@ void unc_text::erase(size_t idx, size_t len) int unc_text::replace(const char *oldtext, const unc_text &newtext) { - int fidx = find(oldtext); - size_t olen = strlen(oldtext); - size_t rcnt = 0; - size_t newtext_size = newtext.size(); + const size_t olen = strlen(oldtext); + const size_t newtext_size = newtext.size(); + + int fidx = find(oldtext); + int rcnt = 0; while (fidx >= 0) { From 59b3fa7bc46afc8de1016f8fef2bf863d22383bb Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Wed, 1 Nov 2017 21:42:13 +0100 Subject: [PATCH 073/136] refactor unc_text::startswith replaces while loop with more appropriate for loops removes simplifies loop entrance check --- src/unc_text.cpp | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/unc_text.cpp b/src/unc_text.cpp index 14271673b9..baed48dd89 100644 --- a/src/unc_text.cpp +++ b/src/unc_text.cpp @@ -276,38 +276,34 @@ void unc_text::append(const value_type &data, size_t idx, size_t len) bool unc_text::startswith(const char *text, size_t idx) const { - bool match = false; + const auto orig_idx = idx; - while ((idx < size()) && *text) + for ( ; idx < size() && *text; idx++, text++) { if (*text != m_chars[idx]) { return(false); } - idx++; - text++; - match = true; } - return(match && (*text == 0)); + + return(idx != orig_idx && (*text == 0)); } bool unc_text::startswith(const unc_text &text, size_t idx) const { - bool match = false; - size_t si = 0; + size_t si = 0; + const auto orig_idx = idx; - while ((idx < size()) && (si < text.size())) + for ( ; idx < size() && si < text.size(); idx++, si++) { if (text.m_chars[si] != m_chars[idx]) { return(false); } - idx++; - si++; - match = true; } - return(match && (si == text.size())); + + return(idx != orig_idx && (si == text.size())); } From da85a0ca15ff081a7e5e68291e8102c51e0aa3b8 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Wed, 1 Nov 2017 21:51:41 +0100 Subject: [PATCH 074/136] refactor unc_text::find --- src/unc_text.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/unc_text.cpp b/src/unc_text.cpp index baed48dd89..ba97b0d79a 100644 --- a/src/unc_text.cpp +++ b/src/unc_text.cpp @@ -309,15 +309,15 @@ bool unc_text::startswith(const unc_text &text, size_t idx) const int unc_text::find(const char *text, size_t sidx) const { - size_t len = strlen(text); // the length of 'text' we are looking for - size_t si = size(); // the length of the string we are looking in + const size_t len = strlen(text); // the length of 'text' we are looking for + const size_t si = size(); // the length of the string we are looking in - if (si < len) // not enough place for 'text' + if (si < len) // not enough place for 'text' { return(-1); } - size_t midx = size() - len; + const size_t midx = si - len; for (size_t idx = sidx; idx <= midx; idx++) { bool match = true; @@ -392,6 +392,7 @@ int unc_text::replace(const char *oldtext, const unc_text &newtext) rcnt++; erase(static_cast(fidx), olen); insert(static_cast(fidx), newtext); + fidx = find(oldtext, static_cast(fidx) + newtext_size - olen + 1); } return(rcnt); From 34fb83c8282cdec39e5b331ad56795f1b3bc83b2 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Thu, 2 Nov 2017 02:24:48 +0100 Subject: [PATCH 075/136] prevent windows.h min/max macros --- src/newlines.cpp | 2 ++ src/space.cpp | 2 ++ src/windows_compat.h | 1 + 3 files changed, 5 insertions(+) diff --git a/src/newlines.cpp b/src/newlines.cpp index a846a60d0d..454e9db652 100644 --- a/src/newlines.cpp +++ b/src/newlines.cpp @@ -33,6 +33,8 @@ #include "keywords.h" #include "options.h" +#include + using namespace std; diff --git a/src/space.cpp b/src/space.cpp index fbb668e73a..d3a710e2c0 100644 --- a/src/space.cpp +++ b/src/space.cpp @@ -29,6 +29,8 @@ #include "unc_ctype.h" #include "uncrustify.h" +#include + using namespace std; diff --git a/src/windows_compat.h b/src/windows_compat.h index 567453486a..9b8bb8b35d 100644 --- a/src/windows_compat.h +++ b/src/windows_compat.h @@ -9,6 +9,7 @@ #ifndef WINDOWS_COMPAT_H_INCLUDED #define WINDOWS_COMPAT_H_INCLUDED +#define NOMINMAX #include "windows.h" #define HAVE_SYS_STAT_H From c44f3e9ddbf3db3f482bb59af4ca26f115bfb68a Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Fri, 3 Nov 2017 16:50:19 +0100 Subject: [PATCH 076/136] prevent indent_pse_push SEGV --- src/indent.cpp | 15 +++++++++++++-- tests/c.test | 3 ++- tests/input/c/i1413.c | 1 + tests/output/c/09613-i1413.c | 1 + 4 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 tests/input/c/i1413.c create mode 100644 tests/output/c/09613-i1413.c diff --git a/src/indent.cpp b/src/indent.cpp index 8e8401dc69..2f344147d6 100644 --- a/src/indent.cpp +++ b/src/indent.cpp @@ -384,6 +384,12 @@ void reindent_line(chunk_t *pc, size_t column) static void indent_pse_push(parse_frame_t &frm, chunk_t *pc) { LOG_FUNC_ENTRY(); + if (pc == nullptr) + { + throw std::invalid_argument( + string(__func__) + ":" + std::to_string(__LINE__) + + " - pc cannot be nullptr"); + } static size_t ref = 0; // check the stack depth @@ -417,7 +423,7 @@ static void indent_pse_push(parse_frame_t &frm, chunk_t *pc) log_flush(true); exit(EXIT_FAILURE); } -} +} // indent_pse_push static void indent_pse_pop(parse_frame_t &frm, chunk_t *pc) @@ -821,7 +827,12 @@ void indent_text(void) // Transition into a preproc by creating a dummy indent frm.level++; - indent_pse_push(frm, chunk_get_next(pc)); + chunk_t *pp_next = chunk_get_next(pc); + if (pp_next == nullptr) + { + return; + } + indent_pse_push(frm, pp_next); if ( pc->parent_type == CT_PP_DEFINE || pc->parent_type == CT_PP_UNDEF) diff --git a/tests/c.test b/tests/c.test index 2ed73af2fa..1dde9d45cd 100644 --- a/tests/c.test +++ b/tests/c.test @@ -324,5 +324,6 @@ 09610 bug_i_876.cfg c/bug_i_876.c 09611 bug_i_222.cfg c/bug_i_222.c 09612 bug_1041.cfg c/bug_1041.c +09613 empty.cfg c/i1413.c -10005 enable_processing_cmt-empty.cfg c/i1270.c \ No newline at end of file +10005 enable_processing_cmt-empty.cfg c/i1270.c diff --git a/tests/input/c/i1413.c b/tests/input/c/i1413.c new file mode 100644 index 0000000000..4287ca8617 --- /dev/null +++ b/tests/input/c/i1413.c @@ -0,0 +1 @@ +# \ No newline at end of file diff --git a/tests/output/c/09613-i1413.c b/tests/output/c/09613-i1413.c new file mode 100644 index 0000000000..4287ca8617 --- /dev/null +++ b/tests/output/c/09613-i1413.c @@ -0,0 +1 @@ +# \ No newline at end of file From d8dde83a33d6c2be38810a0b760a5eb01fd13ee3 Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Fri, 3 Nov 2017 17:53:47 +0100 Subject: [PATCH 077/136] Prepare the version 0.66 --- CMakeLists.txt | 2 +- ChangeLog | 26 ++++++++++++++++++++++++++ README.md | 2 +- TESTING | 2 ++ documentation/htdocs/index.html | 2 +- package.json | 2 +- release-steps.txt | 5 ++++- scripts/prepare_list_of_authors.sh | 26 ++++++++++++++++++++++++++ 8 files changed, 62 insertions(+), 5 deletions(-) create mode 100755 scripts/prepare_list_of_authors.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index 22c59a7630..32ff43f7aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -121,7 +121,7 @@ endif() # # FIXME: the version number should be automatically integrated -set(CURRENT_VERSION "Uncrustify-0.65_f") +set(CURRENT_VERSION "Uncrustify-0.66_f") option(NoGitVersionString "Do not use make_version.py and git to build a version string" OFF) if(NOT NoGitVersionString) diff --git a/ChangeLog b/ChangeLog index 9fe07fba3c..9011023991 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,29 @@ +Change highlights in uncrustify-0.66 (November 2017) +------------------------------------------------------------------------------- + +New options: + - sp_angle_colon Oct 17 + - nl_func_call_empty Sep 30 + - nl_func_call_paren_empty Sep 30 + - align_func_params_span Sep 29 + - align_func_params_thresh Sep 29 + - align_func_params_gap Sep 29 + - nl_func_call_paren Jul 25 + - indent_paren_after_func_def Jul 21 + - indent_paren_after_func_decl Jul 21 + - indent_paren_after_func_call Jul 21 + - nl_func_paren_empty Jul 07 + - nl_func_def_paren_empty Jul 07 + - indent_switch_pp Jun 22 + - pp_indent_case Jun 22 + - pp_indent_func_def Jun 22 + - pp_indent_extern Jun 22 + - pp_indent_brace Jun 22 + +Bugfix: + - Issue # 548, 1098, 1103, 1108, 1112, 1127, 1134, 1158, 1165, 1170, 1187, + 1200, 1203, 1310, 1315, 1340, 1349, 1352, 1366 are fixed + Change highlights in uncrustify-0.65 (May 2017) ------------------------------------------------------------------------------- diff --git a/README.md b/README.md index 84c3a9a494..74cb4133b8 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ A source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA ## Features -* highly configurable - __590__ configurable options as of version 0.65 +* highly configurable - __608 configurable options as of version 0.66 -
      add/remove spaces - `sp_before_sparen`: _Add or remove space before '(' of 'if', 'for', 'switch', 'while', etc._ diff --git a/TESTING b/TESTING index afb59b0951..ab3779f9c8 100644 --- a/TESTING +++ b/TESTING @@ -103,3 +103,5 @@ Features - Tip: There are also a few options to run_tests.py that can help. Most interesting is '-d' will run 'diff' if the test fails. +- Tip: If some errors occur with Windows, set the macro variable + NO_MACRO_VARARG to 1 to test some more pointer under Linux. diff --git a/documentation/htdocs/index.html b/documentation/htdocs/index.html index dd7b813aa8..dbe8bcfb69 100644 --- a/documentation/htdocs/index.html +++ b/documentation/htdocs/index.html @@ -54,7 +54,7 @@

      Features

    • Add or remove parens on return statements
    • Add or remove braces on single-statement if/do/while/for statements
    • Supports embedded SQL 'EXEC SQL' stuff
      • -
    • Highly configurable - 590 configurable options as of version 0.65
      • +
    • Highly configurable - 608 configurable options as of version 0.66

    diff --git a/package.json b/package.json index adf06b806f..24599e7709 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uncrustify", - "version": "0.65", + "version": "0.66", "description": "A highly configurable, easily modifiable source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA", "main": "uncrustify", "scripts": { diff --git a/release-steps.txt b/release-steps.txt index 0affe4b175..a54bf90806 100644 --- a/release-steps.txt +++ b/release-steps.txt @@ -15,7 +15,7 @@ Just in case I don't do a release for a while and forget what to do... =) ChangeLog CMakeLists.txt At lines under "# Generate uncrustify_version.h" - (Check the value of "FALLBACK_VERSION") + (Check the value of "CURRENT_VERSION", such as "Uncrustify-0.66_f") documentation/htdocs/index.html At line

  • Highly configurable TODO: (automat for this) Change the values of and version. @@ -23,6 +23,9 @@ Just in case I don't do a release for a while and forget what to do... =) At line "version" the number At line "preinstall" At line "url" + README.md + At line * highly configurable + TODO: (automat for this) Change the values of options and version. 2b. Update the option count in documentation/htdocs/index.html Use script/count_the_options.sh to count the options. diff --git a/scripts/prepare_list_of_authors.sh b/scripts/prepare_list_of_authors.sh new file mode 100755 index 0000000000..e5b39519a5 --- /dev/null +++ b/scripts/prepare_list_of_authors.sh @@ -0,0 +1,26 @@ +#! /bin/sh +# +# Prepare the list of authors +# guy maurel +# 2017-11-02 +# +LIST_1="TheListOfAuthors.txt" +echo "Author:" > ${LIST_1} +echo "2005 - 2016 : Ben Gardner" >> ${LIST_1} +echo "" >> ${LIST_1} +echo "Maintenance:" >> ${LIST_1} +echo "Guy Maurel" >> ${LIST_1} +echo "" >> ${LIST_1} +echo "Other collaborators:" >> ${LIST_1} +git log --format='%aN' \ + | sort -u \ + | grep -v "^ben$" \ + | grep -v "^bengardner$" \ + | grep -v "^CDanU$" \ + | grep -v "^brmqk3$" \ + | grep -v "^gmaurel$" \ + | grep -v "^Gilles$" \ + | grep -v "^void$" \ + >> ${LIST_1} +# +mv ${LIST_1} AUTHORS From b52ce4776029a553d5dcbc8e4dd7813fb9762def Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Fri, 3 Nov 2017 18:00:35 +0100 Subject: [PATCH 078/136] update emscripten interface --- emscripten/libUncrustify.d.ts | 14 ++++++++++++++ src/uncrustify_emscripten.cpp | 16 +++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/emscripten/libUncrustify.d.ts b/emscripten/libUncrustify.d.ts index 4632e30212..9412021054 100644 --- a/emscripten/libUncrustify.d.ts +++ b/emscripten/libUncrustify.d.ts @@ -76,6 +76,7 @@ declare namespace LibUncrustify UO_utf8_byte : EmscriptenEnumTypeObject; UO_utf8_force : EmscriptenEnumTypeObject; UO_sp_arith : EmscriptenEnumTypeObject; + UO_sp_arith_additive : EmscriptenEnumTypeObject; UO_sp_assign : EmscriptenEnumTypeObject; UO_sp_cpp_lambda_assign : EmscriptenEnumTypeObject; UO_sp_cpp_lambda_paren : EmscriptenEnumTypeObject; @@ -115,6 +116,7 @@ declare namespace LibUncrustify UO_sp_template_angle : EmscriptenEnumTypeObject; UO_sp_before_angle : EmscriptenEnumTypeObject; UO_sp_inside_angle : EmscriptenEnumTypeObject; + UO_sp_angle_colon : EmscriptenEnumTypeObject; UO_sp_after_angle : EmscriptenEnumTypeObject; UO_sp_angle_paren : EmscriptenEnumTypeObject; UO_sp_angle_paren_empty : EmscriptenEnumTypeObject; @@ -314,6 +316,9 @@ declare namespace LibUncrustify UO_indent_access_spec_body : EmscriptenEnumTypeObject; UO_indent_paren_nl : EmscriptenEnumTypeObject; UO_indent_paren_close : EmscriptenEnumTypeObject; + UO_indent_paren_after_func_def : EmscriptenEnumTypeObject; + UO_indent_paren_after_func_decl : EmscriptenEnumTypeObject; + UO_indent_paren_after_func_call : EmscriptenEnumTypeObject; UO_indent_comma_paren : EmscriptenEnumTypeObject; UO_indent_bool_paren : EmscriptenEnumTypeObject; UO_indent_first_bool_expr : EmscriptenEnumTypeObject; @@ -414,6 +419,8 @@ declare namespace LibUncrustify UO_nl_func_paren_empty : EmscriptenEnumTypeObject; UO_nl_func_def_paren : EmscriptenEnumTypeObject; UO_nl_func_def_paren_empty : EmscriptenEnumTypeObject; + UO_nl_func_call_paren : EmscriptenEnumTypeObject; + UO_nl_func_call_paren_empty : EmscriptenEnumTypeObject; UO_nl_func_decl_start : EmscriptenEnumTypeObject; UO_nl_func_def_start : EmscriptenEnumTypeObject; UO_nl_func_decl_start_single : EmscriptenEnumTypeObject; @@ -432,6 +439,7 @@ declare namespace LibUncrustify UO_nl_func_def_end_multi_line : EmscriptenEnumTypeObject; UO_nl_func_decl_empty : EmscriptenEnumTypeObject; UO_nl_func_def_empty : EmscriptenEnumTypeObject; + UO_nl_func_call_empty : EmscriptenEnumTypeObject; UO_nl_func_call_start_multi_line : EmscriptenEnumTypeObject; UO_nl_func_call_args_multi_line : EmscriptenEnumTypeObject; UO_nl_func_call_end_multi_line : EmscriptenEnumTypeObject; @@ -532,6 +540,9 @@ declare namespace LibUncrustify UO_align_number_right : EmscriptenEnumTypeObject; UO_align_keep_extra_space : EmscriptenEnumTypeObject; UO_align_func_params : EmscriptenEnumTypeObject; + UO_align_func_params_span : EmscriptenEnumTypeObject; + UO_align_func_params_thresh : EmscriptenEnumTypeObject; + UO_align_func_params_gap : EmscriptenEnumTypeObject; UO_align_same_func_call_params : EmscriptenEnumTypeObject; UO_align_var_def_span : EmscriptenEnumTypeObject; UO_align_var_def_star_style : EmscriptenEnumTypeObject; @@ -690,6 +701,7 @@ declare namespace LibUncrustify AT_POS : EmscriptenEnumTypeObject; AT_STRING : EmscriptenEnumTypeObject; AT_UNUM : EmscriptenEnumTypeObject; + AT_TFI : EmscriptenEnumTypeObject; } export interface LogSev extends EmscriptenEnumType @@ -906,7 +918,9 @@ declare namespace LibUncrustify CT_PRIVATE : EmscriptenEnumTypeObject; CT_PRIVATE_COLON : EmscriptenEnumTypeObject; CT_THROW : EmscriptenEnumTypeObject; + CT_NOEXCEPT : EmscriptenEnumTypeObject; CT_TRY : EmscriptenEnumTypeObject; + CT_BRACED_INIT_LIST : EmscriptenEnumTypeObject; CT_USING : EmscriptenEnumTypeObject; CT_USING_STMT : EmscriptenEnumTypeObject; CT_D_WITH : EmscriptenEnumTypeObject; diff --git a/src/uncrustify_emscripten.cpp b/src/uncrustify_emscripten.cpp index 76a2fbe292..e8280db134 100644 --- a/src/uncrustify_emscripten.cpp +++ b/src/uncrustify_emscripten.cpp @@ -657,6 +657,7 @@ EMSCRIPTEN_BINDINGS(MainModule) .value(STRINGIFY(UO_utf8_byte), UO_utf8_byte) .value(STRINGIFY(UO_utf8_force), UO_utf8_force) .value(STRINGIFY(UO_sp_arith), UO_sp_arith) + .value(STRINGIFY(UO_sp_arith_additive), UO_sp_arith_additive) .value(STRINGIFY(UO_sp_assign), UO_sp_assign) .value(STRINGIFY(UO_sp_cpp_lambda_assign), UO_sp_cpp_lambda_assign) .value(STRINGIFY(UO_sp_cpp_lambda_paren), UO_sp_cpp_lambda_paren) @@ -696,6 +697,7 @@ EMSCRIPTEN_BINDINGS(MainModule) .value(STRINGIFY(UO_sp_template_angle), UO_sp_template_angle) .value(STRINGIFY(UO_sp_before_angle), UO_sp_before_angle) .value(STRINGIFY(UO_sp_inside_angle), UO_sp_inside_angle) + .value(STRINGIFY(UO_sp_angle_colon), UO_sp_angle_colon) .value(STRINGIFY(UO_sp_after_angle), UO_sp_after_angle) .value(STRINGIFY(UO_sp_angle_paren), UO_sp_angle_paren) .value(STRINGIFY(UO_sp_angle_paren_empty), UO_sp_angle_paren_empty) @@ -895,6 +897,9 @@ EMSCRIPTEN_BINDINGS(MainModule) .value(STRINGIFY(UO_indent_access_spec_body), UO_indent_access_spec_body) .value(STRINGIFY(UO_indent_paren_nl), UO_indent_paren_nl) .value(STRINGIFY(UO_indent_paren_close), UO_indent_paren_close) + .value(STRINGIFY(UO_indent_paren_after_func_def), UO_indent_paren_after_func_def) + .value(STRINGIFY(UO_indent_paren_after_func_decl), UO_indent_paren_after_func_decl) + .value(STRINGIFY(UO_indent_paren_after_func_call), UO_indent_paren_after_func_call) .value(STRINGIFY(UO_indent_comma_paren), UO_indent_comma_paren) .value(STRINGIFY(UO_indent_bool_paren), UO_indent_bool_paren) .value(STRINGIFY(UO_indent_first_bool_expr), UO_indent_first_bool_expr) @@ -995,6 +1000,8 @@ EMSCRIPTEN_BINDINGS(MainModule) .value(STRINGIFY(UO_nl_func_paren_empty), UO_nl_func_paren_empty) .value(STRINGIFY(UO_nl_func_def_paren), UO_nl_func_def_paren) .value(STRINGIFY(UO_nl_func_def_paren_empty), UO_nl_func_def_paren_empty) + .value(STRINGIFY(UO_nl_func_call_paren), UO_nl_func_call_paren) + .value(STRINGIFY(UO_nl_func_call_paren_empty), UO_nl_func_call_paren_empty) .value(STRINGIFY(UO_nl_func_decl_start), UO_nl_func_decl_start) .value(STRINGIFY(UO_nl_func_def_start), UO_nl_func_def_start) .value(STRINGIFY(UO_nl_func_decl_start_single), UO_nl_func_decl_start_single) @@ -1013,6 +1020,7 @@ EMSCRIPTEN_BINDINGS(MainModule) .value(STRINGIFY(UO_nl_func_def_end_multi_line), UO_nl_func_def_end_multi_line) .value(STRINGIFY(UO_nl_func_decl_empty), UO_nl_func_decl_empty) .value(STRINGIFY(UO_nl_func_def_empty), UO_nl_func_def_empty) + .value(STRINGIFY(UO_nl_func_call_empty), UO_nl_func_call_empty) .value(STRINGIFY(UO_nl_func_call_start_multi_line), UO_nl_func_call_start_multi_line) .value(STRINGIFY(UO_nl_func_call_args_multi_line), UO_nl_func_call_args_multi_line) .value(STRINGIFY(UO_nl_func_call_end_multi_line), UO_nl_func_call_end_multi_line) @@ -1113,6 +1121,9 @@ EMSCRIPTEN_BINDINGS(MainModule) .value(STRINGIFY(UO_align_number_right), UO_align_number_right) .value(STRINGIFY(UO_align_keep_extra_space), UO_align_keep_extra_space) .value(STRINGIFY(UO_align_func_params), UO_align_func_params) + .value(STRINGIFY(UO_align_func_params_span), UO_align_func_params_span) + .value(STRINGIFY(UO_align_func_params_thresh), UO_align_func_params_thresh) + .value(STRINGIFY(UO_align_func_params_gap), UO_align_func_params_gap) .value(STRINGIFY(UO_align_same_func_call_params), UO_align_same_func_call_params) .value(STRINGIFY(UO_align_var_def_span), UO_align_var_def_span) .value(STRINGIFY(UO_align_var_def_star_style), UO_align_var_def_star_style) @@ -1266,7 +1277,8 @@ EMSCRIPTEN_BINDINGS(MainModule) .value(STRINGIFY(AT_LINE), AT_LINE) .value(STRINGIFY(AT_POS), AT_POS) .value(STRINGIFY(AT_STRING), AT_STRING) - .value(STRINGIFY(AT_UNUM), AT_UNUM); + .value(STRINGIFY(AT_UNUM), AT_UNUM) + .value(STRINGIFY(AT_TFI), AT_TFI); enum_(STRINGIFY(log_sev_t)) .value(STRINGIFY(LSYS), LSYS) @@ -1479,7 +1491,9 @@ EMSCRIPTEN_BINDINGS(MainModule) .value(STRINGIFY(CT_PRIVATE), CT_PRIVATE) .value(STRINGIFY(CT_PRIVATE_COLON), CT_PRIVATE_COLON) .value(STRINGIFY(CT_THROW), CT_THROW) + .value(STRINGIFY(CT_NOEXCEPT), CT_NOEXCEPT) .value(STRINGIFY(CT_TRY), CT_TRY) + .value(STRINGIFY(CT_BRACED_INIT_LIST), CT_BRACED_INIT_LIST) .value(STRINGIFY(CT_USING), CT_USING) .value(STRINGIFY(CT_USING_STMT), CT_USING_STMT) .value(STRINGIFY(CT_D_WITH), CT_D_WITH) From 0db7d367bad1214c7c7d9012ccb2c94cbce72913 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Fri, 3 Nov 2017 20:46:09 +0100 Subject: [PATCH 079/136] generate better embedded 0 error --- src/uncrustify.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/uncrustify.cpp b/src/uncrustify.cpp index 7ba842925c..8f07bcabb2 100644 --- a/src/uncrustify.cpp +++ b/src/uncrustify.cpp @@ -1716,16 +1716,26 @@ void uncrustify_file(const file_mem &fm, FILE *pfout, } // Check for embedded 0's (represents a decoding failure or corrupt file) + size_t count_line = 1; + size_t count_column = 1; for (int idx = 0; idx < static_cast(data.size()) - 1; idx++) { if (data[idx] == 0) { - LOG_FMT(LERR, "An embedded 0 was found in '%s'.\n", cpd.filename); + LOG_FMT(LERR, "An embedded 0 was found in '%s' %zu:%zu.\n", + cpd.filename, count_line, count_column); LOG_FMT(LERR, "The file may be encoded in an unsupported Unicode format.\n"); LOG_FMT(LERR, "Aborting.\n"); cpd.error_count++; return; } + + count_column++; + if (data[idx] == '\n') + { + count_line++; + count_column = 1; + } } uncrustify_start(data); From 1c38231a59535aedff079f0b8408514d482aaf1b Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Tue, 31 Oct 2017 17:26:38 +0100 Subject: [PATCH 080/136] add toLogTextUtf8 --- src/unc_text.cpp | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/src/unc_text.cpp b/src/unc_text.cpp index ba97b0d79a..1b9ba7ff50 100644 --- a/src/unc_text.cpp +++ b/src/unc_text.cpp @@ -15,6 +15,23 @@ using namespace std; static size_t fix_len_idx(size_t size, size_t idx, size_t len); +//! converts \n and \r chars are into NL and CR UTF8 symbols before encode_utf8 is called +static void toLogTextUtf8(int m_char, vector &container); + + +static void toLogTextUtf8(int m_char, vector &container) +{ + if (m_char == '\n') + { + m_char = 0x2424; // NL symbol + } + else if (m_char == '\r') + { + m_char = 0x240d; // CR symbol + } + encode_utf8(m_char, container); +} + static size_t fix_len_idx(size_t size, size_t idx, size_t len) { @@ -40,15 +57,7 @@ void unc_text::update_logtext() m_logtext.reserve(m_chars.size() * 3); for (int m_char : m_chars) { - if (m_char == '\n') - { - m_char = 0x2424; // NL symbol - } - else if (m_char == '\r') - { - m_char = 0x240d; // CR symbol - } - encode_utf8(m_char, m_logtext); + toLogTextUtf8(m_char, m_logtext); } m_logtext.push_back(0); m_logok = true; From d1b234632b1a38e49e6bcf0024490c20ad8663f0 Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Sat, 4 Nov 2017 18:38:57 +0100 Subject: [PATCH 081/136] Add some more info. --- README.md | 4 ++++ release-steps.txt | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 74cb4133b8..04e77631df 100644 --- a/README.md +++ b/README.md @@ -133,6 +133,10 @@ More about this is in the [ISSUE_TEMPLATE](https://github.com/uncrustify/uncrust [Look at the Wiki](https://github.com/uncrustify/uncrustify/wiki/Known-Problems) +## Which repositories have uncrustify? +[Look here](https://repology.org/metapackage/uncrustify/versions) + + ## Contribute If you want to add a feature, fix a bug, or implement missing functionality, feel free to do so! Patches are welcome! diff --git a/release-steps.txt b/release-steps.txt index a54bf90806..305152730d 100644 --- a/release-steps.txt +++ b/release-steps.txt @@ -1,7 +1,8 @@ -2017-05-05 +2017-11-05 Release steps. Just in case I don't do a release for a while and forget what to do... =) +Change the date at the first line of this document. 1. Make sure CI (continuous integration - Travis and AppVeyor) has passed. This should ensure all tests pass and building From be283c00baf442c486a6a3434012c15332b2572c Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Sun, 5 Nov 2017 02:34:40 +0100 Subject: [PATCH 082/136] unc_text move header functions --- src/unc_text.cpp | 172 +++++++++++++++++++++++++++++++++++++++++++++++ src/unc_text.h | 172 ++++++++--------------------------------------- 2 files changed, 199 insertions(+), 145 deletions(-) diff --git a/src/unc_text.cpp b/src/unc_text.cpp index 1b9ba7ff50..c90694601e 100644 --- a/src/unc_text.cpp +++ b/src/unc_text.cpp @@ -45,6 +45,178 @@ static size_t fix_len_idx(size_t size, size_t idx, size_t len) } +unc_text::unc_text() + : m_logok(false) +{ +} + + +unc_text::unc_text(const unc_text &ref) +{ + set(ref); +} + + +unc_text::unc_text(const unc_text &ref, size_t idx, size_t len) +{ + set(ref, idx, len); +} + + +unc_text::unc_text(const char *ascii_text) +{ + set(ascii_text); +} + + +unc_text::unc_text(const std::string &ascii_text) +{ + set(ascii_text); +} + + +unc_text::unc_text(const value_type &data, size_t idx, size_t len) +{ + set(data, idx, len); +} + + +size_t unc_text::size() const +{ + return(m_chars.size()); +} + + +unc_text &unc_text::operator =(int ch) +{ + set(ch); + return(*this); +} + + +unc_text &unc_text::operator =(const unc_text &ref) +{ + set(ref); + return(*this); +} + + +unc_text &unc_text::operator =(const std::string &ascii_text) +{ + set(ascii_text); + return(*this); +} + + +unc_text &unc_text::operator =(const char *ascii_text) +{ + set(ascii_text); + return(*this); +} + + +unc_text &unc_text::operator +=(int ch) +{ + append(ch); + return(*this); +} + + +unc_text &unc_text::operator +=(const unc_text &ref) +{ + append(ref); + return(*this); +} + + +unc_text &unc_text::operator +=(const std::string &ascii_text) +{ + append(ascii_text); + return(*this); +} + + +unc_text &unc_text::operator +=(const char *ascii_text) +{ + append(ascii_text); + return(*this); +} + + +unc_text::value_type &unc_text::get() +{ + m_logok = false; + return(m_chars); +} + + +const unc_text::value_type &unc_text::get() const +{ + return(m_chars); +} + + +int unc_text::operator[](size_t idx) const +{ + return((idx < m_chars.size()) ? m_chars[idx] : 0); +} + + +int &unc_text::at(size_t idx) +{ + return(m_chars.at(idx)); +} + + +const int &unc_text::at(size_t idx) const +{ + return(m_chars.at(idx)); +} + + +const int &unc_text::back() const +{ + return(m_chars.back()); +} + + +int &unc_text::back() +{ + // TODO: returning a temporary via a reference this has to be checked and probably changed + return(m_chars.back()); +} + + +void unc_text::push_back(int ch) +{ + append(ch); +} + + +void unc_text::pop_back() +{ + if (size() == 0) + { + return; + } + + m_chars.pop_back(); + update_logtext(); +} + + +void unc_text::pop_front() +{ + if (size() == 0) + { + return; + } + + m_chars.pop_front(); + update_logtext(); +} + + void unc_text::update_logtext() { if (m_logok) diff --git a/src/unc_text.h b/src/unc_text.h index 8a9a1fdbb4..92e5a5a276 100644 --- a/src/unc_text.h +++ b/src/unc_text.h @@ -26,45 +26,20 @@ class unc_text typedef std::deque value_type; // double encoded list of int values public: - unc_text() - : m_logok(false) - { - } + unc_text(); + unc_text(const unc_text &ref); - ~unc_text() - { - } + unc_text(const unc_text &ref, size_t idx, size_t len = 0); + unc_text(const char *ascii_text); - unc_text(const unc_text &ref) - { - set(ref); - } + unc_text(const std::string &ascii_text); + unc_text(const value_type &data, size_t idx = 0, size_t len = 0); - unc_text(const unc_text &ref, size_t idx, size_t len = 0) - { - set(ref, idx, len); - } - - unc_text(const char *ascii_text) - { - set(ascii_text); - } - - - unc_text(const std::string &ascii_text) - { - set(ascii_text); - } - - - unc_text(const value_type &data, size_t idx = 0, size_t len = 0) - { - set(data, idx, len); - } + ~unc_text() = default; void resize(size_t new_size); @@ -74,61 +49,33 @@ class unc_text //! grab the number of characters - size_t size() const - { - return(m_chars.size()); - } + size_t size() const; void set(int ch); - void set(const unc_text &ref); - void set(const unc_text &ref, size_t idx, size_t len = 0); - void set(const std::string &ascii_text); - void set(const char *ascii_text); - void set(const value_type &data, size_t idx = 0, size_t len = 0); - unc_text &operator =(int ch) - { - set(ch); - return(*this); - } - - - unc_text &operator =(const unc_text &ref) - { - set(ref); - return(*this); - } - + unc_text &operator =(int ch); - unc_text &operator =(const std::string &ascii_text) - { - set(ascii_text); - return(*this); - } + unc_text &operator =(const unc_text &ref); + unc_text &operator =(const std::string &ascii_text); - unc_text &operator =(const char *ascii_text) - { - set(ascii_text); - return(*this); - } + unc_text &operator =(const char *ascii_text); void insert(size_t idx, int ch); - void insert(size_t idx, const unc_text &ref); @@ -138,14 +85,11 @@ class unc_text //! Add a unc_text character to an unc_text void append(int ch); - void append(const unc_text &ref); - //! Add a string to an unc_text void append(const std::string &ascii_text); - /** * Add a variable length string to an unc_text. * The variable length string format is similar as for printf @@ -156,36 +100,16 @@ class unc_text */ void append(const char *ascii_text); - void append(const value_type &data, size_t idx = 0, size_t len = 0); - unc_text &operator +=(int ch) - { - append(ch); - return(*this); - } - + unc_text &operator +=(int ch); - unc_text &operator +=(const unc_text &ref) - { - append(ref); - return(*this); - } + unc_text &operator +=(const unc_text &ref); + unc_text &operator +=(const std::string &ascii_text); - unc_text &operator +=(const std::string &ascii_text) - { - append(ascii_text); - return(*this); - } - - - unc_text &operator +=(const char *ascii_text) - { - append(ascii_text); - return(*this); - } + unc_text &operator +=(const char *ascii_text); //! Returns the UTF-8 string for logging @@ -210,82 +134,40 @@ class unc_text //! grab the data as a series of ints for outputting to a file - value_type &get() - { - m_logok = false; - return(m_chars); - } - + value_type & get(); - const value_type &get() const - { - return(m_chars); - } + const value_type &get() const; - int operator[](size_t idx) const - { - return((idx < m_chars.size()) ? m_chars[idx] : 0); - } + int operator[](size_t idx) const; // throws an exception if out of bounds - int &at(size_t idx) - { - return(m_chars.at(idx)); - } + int &at(size_t idx); + const int &at(size_t idx) const; - const int &at(size_t idx) const - { - return(m_chars.at(idx)); - } - - const int &back() const - { - return(m_chars.back()); - } + const int &back() const; //! returns the last element of the character list - int &back() - { - // TODO: returning a temporary via a reference this has to be checked and probably changed - return(m_chars.back()); - } + int &back(); - void push_back(int ch) - { - append(ch); - } + void push_back(int ch); - void pop_back() - { - if (size() > 0) - { - m_chars.pop_back(); - m_logok = false; - } - } + void pop_back(); - void pop_front() - { - if (size() > 0) - { - m_chars.pop_front(); - m_logok = false; - } - } + void pop_front(); bool startswith(const unc_text &text, size_t idx = 0) const; - bool startswith(const char *text, size_t idx = 0) const; + /** * look for 'text', beginning with position 'sidx' * From 93f9bfe0539c9c7b43eee88e3c8df180b6fb73b8 Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Sun, 5 Nov 2017 18:52:34 +0100 Subject: [PATCH 083/136] Adopt the method from aneesh1127 for #1236 --- src/indent.cpp | 22 ++++ src/options.cpp | 2 + src/options.h | 1 + tests/cli/Output/help.txt | 2 +- tests/cli/Output/mini_d_uc.txt | 1 + tests/cli/Output/mini_d_ucwd.txt | 3 + tests/cli/Output/mini_nd_uc.txt | 1 + tests/cli/Output/mini_nd_ucwd.txt | 3 + tests/cli/Output/show_config.txt | 3 + tests/config/bug_1236.cfg | 159 ++++++++++++++++++++++++++++ tests/cpp.test | 3 + tests/input/cpp/bug_1236.cpp | 14 +++ tests/output/cpp/34300-bug_1236.cpp | 14 +++ 13 files changed, 227 insertions(+), 1 deletion(-) create mode 100644 tests/config/bug_1236.cfg create mode 100644 tests/input/cpp/bug_1236.cpp create mode 100644 tests/output/cpp/34300-bug_1236.cpp diff --git a/src/indent.cpp b/src/indent.cpp index 2f344147d6..63045bd66a 100644 --- a/src/indent.cpp +++ b/src/indent.cpp @@ -1719,6 +1719,28 @@ void indent_text(void) } } } + else if ( pc->type == CT_PAREN_OPEN + && (pc->parent_type == CT_ASM || chunk_get_prev_ncnl(pc)->type == CT_ASM) + && cpd.settings[UO_indent_ignore_asm_block].b) + { + int move = 0; + chunk_t *tmp = chunk_skip_to_match(pc); + if ( chunk_is_newline(chunk_get_prev(pc)) + && pc->column != indent_column) + { + move = indent_column - pc->column; + } + else + { + move = pc->column - pc->orig_col; + } + do + { + pc->column = pc->orig_col + move; + pc = chunk_get_next(pc); + } while (pc != tmp); + reindent_line(pc, indent_column); + } else if ( pc->type == CT_PAREN_OPEN || pc->type == CT_SPAREN_OPEN || pc->type == CT_FPAREN_OPEN diff --git a/src/options.cpp b/src/options.cpp index e7c744ddfd..178c3f5a08 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -925,6 +925,8 @@ void register_options(void) "0: (Default) off\n" "1: When the `if_false` is a continuation, indent it under `if_false`\n" "2: When the `:` is a continuation, indent it under `?`", "", 0, 2); + unc_add_option("indent_ignore_asm_block", UO_indent_ignore_asm_block, AT_BOOL, + "If true, ignore indent and align for asm blocks as they have their own indentation."); unc_begin_group(UG_newline, "Newline adding and removing options"); unc_add_option("nl_collapse_empty_body", UO_nl_collapse_empty_body, AT_BOOL, diff --git a/src/options.h b/src/options.h index 1f43a987e1..2839c10706 100644 --- a/src/options.h +++ b/src/options.h @@ -429,6 +429,7 @@ enum uncrustify_options UO_indent_cpp_lambda_body, // indent cpp lambda or not UO_indent_using_block, // indent (or not) an using block if no braces are used, UO_indent_ternary_operator, // indent continuation of ternary operator + UO_indent_ignore_asm_block, // ignore indent and align for asm blocks as they have their own indentation // UO_indent_brace_struct, TODO: spaces to indent brace after struct/enum/union def // UO_indent_paren, TODO: indent for open paren on next line (1) // UO_indent, TODO: 0=don't change indentation, 1=change indentation diff --git a/tests/cli/Output/help.txt b/tests/cli/Output/help.txt index 20b94e9860..3562da9d9e 100644 --- a/tests/cli/Output/help.txt +++ b/tests/cli/Output/help.txt @@ -69,6 +69,6 @@ Note: Use comments containing ' *INDENT-OFF*' and ' *INDENT-ON*' to disable processing of parts of the source file (these can be overridden with enable_processing_cmt and disable_processing_cmt). -There are currently 608 options and minimal documentation. +There are currently 609 options and minimal documentation. Try UniversalIndentGUI and good luck. diff --git a/tests/cli/Output/mini_d_uc.txt b/tests/cli/Output/mini_d_uc.txt index 6f725bbc4d..33d7d70349 100644 --- a/tests/cli/Output/mini_d_uc.txt +++ b/tests/cli/Output/mini_d_uc.txt @@ -277,6 +277,7 @@ indent_token_after_brace = true indent_cpp_lambda_body = false indent_using_block = true indent_ternary_operator = 0 +indent_ignore_asm_block = false nl_collapse_empty_body = false nl_assign_leave_one_liners = false nl_class_leave_one_liners = false diff --git a/tests/cli/Output/mini_d_ucwd.txt b/tests/cli/Output/mini_d_ucwd.txt index a99a169625..7ec4037fd0 100644 --- a/tests/cli/Output/mini_d_ucwd.txt +++ b/tests/cli/Output/mini_d_ucwd.txt @@ -916,6 +916,9 @@ indent_using_block = true # false/true # 2: When the `:` is a continuation, indent it under `?` indent_ternary_operator = 0 # unsigned number +# If true, ignore indent and align for asm blocks as they have their own indentation. +indent_ignore_asm_block = false # false/true + # # Newline adding and removing options # diff --git a/tests/cli/Output/mini_nd_uc.txt b/tests/cli/Output/mini_nd_uc.txt index 3eac6a5a89..4e26873006 100644 --- a/tests/cli/Output/mini_nd_uc.txt +++ b/tests/cli/Output/mini_nd_uc.txt @@ -277,6 +277,7 @@ indent_token_after_brace = true indent_cpp_lambda_body = false indent_using_block = true indent_ternary_operator = 0 +indent_ignore_asm_block = false nl_collapse_empty_body = false nl_assign_leave_one_liners = false nl_class_leave_one_liners = false diff --git a/tests/cli/Output/mini_nd_ucwd.txt b/tests/cli/Output/mini_nd_ucwd.txt index 2eadbbb344..5519ee14df 100644 --- a/tests/cli/Output/mini_nd_ucwd.txt +++ b/tests/cli/Output/mini_nd_ucwd.txt @@ -916,6 +916,9 @@ indent_using_block = true # false/true # 2: When the `:` is a continuation, indent it under `?` indent_ternary_operator = 0 # unsigned number +# If true, ignore indent and align for asm blocks as they have their own indentation. +indent_ignore_asm_block = false # false/true + # # Newline adding and removing options # diff --git a/tests/cli/Output/show_config.txt b/tests/cli/Output/show_config.txt index 6a4d0e0069..6ccdc17739 100644 --- a/tests/cli/Output/show_config.txt +++ b/tests/cli/Output/show_config.txt @@ -915,6 +915,9 @@ indent_ternary_operator Unsigned Number 1: When the `if_false` is a continuation, indent it under `if_false` 2: When the `:` is a continuation, indent it under `?` +indent_ignore_asm_block { False, True } + If true, ignore indent and align for asm blocks as they have their own indentation. + # # Newline adding and removing options # diff --git a/tests/config/bug_1236.cfg b/tests/config/bug_1236.cfg new file mode 100644 index 0000000000..abea2b4c84 --- /dev/null +++ b/tests/config/bug_1236.cfg @@ -0,0 +1,159 @@ +indent_ignore_asm_block=true +# Uncrustify-0.65-86-360a8f0 +input_tab_size = 4 +string_replace_tab_chars = true +disable_processing_cmt = "*begin-nonstandard-formatting*" +enable_processing_cmt = "*end-nonstandard-formatting*" +utf8_bom = remove +sp_arith = add +sp_assign = add +sp_assign_default = add +sp_enum_assign = add +sp_pp_concat = remove +sp_pp_stringify = remove +sp_bool = add +sp_compare = add +sp_inside_paren = remove +sp_paren_paren = remove +sp_paren_brace = force +sp_after_type = ignore +sp_template_angle = remove +sp_before_angle = remove +sp_inside_angle = remove +sp_angle_paren = remove +sp_angle_paren_empty = remove +sp_angle_word = add +sp_angle_shift = remove +sp_before_sparen = force +sp_inside_sparen = remove +sp_after_sparen = add +sp_sparen_brace = force +sp_special_semi = force +sp_before_semi_for = remove +sp_before_semi_for_empty = remove +sp_after_semi_for_empty = remove +sp_before_square = remove +sp_before_squares = remove +sp_inside_square = remove +sp_after_comma = add +sp_before_comma = ignore +sp_after_mdatype_commas = remove +sp_before_mdatype_commas = remove +sp_between_mdatype_commas = remove +sp_paren_comma = remove +sp_after_class_colon = force +sp_before_class_colon = force +sp_after_operator = remove +sp_after_operator_sym = remove +sp_after_operator_sym_empty = remove +sp_after_cast = remove +sp_inside_paren_cast = remove +sp_cpp_cast_paren = remove +sp_sizeof_paren = remove +sp_inside_braces_enum = add +sp_inside_braces_empty = remove +sp_func_proto_paren = remove +sp_func_def_paren = remove +sp_inside_fparens = remove +sp_inside_fparen = remove +sp_fparen_brace = add +sp_func_call_paren = remove +sp_func_call_paren_empty = remove +sp_func_call_user_paren = remove +sp_func_class_paren = remove +sp_return_paren = add +sp_defined_paren = remove +sp_throw_paren = add +sp_catch_paren = add +sp_brace_typedef = add +sp_getset_brace = add +sp_after_dc = remove +sp_after_oc_scope = force +sp_after_oc_colon = remove +sp_before_oc_colon = remove +sp_after_oc_dict_colon = force +sp_before_oc_dict_colon = remove +sp_after_send_oc_colon = force +sp_before_send_oc_colon = remove +sp_after_oc_type = remove +sp_after_oc_return_type = remove +sp_after_oc_at_sel = remove +sp_inside_oc_at_sel_parens = remove +sp_cond_colon = add +sp_cond_question = add +sp_after_new = force +sp_between_new_paren = remove +sp_skip_vbrace_tokens = true +indent_columns = 4 +indent_with_tabs = 0 +indent_cs_delegate_brace = true +indent_namespace = true +indent_namespace_single_indent = true +indent_class = true +indent_func_call_param = true +indent_func_def_param = true +indent_func_proto_param = true +indent_switch_case = 4 +indent_label = -4 +indent_access_spec = -4 +indent_align_assign = false +indent_oc_block_msg_xcode_style = true +nl_assign_leave_one_liners = true +nl_class_leave_one_liners = true +nl_enum_leave_one_liners = true +nl_getset_leave_one_liners = true +nl_func_leave_one_liners = true +nl_cpp_lambda_leave_one_liners = true +nl_oc_msg_leave_one_liner = true +nl_start_of_file = remove +nl_end_of_file = force +nl_end_of_file_min = 1 +nl_assign_brace = force +nl_enum_brace = force +nl_struct_brace = force +nl_union_brace = force +nl_if_brace = force +nl_brace_else = force +nl_else_brace = force +nl_else_if = remove +nl_brace_finally = force +nl_finally_brace = force +nl_try_brace = force +nl_getset_brace = force +nl_for_brace = force +nl_catch_brace = force +nl_brace_catch = force +nl_while_brace = force +nl_using_brace = force +nl_do_brace = force +nl_brace_while = force +nl_switch_brace = force +nl_case_colon_brace = force +nl_namespace_brace = force +nl_class_brace = force +nl_fdef_brace = force +nl_max = 3 +nl_after_func_body = 2 +nl_property_brace = force +eat_blanks_after_open_brace = true +eat_blanks_before_close_brace = true +align_left_shift = false +cmt_indent_multi = false +cmt_multi_check_last = false +mod_remove_extra_semicolon = true +mod_remove_empty_return = true +pp_ignore_define_body = true +use_options_overriding_for_qt_macros = false +warn_level_tabs_found_in_verbatim_string_literals = 1 +set MACRO_FUNC ATTRIBUTE_ALIGN +set PROTO_WRAP FAKE_FUNCTION +set COMMENT F_STDCALL +set COMMENT PLATFORM_EXCEPTION_SAFEGUARD_PROLOG +set COMMENT WINAPI +set COMMENT __cdecl +set COMMENT __clrcall +set COMMENT __fastcall +set COMMENT __stdcall +set COMMENT __thiscall +set COMMENT __vectorcall +# option(s) with 'not default' value: 145 diff --git a/tests/cpp.test b/tests/cpp.test index b4b1e59ad9..a88f11d56b 100644 --- a/tests/cpp.test +++ b/tests/cpp.test @@ -506,3 +506,6 @@ # TODO: Find relevant test cases for 'override'. 34210 empty.cfg cpp/override_virtual.cpp + +# __asm__ +34300 bug_1236.cfg cpp/bug_1236.cpp diff --git a/tests/input/cpp/bug_1236.cpp b/tests/input/cpp/bug_1236.cpp new file mode 100644 index 0000000000..8acaaed2ee --- /dev/null +++ b/tests/input/cpp/bug_1236.cpp @@ -0,0 +1,14 @@ +void foo() +{ + int head, bar; + __asm__ __volatile__ + ( + "movq %0,%%xmm0\n\t" /* asm template */ + "0:\n\t" + "bar\t%0, [%4]\n\t" // in template + "1:\n\t" + : "=a", (bar) + : "=&b", (&head), "+m", (bar) + : "cc" + ); +} diff --git a/tests/output/cpp/34300-bug_1236.cpp b/tests/output/cpp/34300-bug_1236.cpp new file mode 100644 index 0000000000..8acaaed2ee --- /dev/null +++ b/tests/output/cpp/34300-bug_1236.cpp @@ -0,0 +1,14 @@ +void foo() +{ + int head, bar; + __asm__ __volatile__ + ( + "movq %0,%%xmm0\n\t" /* asm template */ + "0:\n\t" + "bar\t%0, [%4]\n\t" // in template + "1:\n\t" + : "=a", (bar) + : "=&b", (&head), "+m", (bar) + : "cc" + ); +} From c89d89c175002fd6698b0e2008fb6ddc24121120 Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Mon, 6 Nov 2017 17:29:27 +0100 Subject: [PATCH 084/136] Update the prepare. --- ChangeLog | 3 ++- release-steps.txt | 2 +- scripts/option_reducer.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) mode change 100644 => 100755 scripts/option_reducer.py diff --git a/ChangeLog b/ChangeLog index 9011023991..88cdc30e65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Change highlights in uncrustify-0.66 (November 2017) ------------------------------------------------------------------------------- New options: + - indent_ignore_asm_block Nov 05 - sp_angle_colon Oct 17 - nl_func_call_empty Sep 30 - nl_func_call_paren_empty Sep 30 @@ -22,7 +23,7 @@ New options: Bugfix: - Issue # 548, 1098, 1103, 1108, 1112, 1127, 1134, 1158, 1165, 1170, 1187, - 1200, 1203, 1310, 1315, 1340, 1349, 1352, 1366 are fixed + 1200, 1203, 1236, 1310, 1315, 1340, 1349, 1352, 1366 are fixed Change highlights in uncrustify-0.65 (May 2017) ------------------------------------------------------------------------------- diff --git a/release-steps.txt b/release-steps.txt index 305152730d..dc3fa14211 100644 --- a/release-steps.txt +++ b/release-steps.txt @@ -1,4 +1,4 @@ -2017-11-05 +2017-11-08 for Version 0.66 Release steps. Just in case I don't do a release for a while and forget what to do... =) diff --git a/scripts/option_reducer.py b/scripts/option_reducer.py old mode 100644 new mode 100755 index 1e6f5bd216..403ff92b8a --- a/scripts/option_reducer.py +++ b/scripts/option_reducer.py @@ -1,4 +1,4 @@ -#!/bin/python +#!/usr/bin/python """ option_reducer.py From 17981425f5db6edacaa9bfc9cd5c502f646852aa Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Mon, 6 Nov 2017 18:39:03 +0100 Subject: [PATCH 085/136] A bugfix proposal for issue #1249 --- src/space.cpp | 9 +++++---- tests/config/bug_1249.cfg | 2 ++ tests/cpp.test | 2 ++ tests/input/cpp/bug_1249.cpp | 11 +++++++++++ tests/output/cpp/34198-bug_1249.cpp | 11 +++++++++++ 5 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 tests/config/bug_1249.cfg create mode 100644 tests/input/cpp/bug_1249.cpp create mode 100644 tests/output/cpp/34198-bug_1249.cpp diff --git a/src/space.cpp b/src/space.cpp index d3a710e2c0..db2779e4b6 100644 --- a/src/space.cpp +++ b/src/space.cpp @@ -528,10 +528,11 @@ static argval_t do_space(chunk_t *first, chunk_t *second, int &min_sp, bool comp return(AV_FORCE); } - if ( first->type == CT_WORD - || first->type == CT_TYPE - || first->type == CT_PAREN_CLOSE - || CharTable::IsKw1(first->str[0])) + if ( ( first->type == CT_WORD + || first->type == CT_TYPE + || first->type == CT_PAREN_CLOSE + || CharTable::IsKw1(first->str[0])) + && (strcmp(first->text(), "void") != 0)) // Issue 1249 { log_rule("sp_before_dc"); return(cpd.settings[UO_sp_before_dc].a); diff --git a/tests/config/bug_1249.cfg b/tests/config/bug_1249.cfg new file mode 100644 index 0000000000..5f935566f7 --- /dev/null +++ b/tests/config/bug_1249.cfg @@ -0,0 +1,2 @@ +sp_after_dc=remove +sp_before_dc=remove diff --git a/tests/cpp.test b/tests/cpp.test index a88f11d56b..74cb227a5c 100644 --- a/tests/cpp.test +++ b/tests/cpp.test @@ -504,6 +504,8 @@ 34194 sp_arith_additive-f.cfg cpp/sp_arith_additive.cpp 34195 sp_arith_additive-r.cfg cpp/sp_arith_additive.cpp +34198 bug_1249.cfg cpp/bug_1249.cpp + # TODO: Find relevant test cases for 'override'. 34210 empty.cfg cpp/override_virtual.cpp diff --git a/tests/input/cpp/bug_1249.cpp b/tests/input/cpp/bug_1249.cpp new file mode 100644 index 0000000000..975dc82c9f --- /dev/null +++ b/tests/input/cpp/bug_1249.cpp @@ -0,0 +1,11 @@ +friend class :: GameObject; +void GameObject :: Foo(); + +auto x = :: GlobalFunc(); + +friend void ::testing:: PrintDebugInformationForFakesInUse(); + +template +void ::DateTime :: Transfer(TransferFunction & transfer) +{ +} diff --git a/tests/output/cpp/34198-bug_1249.cpp b/tests/output/cpp/34198-bug_1249.cpp new file mode 100644 index 0000000000..65637efe47 --- /dev/null +++ b/tests/output/cpp/34198-bug_1249.cpp @@ -0,0 +1,11 @@ +friend class ::GameObject; +void GameObject::Foo(); + +auto x = ::GlobalFunc(); + +friend void ::testing::PrintDebugInformationForFakesInUse(); + +template +void ::DateTime::Transfer(TransferFunction & transfer) +{ +} From 821d71860039d092ae04b03daf9c9d1b417ee7cc Mon Sep 17 00:00:00 2001 From: CDanU Date: Tue, 7 Nov 2017 16:10:08 +0100 Subject: [PATCH 086/136] option_reducer.py fix python path --- scripts/option_reducer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/option_reducer.py b/scripts/option_reducer.py index 1e6f5bd216..403ff92b8a 100644 --- a/scripts/option_reducer.py +++ b/scripts/option_reducer.py @@ -1,4 +1,4 @@ -#!/bin/python +#!/usr/bin/python """ option_reducer.py From 80f549b6f026d0b4cf14eae3a1ba8a7389642e45 Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Wed, 8 Nov 2017 14:42:49 +0100 Subject: [PATCH 087/136] update for the current version --- ChangeLog | 2 +- release-steps.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 88cdc30e65..b265c3406d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,7 +23,7 @@ New options: Bugfix: - Issue # 548, 1098, 1103, 1108, 1112, 1127, 1134, 1158, 1165, 1170, 1187, - 1200, 1203, 1236, 1310, 1315, 1340, 1349, 1352, 1366 are fixed + 1200, 1203, 1236, 1249, 1310, 1315, 1340, 1349, 1352, 1366 are fixed Change highlights in uncrustify-0.65 (May 2017) ------------------------------------------------------------------------------- diff --git a/release-steps.txt b/release-steps.txt index dc3fa14211..909e976f80 100644 --- a/release-steps.txt +++ b/release-steps.txt @@ -32,9 +32,6 @@ Change the date at the first line of this document. Use script/count_the_options.sh to count the options. Check the number of options at ./tests/cli/Output/help.txt -2c. Update the config files - $ scripts/update-defaults.sh - 2d. Update the man file, if any command-line options have changed. 2e. Update the ChangeLog to indicate the release date @@ -53,6 +50,9 @@ Change the date at the first line of this document. $ git push --tags --repo=https://github.com/uncrustify/uncrustify.git (use an admin) +4b. Update the config files + $ scripts/update-defaults.sh + 5. The source tarball is available from the release on GitHub, or use $ git archive -o uncrustify-0.nn.tar.gz uncrustify-0.nn Test it somewhere else From b0285e7c70770ea070364b6bfcd9e1ea7bb39f80 Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Wed, 8 Nov 2017 15:23:29 +0100 Subject: [PATCH 088/136] The documentation for 0.66 --- documentation/htdocs/config.txt | 836 ++++++++++++++-------------- documentation/htdocs/default.cfg | 834 ++++++++++++++-------------- etc/defaults.cfg | 834 ++++++++++++++-------------- etc/uigui_uncrustify.ini | 905 +++++++++++++++++-------------- 4 files changed, 1815 insertions(+), 1594 deletions(-) diff --git a/documentation/htdocs/config.txt b/documentation/htdocs/config.txt index ea5100b646..67263e0b14 100644 --- a/documentation/htdocs/config.txt +++ b/documentation/htdocs/config.txt @@ -1,19 +1,19 @@ -# Uncrustify-0.65-106-9518877-dirty +# Uncrustify-0.66 # # General options # newlines { Auto, LF, CR, CRLF } - The type of line endings. Default=Auto + The type of line endings. Default=Auto. input_tab_size Unsigned Number - The original size of tabs in the input. Default=8 + The original size of tabs in the input. Default=8. output_tab_size Unsigned Number - The size of tabs in the output (only used if align_with_tabs=true). Default=8 + The size of tabs in the output (only used if align_with_tabs=true). Default=8. string_escape_char Unsigned Number - The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn) + The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn). string_escape_char2 Unsigned Number Alternate string escape char for Pawn. Only works right before the quote char. @@ -33,16 +33,16 @@ enable_processing_cmt String Override the default ' *INDENT-ON*' in comments for enabling processing of part of the file. enable_digraphs { False, True } - Enable parsing of digraphs. Default=False + Enable parsing of digraphs. Default=False. utf8_bom { Ignore, Add, Remove, Force } - Control what to do with the UTF-8 BOM (recommend 'remove') + Control what to do with the UTF-8 BOM (recommend 'remove'). utf8_byte { False, True } - If the file contains bytes with values between 128 and 255, but is not UTF-8, then output as UTF-8 + If the file contains bytes with values between 128 and 255, but is not UTF-8, then output as UTF-8. utf8_force { False, True } - Force the output encoding to UTF-8 + Force the output encoding to UTF-8. # # Spacing options @@ -50,19 +50,22 @@ utf8_force { False, True } sp_arith { Ignore, Add, Remove, Force } Add or remove space around arithmetic operator '+', '-', '/', '*', etc - also '>>>' '<<' '>>' '%' '|' + also '>>>' '<<' '>>' '%' '|'. + +sp_arith_additive { Ignore, Add, Remove, Force } + Add or remove space around arithmetic operator '+' and '-'. Overrides sp_arith sp_assign { Ignore, Add, Remove, Force } - Add or remove space around assignment operator '=', '+=', etc + Add or remove space around assignment operator '=', '+=', etc. sp_cpp_lambda_assign { Ignore, Add, Remove, Force } - Add or remove space around '=' in C++11 lambda capture specifications. Overrides sp_assign + Add or remove space around '=' in C++11 lambda capture specifications. Overrides sp_assign. sp_cpp_lambda_paren { Ignore, Add, Remove, Force } Add or remove space after the capture specification in C++11 lambda. sp_assign_default { Ignore, Add, Remove, Force } - Add or remove space around assignment operator '=' in a prototype + Add or remove space around assignment operator '=' in a prototype. sp_before_assign { Ignore, Add, Remove, Force } Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. @@ -71,10 +74,10 @@ sp_after_assign { Ignore, Add, Remove, Force } Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. sp_enum_paren { Ignore, Add, Remove, Force } - Add or remove space in 'NS_ENUM (' + Add or remove space in 'NS_ENUM ('. sp_enum_assign { Ignore, Add, Remove, Force } - Add or remove space around assignment '=' in enum + Add or remove space around assignment '=' in enum. sp_enum_before_assign { Ignore, Add, Remove, Force } Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. @@ -83,10 +86,10 @@ sp_enum_after_assign { Ignore, Add, Remove, Force } Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. sp_enum_colon { Ignore, Add, Remove, Force } - Add or remove space around assignment ':' in enum + Add or remove space around assignment ':' in enum. sp_pp_concat { Ignore, Add, Remove, Force } - Add or remove space around preprocessor '##' concatenation operator. Default=Add + Add or remove space around preprocessor '##' concatenation operator. Default=Add. sp_pp_stringify { Ignore, Add, Remove, Force } Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator. @@ -95,35 +98,35 @@ sp_before_pp_stringify { Ignore, Add, Remove, Force } Add or remove space before preprocessor '#' stringify operator as in '#define x(y) L#y'. sp_bool { Ignore, Add, Remove, Force } - Add or remove space around boolean operators '&&' and '||' + Add or remove space around boolean operators '&&' and '||'. sp_compare { Ignore, Add, Remove, Force } - Add or remove space around compare operator '<', '>', '==', etc + Add or remove space around compare operator '<', '>', '==', etc. sp_inside_paren { Ignore, Add, Remove, Force } - Add or remove space inside '(' and ')' + Add or remove space inside '(' and ')'. sp_paren_paren { Ignore, Add, Remove, Force } - Add or remove space between nested parens: '((' vs ') )' + Add or remove space between nested parens: '((' vs ') )'. sp_cparen_oparen { Ignore, Add, Remove, Force } - Add or remove space between back-to-back parens: ')(' vs ') (' + Add or remove space between back-to-back parens: ')(' vs ') ('. sp_balance_nested_parens { False, True } - Whether to balance spaces inside nested parens + Whether to balance spaces inside nested parens. sp_paren_brace { Ignore, Add, Remove, Force } - Add or remove space between ')' and '{' + Add or remove space between ')' and '{'. sp_before_ptr_star { Ignore, Add, Remove, Force } - Add or remove space before pointer star '*' + Add or remove space before pointer star '*'. sp_before_unnamed_ptr_star { Ignore, Add, Remove, Force } Add or remove space before pointer star '*' that isn't followed by a variable name If set to 'ignore', sp_before_ptr_star is used instead. sp_between_ptr_star { Ignore, Add, Remove, Force } - Add or remove space between pointer stars '*' + Add or remove space between pointer stars '*'. sp_after_ptr_star { Ignore, Add, Remove, Force } Add or remove space after pointer star '*', if followed by a word. @@ -141,10 +144,10 @@ sp_before_ptr_star_func { Ignore, Add, Remove, Force } Add or remove space before a pointer star '*', if followed by a func proto/def. sp_before_byref { Ignore, Add, Remove, Force } - Add or remove space before a reference sign '&' + Add or remove space before a reference sign '&'. sp_before_unnamed_byref { Ignore, Add, Remove, Force } - Add or remove space before a reference sign '&' that isn't followed by a variable name + Add or remove space before a reference sign '&' that isn't followed by a variable name. If set to 'ignore', sp_before_byref is used instead. sp_after_byref { Ignore, Add, Remove, Force } @@ -157,7 +160,7 @@ sp_before_byref_func { Ignore, Add, Remove, Force } Add or remove space before a reference sign '&', if followed by a func proto/def. sp_after_type { Ignore, Add, Remove, Force } - Add or remove space between type and word. Default=Force + Add or remove space between type and word. Default=Force. sp_before_template_paren { Ignore, Add, Remove, Force } Add or remove space before the paren in the D constructs 'template Foo(' and 'class Foo('. @@ -167,35 +170,38 @@ sp_template_angle { Ignore, Add, Remove, Force } If set to ignore, sp_before_angle is used. sp_before_angle { Ignore, Add, Remove, Force } - Add or remove space before '<>' + Add or remove space before '<>'. sp_inside_angle { Ignore, Add, Remove, Force } - Add or remove space inside '<' and '>' + Add or remove space inside '<' and '>'. + +sp_angle_colon { Ignore, Add, Remove, Force } + Add or remove space between '<>' and ':'. sp_after_angle { Ignore, Add, Remove, Force } - Add or remove space after '<>' + Add or remove space after '<>'. sp_angle_paren { Ignore, Add, Remove, Force } - Add or remove space between '<>' and '(' as found in 'new List(foo);' + Add or remove space between '<>' and '(' as found in 'new List(foo);'. sp_angle_paren_empty { Ignore, Add, Remove, Force } - Add or remove space between '<>' and '()' as found in 'new List();' + Add or remove space between '<>' and '()' as found in 'new List();'. sp_angle_word { Ignore, Add, Remove, Force } - Add or remove space between '<>' and a word as in 'List m;' or 'template static ...' + Add or remove space between '<>' and a word as in 'List m;' or 'template static ...'. sp_angle_shift { Ignore, Add, Remove, Force } - Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add + Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add. sp_permit_cpp11_shift { False, True } - Permit removal of the space between '>>' in 'foo >' (C++11 only). Default=False + Permit removal of the space between '>>' in 'foo >' (C++11 only). Default=False. sp_angle_shift cannot remove the space without this option. sp_before_sparen { Ignore, Add, Remove, Force } Add or remove space before '(' of 'if', 'for', 'switch', 'while', etc. sp_inside_sparen { Ignore, Add, Remove, Force } - Add or remove space inside if-condition '(' and ')' + Add or remove space inside if-condition '(' and ')'. sp_inside_sparen_close { Ignore, Add, Remove, Force } Add or remove space before if-condition ')'. Overrides sp_inside_sparen. @@ -216,158 +222,158 @@ sp_after_invariant_paren { Ignore, Add, Remove, Force } Add or remove space after the ')' in 'invariant (C) c' in the D language. sp_special_semi { Ignore, Add, Remove, Force } - Add or remove space before empty statement ';' on 'if', 'for' and 'while' + Add or remove space before empty statement ';' on 'if', 'for' and 'while'. sp_before_semi { Ignore, Add, Remove, Force } - Add or remove space before ';'. Default=Remove + Add or remove space before ';'. Default=Remove. sp_before_semi_for { Ignore, Add, Remove, Force } - Add or remove space before ';' in non-empty 'for' statements + Add or remove space before ';' in non-empty 'for' statements. sp_before_semi_for_empty { Ignore, Add, Remove, Force } Add or remove space before a semicolon of an empty part of a for statement. sp_after_semi { Ignore, Add, Remove, Force } - Add or remove space after ';', except when followed by a comment. Default=Add + Add or remove space after ';', except when followed by a comment. Default=Add. sp_after_semi_for { Ignore, Add, Remove, Force } - Add or remove space after ';' in non-empty 'for' statements. Default=Force + Add or remove space after ';' in non-empty 'for' statements. Default=Force. sp_after_semi_for_empty { Ignore, Add, Remove, Force } Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; ). sp_before_square { Ignore, Add, Remove, Force } - Add or remove space before '[' (except '[]') + Add or remove space before '[' (except '[]'). sp_before_squares { Ignore, Add, Remove, Force } - Add or remove space before '[]' + Add or remove space before '[]'. sp_inside_square { Ignore, Add, Remove, Force } - Add or remove space inside a non-empty '[' and ']' + Add or remove space inside a non-empty '[' and ']'. sp_after_comma { Ignore, Add, Remove, Force } - Add or remove space after ',' + Add or remove space after ',', 'a,b' vs 'a, b'. sp_before_comma { Ignore, Add, Remove, Force } - Add or remove space before ','. Default=Remove + Add or remove space before ','. Default=Remove. sp_after_mdatype_commas { Ignore, Add, Remove, Force } - Add or remove space between ',' and ']' in multidimensional array type 'int[,,]' + Add or remove space between ',' and ']' in multidimensional array type 'int[,,]'. Only for C#. sp_before_mdatype_commas { Ignore, Add, Remove, Force } - Add or remove space between '[' and ',' in multidimensional array type 'int[,,]' + Add or remove space between '[' and ',' in multidimensional array type 'int[,,]'. Only for C#. sp_between_mdatype_commas { Ignore, Add, Remove, Force } - Add or remove space between ',' in multidimensional array type 'int[,,]' + Add or remove space between ',' in multidimensional array type 'int[,,]'. Only for C#. sp_paren_comma { Ignore, Add, Remove, Force } - Add or remove space between an open paren and comma: '(,' vs '( ,'. Default=Force + Add or remove space between an open paren and comma: '(,' vs '( ,'. Default=Force. sp_before_ellipsis { Ignore, Add, Remove, Force } - Add or remove space before the variadic '...' when preceded by a non-punctuator + Add or remove space before the variadic '...' when preceded by a non-punctuator. sp_after_class_colon { Ignore, Add, Remove, Force } - Add or remove space after class ':' + Add or remove space after class ':'. sp_before_class_colon { Ignore, Add, Remove, Force } - Add or remove space before class ':' + Add or remove space before class ':'. sp_after_constr_colon { Ignore, Add, Remove, Force } - Add or remove space after class constructor ':' + Add or remove space after class constructor ':'. sp_before_constr_colon { Ignore, Add, Remove, Force } - Add or remove space before class constructor ':' + Add or remove space before class constructor ':'. sp_before_case_colon { Ignore, Add, Remove, Force } - Add or remove space before case ':'. Default=Remove + Add or remove space before case ':'. Default=Remove. sp_after_operator { Ignore, Add, Remove, Force } - Add or remove space between 'operator' and operator sign + Add or remove space between 'operator' and operator sign. sp_after_operator_sym { Ignore, Add, Remove, Force } - Add or remove space between the operator symbol and the open paren, as in 'operator ++(' + Add or remove space between the operator symbol and the open paren, as in 'operator ++('. sp_after_operator_sym_empty { Ignore, Add, Remove, Force } - Add or remove space between the operator symbol and the open paren when the operator has no arguments, as in 'operator *()' + Overrides sp_after_operator_sym when the operator has no arguments, as in 'operator *()'. sp_after_cast { Ignore, Add, Remove, Force } - Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' + Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a'. sp_inside_paren_cast { Ignore, Add, Remove, Force } - Add or remove spaces inside cast parens + Add or remove spaces inside cast parens. sp_cpp_cast_paren { Ignore, Add, Remove, Force } - Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)' + Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)'. sp_sizeof_paren { Ignore, Add, Remove, Force } - Add or remove space between 'sizeof' and '(' + Add or remove space between 'sizeof' and '('. sp_after_tag { Ignore, Add, Remove, Force } - Add or remove space after the tag keyword (Pawn) + Add or remove space after the tag keyword (Pawn). sp_inside_braces_enum { Ignore, Add, Remove, Force } - Add or remove space inside enum '{' and '}' + Add or remove space inside enum '{' and '}'. sp_inside_braces_struct { Ignore, Add, Remove, Force } - Add or remove space inside struct/union '{' and '}' + Add or remove space inside struct/union '{' and '}'. sp_after_type_brace_init_lst_open { Ignore, Add, Remove, Force } - Add or remove space after open brace in an unnamed temporary direct-list-initialization + Add or remove space after open brace in an unnamed temporary direct-list-initialization. sp_before_type_brace_init_lst_close { Ignore, Add, Remove, Force } - Add or remove space before close brace in an unnamed temporary direct-list-initialization + Add or remove space before close brace in an unnamed temporary direct-list-initialization. sp_inside_type_brace_init_lst { Ignore, Add, Remove, Force } - Add or remove space inside an unnamed temporary direct-list-initialization + Add or remove space inside an unnamed temporary direct-list-initialization. sp_inside_braces { Ignore, Add, Remove, Force } - Add or remove space inside '{' and '}' + Add or remove space inside '{' and '}'. sp_inside_braces_empty { Ignore, Add, Remove, Force } - Add or remove space inside '{}' + Add or remove space inside '{}'. sp_type_func { Ignore, Add, Remove, Force } Add or remove space between return type and function name A minimum of 1 is forced except for pointer return types. sp_type_brace_init_lst { Ignore, Add, Remove, Force } - Add or remove space between type and open brace of an unnamed temporary direct-list-initialization + Add or remove space between type and open brace of an unnamed temporary direct-list-initialization. sp_func_proto_paren { Ignore, Add, Remove, Force } - Add or remove space between function name and '(' on function declaration + Add or remove space between function name and '(' on function declaration. sp_func_proto_paren_empty { Ignore, Add, Remove, Force } - Add or remove space between function name and '()' on function declaration without parameters + Add or remove space between function name and '()' on function declaration without parameters. sp_func_def_paren { Ignore, Add, Remove, Force } - Add or remove space between function name and '(' on function definition + Add or remove space between function name and '(' on function definition. sp_func_def_paren_empty { Ignore, Add, Remove, Force } - Add or remove space between function name and '()' on function definition without parameters + Add or remove space between function name and '()' on function definition without parameters. sp_inside_fparens { Ignore, Add, Remove, Force } - Add or remove space inside empty function '()' + Add or remove space inside empty function '()'. sp_inside_fparen { Ignore, Add, Remove, Force } - Add or remove space inside function '(' and ')' + Add or remove space inside function '(' and ')'. sp_inside_tparen { Ignore, Add, Remove, Force } - Add or remove space inside the first parens in the function type: 'void (*x)(...)' + Add or remove space inside the first parens in the function type: 'void (*x)(...)'. sp_after_tparen_close { Ignore, Add, Remove, Force } - Add or remove between the parens in the function type: 'void (*x)(...)' + Add or remove between the parens in the function type: 'void (*x)(...)'. sp_square_fparen { Ignore, Add, Remove, Force } Add or remove space between ']' and '(' when part of a function call. sp_fparen_brace { Ignore, Add, Remove, Force } - Add or remove space between ')' and '{' of function + Add or remove space between ')' and '{' of function. sp_fparen_dbrace { Ignore, Add, Remove, Force } Java: Add or remove space between ')' and '{{' of double brace initializer. sp_func_call_paren { Ignore, Add, Remove, Force } - Add or remove space between function name and '(' on function calls + Add or remove space between function name and '(' on function calls. sp_func_call_paren_empty { Ignore, Add, Remove, Force } Add or remove space between function name and '()' on function calls without parameters. @@ -378,25 +384,25 @@ sp_func_call_user_paren { Ignore, Add, Remove, Force } You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. sp_func_class_paren { Ignore, Add, Remove, Force } - Add or remove space between a constructor/destructor and the open paren + Add or remove space between a constructor/destructor and the open paren. sp_func_class_paren_empty { Ignore, Add, Remove, Force } - Add or remove space between a constructor without parameters or destructor and '()' + Add or remove space between a constructor without parameters or destructor and '()'. sp_return_paren { Ignore, Add, Remove, Force } - Add or remove space between 'return' and '(' + Add or remove space between 'return' and '('. sp_attribute_paren { Ignore, Add, Remove, Force } - Add or remove space between '__attribute__' and '(' + Add or remove space between '__attribute__' and '('. sp_defined_paren { Ignore, Add, Remove, Force } - Add or remove space between 'defined' and '(' in '#if defined (FOO)' + Add or remove space between 'defined' and '(' in '#if defined (FOO)'. sp_throw_paren { Ignore, Add, Remove, Force } - Add or remove space between 'throw' and '(' in 'throw (something)' + Add or remove space between 'throw' and '(' in 'throw (something)'. sp_after_throw { Ignore, Add, Remove, Force } - Add or remove space between 'throw' and anything other than '(' as in '@throw [...];' + Add or remove space between 'throw' and anything other than '(' as in '@throw [...];'. sp_catch_paren { Ignore, Add, Remove, Force } Add or remove space between 'catch' and '(' in 'catch (something) { }' @@ -411,151 +417,151 @@ sp_scope_paren { Ignore, Add, Remove, Force } If set to ignore, sp_before_sparen is used. sp_super_paren { Ignore, Add, Remove, Force } - Add or remove space between 'super' and '(' in 'super (something)'. Default=Remove + Add or remove space between 'super' and '(' in 'super (something)'. Default=Remove. sp_this_paren { Ignore, Add, Remove, Force } - Add or remove space between 'this' and '(' in 'this (something)'. Default=Remove + Add or remove space between 'this' and '(' in 'this (something)'. Default=Remove. sp_macro { Ignore, Add, Remove, Force } - Add or remove space between macro and value + Add or remove space between macro and value. sp_macro_func { Ignore, Add, Remove, Force } - Add or remove space between macro function ')' and value + Add or remove space between macro function ')' and value. sp_else_brace { Ignore, Add, Remove, Force } - Add or remove space between 'else' and '{' if on the same line + Add or remove space between 'else' and '{' if on the same line. sp_brace_else { Ignore, Add, Remove, Force } - Add or remove space between '}' and 'else' if on the same line + Add or remove space between '}' and 'else' if on the same line. sp_brace_typedef { Ignore, Add, Remove, Force } - Add or remove space between '}' and the name of a typedef on the same line + Add or remove space between '}' and the name of a typedef on the same line. sp_catch_brace { Ignore, Add, Remove, Force } - Add or remove space between 'catch' and '{' if on the same line + Add or remove space between 'catch' and '{' if on the same line. sp_brace_catch { Ignore, Add, Remove, Force } - Add or remove space between '}' and 'catch' if on the same line + Add or remove space between '}' and 'catch' if on the same line. sp_finally_brace { Ignore, Add, Remove, Force } - Add or remove space between 'finally' and '{' if on the same line + Add or remove space between 'finally' and '{' if on the same line. sp_brace_finally { Ignore, Add, Remove, Force } - Add or remove space between '}' and 'finally' if on the same line + Add or remove space between '}' and 'finally' if on the same line. sp_try_brace { Ignore, Add, Remove, Force } - Add or remove space between 'try' and '{' if on the same line + Add or remove space between 'try' and '{' if on the same line. sp_getset_brace { Ignore, Add, Remove, Force } - Add or remove space between get/set and '{' if on the same line + Add or remove space between get/set and '{' if on the same line. sp_word_brace { Ignore, Add, Remove, Force } - Add or remove space between a variable and '{' for C++ uniform initialization. Default=Add + Add or remove space between a variable and '{' for C++ uniform initialization. Default=Add. sp_word_brace_ns { Ignore, Add, Remove, Force } - Add or remove space between a variable and '{' for a namespace. Default=Add + Add or remove space between a variable and '{' for a namespace. Default=Add. sp_before_dc { Ignore, Add, Remove, Force } - Add or remove space before the '::' operator + Add or remove space before the '::' operator. sp_after_dc { Ignore, Add, Remove, Force } - Add or remove space after the '::' operator + Add or remove space after the '::' operator. sp_d_array_colon { Ignore, Add, Remove, Force } - Add or remove around the D named array initializer ':' operator + Add or remove around the D named array initializer ':' operator. sp_not { Ignore, Add, Remove, Force } - Add or remove space after the '!' (not) operator. Default=Remove + Add or remove space after the '!' (not) operator. Default=Remove. sp_inv { Ignore, Add, Remove, Force } - Add or remove space after the '~' (invert) operator. Default=Remove + Add or remove space after the '~' (invert) operator. Default=Remove. sp_addr { Ignore, Add, Remove, Force } Add or remove space after the '&' (address-of) operator. Default=Remove This does not affect the spacing after a '&' that is part of a type. sp_member { Ignore, Add, Remove, Force } - Add or remove space around the '.' or '->' operators. Default=Remove + Add or remove space around the '.' or '->' operators. Default=Remove. sp_deref { Ignore, Add, Remove, Force } Add or remove space after the '*' (dereference) operator. Default=Remove This does not affect the spacing after a '*' that is part of a type. sp_sign { Ignore, Add, Remove, Force } - Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove + Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove. sp_incdec { Ignore, Add, Remove, Force } - Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove + Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove. sp_before_nl_cont { Ignore, Add, Remove, Force } - Add or remove space before a backslash-newline at the end of a line. Default=Add + Add or remove space before a backslash-newline at the end of a line. Default=Add. sp_after_oc_scope { Ignore, Add, Remove, Force } - Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' + Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;'. sp_after_oc_colon { Ignore, Add, Remove, Force } Add or remove space after the colon in message specs - '-(int) f:(int) x;' vs '-(int) f: (int) x;' + '-(int) f:(int) x;' vs '-(int) f: (int) x;'. sp_before_oc_colon { Ignore, Add, Remove, Force } Add or remove space before the colon in message specs - '-(int) f: (int) x;' vs '-(int) f : (int) x;' + '-(int) f: (int) x;' vs '-(int) f : (int) x;'. sp_after_oc_dict_colon { Ignore, Add, Remove, Force } Add or remove space after the colon in immutable dictionary expression - 'NSDictionary *test = @{@"foo" :@"bar"};' + 'NSDictionary *test = @{@"foo" :@"bar"};'. sp_before_oc_dict_colon { Ignore, Add, Remove, Force } Add or remove space before the colon in immutable dictionary expression - 'NSDictionary *test = @{@"foo" :@"bar"};' + 'NSDictionary *test = @{@"foo" :@"bar"};'. sp_after_send_oc_colon { Ignore, Add, Remove, Force } Add or remove space after the colon in message specs - '[object setValue:1];' vs '[object setValue: 1];' + '[object setValue:1];' vs '[object setValue: 1];'. sp_before_send_oc_colon { Ignore, Add, Remove, Force } Add or remove space before the colon in message specs - '[object setValue:1];' vs '[object setValue :1];' + '[object setValue:1];' vs '[object setValue :1];'. sp_after_oc_type { Ignore, Add, Remove, Force } Add or remove space after the (type) in message specs - '-(int)f: (int) x;' vs '-(int)f: (int)x;' + '-(int)f: (int) x;' vs '-(int)f: (int)x;'. sp_after_oc_return_type { Ignore, Add, Remove, Force } Add or remove space after the first (type) in message specs - '-(int) f:(int)x;' vs '-(int)f:(int)x;' + '-(int) f:(int)x;' vs '-(int)f:(int)x;'. sp_after_oc_at_sel { Ignore, Add, Remove, Force } Add or remove space between '@selector' and '(' '@selector(msgName)' vs '@selector (msgName)' - Also applies to @protocol() constructs + Also applies to @protocol() constructs. sp_after_oc_at_sel_parens { Ignore, Add, Remove, Force } Add or remove space between '@selector(x)' and the following word - '@selector(foo) a:' vs '@selector(foo)a:' + '@selector(foo) a:' vs '@selector(foo)a:'. sp_inside_oc_at_sel_parens { Ignore, Add, Remove, Force } Add or remove space inside '@selector' parens '@selector(foo)' vs '@selector( foo )' - Also applies to @protocol() constructs + Also applies to @protocol() constructs. sp_before_oc_block_caret { Ignore, Add, Remove, Force } Add or remove space before a block pointer caret - '^int (int arg){...}' vs. ' ^int (int arg){...}' + '^int (int arg){...}' vs. ' ^int (int arg){...}'. sp_after_oc_block_caret { Ignore, Add, Remove, Force } Add or remove space after a block pointer caret - '^int (int arg){...}' vs. '^ int (int arg){...}' + '^int (int arg){...}' vs. '^ int (int arg){...}'. sp_after_oc_msg_receiver { Ignore, Add, Remove, Force } Add or remove space between the receiver and selector in a message. - '[receiver selector ...]' + '[receiver selector ...]'. sp_after_oc_property { Ignore, Add, Remove, Force } Add or remove space after @property. sp_cond_colon { Ignore, Add, Remove, Force } - Add or remove space around the ':' in 'b ? t : f' + Add or remove space around the ':' in 'b ? t : f'. sp_cond_colon_before { Ignore, Add, Remove, Force } Add or remove space before the ':' in 'b ? t : f'. Overrides sp_cond_colon. @@ -564,7 +570,7 @@ sp_cond_colon_after { Ignore, Add, Remove, Force } Add or remove space after the ':' in 'b ? t : f'. Overrides sp_cond_colon. sp_cond_question { Ignore, Add, Remove, Force } - Add or remove space around the '?' in 'b ? t : f' + Add or remove space around the '?' in 'b ? t : f'. sp_cond_question_before { Ignore, Add, Remove, Force } Add or remove space before the '?' in 'b ? t : f'. Overrides sp_cond_question. @@ -582,16 +588,16 @@ sp_range { Ignore, Add, Remove, Force } Control the space around the D '..' operator. sp_after_for_colon { Ignore, Add, Remove, Force } - Control the spacing after ':' in 'for (TYPE VAR : EXPR)' + Control the spacing after ':' in 'for (TYPE VAR : EXPR)'. Only JAVA. sp_before_for_colon { Ignore, Add, Remove, Force } - Control the spacing before ':' in 'for (TYPE VAR : EXPR)' + Control the spacing before ':' in 'for (TYPE VAR : EXPR)'. Only JAVA. sp_extern_paren { Ignore, Add, Remove, Force } - Control the spacing in 'extern (C)' (D) + Control the spacing in 'extern (C)' (D). sp_cmt_cpp_start { Ignore, Add, Remove, Force } - Control the space after the opening of a C++ comment '// A' vs '//A' + Control the space after the opening of a C++ comment '// A' vs '//A'. sp_cmt_cpp_doxygen { False, True } True: If space is added with sp_cmt_cpp_start, do it after doxygen sequences like '///', '///<', '//!' and '//!<'. @@ -600,31 +606,33 @@ sp_cmt_cpp_qttr { False, True } True: If space is added with sp_cmt_cpp_start, do it after Qt translator or meta-data comments like '//:', '//=', and '//~'. sp_endif_cmt { Ignore, Add, Remove, Force } - Controls the spaces between #else or #endif and a trailing comment + Controls the spaces between #else or #endif and a trailing comment. sp_after_new { Ignore, Add, Remove, Force } - Controls the spaces after 'new', 'delete' and 'delete[]' + Controls the spaces after 'new', 'delete' and 'delete[]'. sp_between_new_paren { Ignore, Add, Remove, Force } - Controls the spaces between new and '(' in 'new()' + Controls the spaces between new and '(' in 'new()'. sp_after_newop_paren { Ignore, Add, Remove, Force } - Controls the spaces between ')' and 'type' in 'new(foo) BAR' + Controls the spaces between ')' and 'type' in 'new(foo) BAR'. sp_inside_newop_paren { Ignore, Add, Remove, Force } - Controls the spaces inside paren of the new operator: 'new(foo) BAR' + Controls the spaces inside paren of the new operator: 'new(foo) BAR'. sp_inside_newop_paren_open { Ignore, Add, Remove, Force } - Controls the space after open paren of the new operator: 'new(foo) BAR' + Controls the space after open paren of the new operator: 'new(foo) BAR'. + Overrides sp_inside_newop_paren. sp_inside_newop_paren_close { Ignore, Add, Remove, Force } - Controls the space before close paren of the new operator: 'new(foo) BAR' + Controls the space before close paren of the new operator: 'new(foo) BAR'. + Overrides sp_inside_newop_paren. sp_before_tr_emb_cmt { Ignore, Add, Remove, Force } - Controls the spaces before a trailing or embedded comment + Controls the spaces before a trailing or embedded comment. sp_num_before_tr_emb_cmt Unsigned Number - Number of spaces before a trailing or embedded comment + Number of spaces before a trailing or embedded comment. sp_annotation_paren { Ignore, Add, Remove, Force } Control space between a Java annotation and the open paren. @@ -641,11 +649,11 @@ force_tab_after_define { False, True } indent_columns Unsigned Number The number of columns to indent per level. - Usually 2, 3, 4, or 8. Default=8 + Usually 2, 3, 4, or 8. Default=8. indent_continue Number The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents. - For FreeBSD, this is set to 4. Negative value is absolute and not increased for each ( level + For FreeBSD, this is set to 4. Negative value is absolute and not increased for each '(' level. indent_param Unsigned Number The continuation indent for func_*_param if they are true. @@ -662,26 +670,26 @@ indent_cmt_with_tabs { False, True } Requires indent_with_tabs=2. If false, will use spaces. indent_align_string { False, True } - Whether to indent strings broken by '\' so that they line up + Whether to indent strings broken by '\' so that they line up. indent_xml_string Unsigned Number The number of spaces to indent multi-line XML strings. - Requires indent_align_string=True + Requires indent_align_string=True. indent_brace Unsigned Number - Spaces to indent '{' from level + Spaces to indent '{' from level. indent_braces { False, True } - Whether braces are indented to the body level + Whether braces are indented to the body level. indent_braces_no_func { False, True } - Disabled indenting function braces if indent_braces is True + Disabled indenting function braces if indent_braces is True. indent_braces_no_class { False, True } - Disabled indenting class braces if indent_braces is True + Disabled indenting class braces if indent_braces is True. indent_braces_no_struct { False, True } - Disabled indenting struct braces if indent_braces is True + Disabled indenting struct braces if indent_braces is True. indent_brace_parent { False, True } Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc. @@ -693,48 +701,48 @@ indent_cs_delegate_brace { False, True } indent a C# delegate by another level, default is to not indent by another level. indent_namespace { False, True } - Whether the 'namespace' body is indented + Whether the 'namespace' body is indented. indent_namespace_single_indent { False, True } Only indent one namespace and no sub-namespaces. Requires indent_namespace=True. indent_namespace_level Unsigned Number - The number of spaces to indent a namespace block + The number of spaces to indent a namespace block. indent_namespace_limit Unsigned Number If the body of the namespace is longer than this number, it won't be indented. Requires indent_namespace=True. Default=0 (no limit) indent_extern { False, True } - Whether the 'extern "C"' body is indented + Whether the 'extern "C"' body is indented. indent_class { False, True } - Whether the 'class' body is indented + Whether the 'class' body is indented. indent_class_colon { False, True } - Whether to indent the stuff after a leading base class colon + Whether to indent the stuff after a leading base class colon. indent_class_on_colon { False, True } Indent based on a class colon instead of the stuff after the colon. - Requires indent_class_colon=True. Default=False + Requires indent_class_colon=True. Default=False. indent_constr_colon { False, True } - Whether to indent the stuff after a leading class initializer colon + Whether to indent the stuff after a leading class initializer colon. indent_ctor_init_leading Unsigned Number - Virtual indent from the ':' for member initializers. Default=2 + Virtual indent from the ':' for member initializers. Default=2. indent_ctor_init Number Additional indent for constructor initializer list. - Negative values decrease indent down to the first column. Default=0 + Negative values decrease indent down to the first column. Default=0. indent_else_if { False, True } False=treat 'else\nif' as 'else if' for indenting purposes - True=indent the 'if' one level + True=indent the 'if' one level. indent_var_def_blk Number - Amount to indent variable declarations after a open brace. neg=relative, pos=absolute + Amount to indent variable declarations after a open brace. neg=relative, pos=absolute. indent_var_def_cont { False, True } Indent continued variable declarations instead of aligning. @@ -745,54 +753,54 @@ indent_shift { False, True } indent_func_def_force_col1 { False, True } True: force indentation of function definition to start in column 1 - False: use the default behavior + False: use the default behavior. indent_func_call_param { False, True } True: indent continued function call parameters one indent level - False: align parameters under the open paren + False: align parameters under the open paren. indent_func_def_param { False, True } - Same as indent_func_call_param, but for function defs + Same as indent_func_call_param, but for function defs. indent_func_proto_param { False, True } - Same as indent_func_call_param, but for function protos + Same as indent_func_call_param, but for function protos. indent_func_class_param { False, True } - Same as indent_func_call_param, but for class declarations + Same as indent_func_call_param, but for class declarations. indent_func_ctor_var_param { False, True } - Same as indent_func_call_param, but for class variable constructors + Same as indent_func_call_param, but for class variable constructors. indent_template_param { False, True } - Same as indent_func_call_param, but for templates + Same as indent_func_call_param, but for templates. indent_func_param_double { False, True } Double the indent for indent_func_xxx_param options. - Use both values of the options indent_columns and indent_param + Use both values of the options indent_columns and indent_param. indent_func_const Unsigned Number - Indentation column for standalone 'const' function decl/proto qualifier + Indentation column for standalone 'const' function decl/proto qualifier. indent_func_throw Unsigned Number - Indentation column for standalone 'throw' function decl/proto qualifier + Indentation column for standalone 'throw' function decl/proto qualifier. indent_member Unsigned Number The number of spaces to indent a continued '->' or '.' Usually set to 0, 1, or indent_columns. indent_sing_line_comments Unsigned Number - Spaces to indent single line ('//') comments on lines before code + Spaces to indent single line ('//') comments on lines before code. indent_relative_single_line_comments { False, True } If set, will indent trailing single line ('//') comments relative - to the code instead of trying to keep the same absolute column + to the code instead of trying to keep the same absolute column. indent_switch_case Unsigned Number Spaces to indent 'case' from 'switch' Usually 0 or indent_columns. indent_switch_pp { False, True } - Whether to indent preproccesor statements inside of switch statements + Whether to indent preproccesor statements inside of switch statements. indent_case_shift Unsigned Number Spaces to shift the 'case' line, without affecting any other lines @@ -805,7 +813,7 @@ indent_case_brace Number negative value are OK. indent_col1_comment { False, True } - Whether to indent comments found in first column + Whether to indent comments found in first column. indent_label Number How to indent goto labels @@ -818,10 +826,10 @@ indent_access_spec Number indent_access_spec_body { False, True } Indent the code after an access specifier by one level. - If set, this option forces 'indent_access_spec=0' + If set, this option forces 'indent_access_spec=0'. indent_paren_nl { False, True } - If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) + If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended). indent_paren_close Unsigned Number Controls the indent of a close paren after a newline. @@ -829,20 +837,29 @@ indent_paren_close Unsigned Number 1: Align under the open paren 2: Indent to the brace level +indent_paren_after_func_def { False, True } + Controls the indent of the open paren of a function definition, if on it's own line.If True, indents the open paren + +indent_paren_after_func_decl { False, True } + Controls the indent of the open paren of a function declaration, if on it's own line.If True, indents the open paren + +indent_paren_after_func_call { False, True } + Controls the indent of the open paren of a function call, if on it's own line.If True, indents the open paren + indent_comma_paren { False, True } - Controls the indent of a comma when inside a paren.If True, aligns under the open paren + Controls the indent of a comma when inside a paren.If True, aligns under the open paren. indent_bool_paren { False, True } - Controls the indent of a BOOL operator when inside a paren.If True, aligns under the open paren + Controls the indent of a BOOL operator when inside a paren.If True, aligns under the open paren. indent_first_bool_expr { False, True } - If 'indent_bool_paren' is True, controls the indent of the first expression. If True, aligns the first expression to the following ones + If 'indent_bool_paren' is True, controls the indent of the first expression. If True, aligns the first expression to the following ones. indent_square_nl { False, True } - If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) + If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended). indent_preserve_sql { False, True } - Don't change the relative indent of ESQL/C 'EXEC SQL' bodies + Don't change the relative indent of ESQL/C 'EXEC SQL' bodies. indent_align_assign { False, True } Align continued statements at the '='. Default=True @@ -860,7 +877,7 @@ indent_oc_msg_colon Unsigned Number indent_oc_msg_prioritize_first_colon { False, True } If True, prioritize aligning with initial colon (and stripping spaces from lines, if necessary). - Default=True + Default=True. indent_oc_block_msg_xcode_style { False, True } If indent_oc_block_msg and this option are on, blocks will be indented the way that Xcode does by default (from keyword if the parameter is on its own line; otherwise, from the previous indentation level). @@ -884,13 +901,13 @@ indent_vbrace_open_on_tabstop { False, True } True: When identing after virtual brace open and newline add further spaces after regular indent to reach next tabstop. indent_token_after_brace { False, True } - If True, a brace followed by another token (not a newline) will indent all contained lines to match the token.Default=True + If True, a brace followed by another token (not a newline) will indent all contained lines to match the token.Default=True. indent_cpp_lambda_body { False, True } - If True, cpp lambda body will be indentedDefault=False + If True, cpp lambda body will be indentedDefault=False. indent_using_block { False, True } - indent (or not) an using block if no braces are used. Only for C#.Default=True + indent (or not) an using block if no braces are used. Only for C#.Default=True. indent_ternary_operator Unsigned Number indent the continuation of ternary operator. @@ -898,195 +915,198 @@ indent_ternary_operator Unsigned Number 1: When the `if_false` is a continuation, indent it under `if_false` 2: When the `:` is a continuation, indent it under `?` +indent_ignore_asm_block { False, True } + If true, ignore indent and align for asm blocks as they have their own indentation. + # # Newline adding and removing options # nl_collapse_empty_body { False, True } - Whether to collapse empty blocks between '{' and '}' + Whether to collapse empty blocks between '{' and '}'. nl_assign_leave_one_liners { False, True } - Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' + Don't split one-line braced assignments - 'foo_t f = { 1, 2 };'. nl_class_leave_one_liners { False, True } - Don't split one-line braced statements inside a class xx { } body + Don't split one-line braced statements inside a class xx { } body. nl_enum_leave_one_liners { False, True } Don't split one-line enums: 'enum foo { BAR = 15 };' nl_getset_leave_one_liners { False, True } - Don't split one-line get or set functions + Don't split one-line get or set functions. nl_func_leave_one_liners { False, True } - Don't split one-line function definitions - 'int foo() { return 0; }' + Don't split one-line function definitions - 'int foo() { return 0; }'. nl_cpp_lambda_leave_one_liners { False, True } - Don't split one-line C++11 lambdas - '[]() { return 0; }' + Don't split one-line C++11 lambdas - '[]() { return 0; }'. nl_if_leave_one_liners { False, True } - Don't split one-line if/else statements - 'if(a) b++;' + Don't split one-line if/else statements - 'if(a) b++;'. nl_while_leave_one_liners { False, True } - Don't split one-line while statements - 'while(a) b++;' + Don't split one-line while statements - 'while(a) b++;'. nl_oc_msg_leave_one_liner { False, True } - Don't split one-line OC messages + Don't split one-line OC messages. nl_oc_block_brace { Ignore, Add, Remove, Force } - Add or remove newline between Objective-C block signature and '{' + Add or remove newline between Objective-C block signature and '{'. nl_start_of_file { Ignore, Add, Remove, Force } - Add or remove newlines at the start of the file + Add or remove newlines at the start of the file. nl_start_of_file_min Unsigned Number - The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' + The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force'. nl_end_of_file { Ignore, Add, Remove, Force } - Add or remove newline at the end of the file + Add or remove newline at the end of the file. nl_end_of_file_min Unsigned Number - The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') + The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force'). nl_assign_brace { Ignore, Add, Remove, Force } - Add or remove newline between '=' and '{' + Add or remove newline between '=' and '{'. nl_assign_square { Ignore, Add, Remove, Force } - Add or remove newline between '=' and '[' (D only) + Add or remove newline between '=' and '[' (D only). nl_after_square_assign { Ignore, Add, Remove, Force } - Add or remove newline after '= [' (D only). Will also affect the newline before the ']' + Add or remove newline after '= [' (D only). Will also affect the newline before the ']'. nl_func_var_def_blk Unsigned Number The number of blank lines after a block of variable definitions at the top of a function body - 0 = No change (default) + 0 = No change (default). nl_typedef_blk_start Unsigned Number The number of newlines before a block of typedefs 0 = No change (default) - the option 'nl_after_access_spec' takes preference over 'nl_typedef_blk_start' + is overridden by the option 'nl_after_access_spec'. nl_typedef_blk_end Unsigned Number The number of newlines after a block of typedefs - 0 = No change (default) + 0 = No change (default). nl_typedef_blk_in Unsigned Number The maximum consecutive newlines within a block of typedefs - 0 = No change (default) + 0 = No change (default). nl_var_def_blk_start Unsigned Number The number of newlines before a block of variable definitions not at the top of a function body 0 = No change (default) - the option 'nl_after_access_spec' takes preference over 'nl_var_def_blk_start' + is overridden by the option 'nl_after_access_spec'. nl_var_def_blk_end Unsigned Number The number of newlines after a block of variable definitions not at the top of a function body - 0 = No change (default) + 0 = No change (default). nl_var_def_blk_in Unsigned Number The maximum consecutive newlines within a block of variable definitions - 0 = No change (default) + 0 = No change (default). nl_fcall_brace { Ignore, Add, Remove, Force } Add or remove newline between a function call's ')' and '{', as in: - list_for_each(item, &list) { } + list_for_each(item, &list) { }. nl_enum_brace { Ignore, Add, Remove, Force } - Add or remove newline between 'enum' and '{' + Add or remove newline between 'enum' and '{'. nl_enum_class { Ignore, Add, Remove, Force } - Add or remove newline between 'enum' and 'class' + Add or remove newline between 'enum' and 'class'. nl_enum_class_identifier { Ignore, Add, Remove, Force } - Add or remove newline between 'enum class' and the identifier + Add or remove newline between 'enum class' and the identifier. nl_enum_identifier_colon { Ignore, Add, Remove, Force } - Add or remove newline between 'enum class' type and ':' + Add or remove newline between 'enum class' type and ':'. nl_enum_colon_type { Ignore, Add, Remove, Force } - Add or remove newline between 'enum class identifier :' and 'type' and/or 'type' + Add or remove newline between 'enum class identifier :' and 'type' and/or 'type'. nl_struct_brace { Ignore, Add, Remove, Force } - Add or remove newline between 'struct and '{' + Add or remove newline between 'struct and '{'. nl_union_brace { Ignore, Add, Remove, Force } - Add or remove newline between 'union' and '{' + Add or remove newline between 'union' and '{'. nl_if_brace { Ignore, Add, Remove, Force } - Add or remove newline between 'if' and '{' + Add or remove newline between 'if' and '{'. nl_brace_else { Ignore, Add, Remove, Force } - Add or remove newline between '}' and 'else' + Add or remove newline between '}' and 'else'. nl_elseif_brace { Ignore, Add, Remove, Force } Add or remove newline between 'else if' and '{' - If set to ignore, nl_if_brace is used instead + If set to ignore, nl_if_brace is used instead. nl_else_brace { Ignore, Add, Remove, Force } - Add or remove newline between 'else' and '{' + Add or remove newline between 'else' and '{'. nl_else_if { Ignore, Add, Remove, Force } - Add or remove newline between 'else' and 'if' + Add or remove newline between 'else' and 'if'. nl_before_if_closing_paren { Ignore, Add, Remove, Force } - Add or remove newline before 'if'/'else if' closing parenthesis + Add or remove newline before 'if'/'else if' closing parenthesis. nl_brace_finally { Ignore, Add, Remove, Force } - Add or remove newline between '}' and 'finally' + Add or remove newline between '}' and 'finally'. nl_finally_brace { Ignore, Add, Remove, Force } - Add or remove newline between 'finally' and '{' + Add or remove newline between 'finally' and '{'. nl_try_brace { Ignore, Add, Remove, Force } - Add or remove newline between 'try' and '{' + Add or remove newline between 'try' and '{'. nl_getset_brace { Ignore, Add, Remove, Force } - Add or remove newline between get/set and '{' + Add or remove newline between get/set and '{'. nl_for_brace { Ignore, Add, Remove, Force } - Add or remove newline between 'for' and '{' + Add or remove newline between 'for' and '{'. nl_catch_brace { Ignore, Add, Remove, Force } - Add or remove newline between 'catch' and '{' + Add or remove newline between 'catch' and '{'. nl_brace_catch { Ignore, Add, Remove, Force } - Add or remove newline between '}' and 'catch' + Add or remove newline between '}' and 'catch'. nl_brace_square { Ignore, Add, Remove, Force } - Add or remove newline between '}' and ']' + Add or remove newline between '}' and ']'. nl_brace_fparen { Ignore, Add, Remove, Force } - Add or remove newline between '}' and ')' in a function invocation + Add or remove newline between '}' and ')' in a function invocation. nl_while_brace { Ignore, Add, Remove, Force } - Add or remove newline between 'while' and '{' + Add or remove newline between 'while' and '{'. nl_scope_brace { Ignore, Add, Remove, Force } - Add or remove newline between 'scope (x)' and '{' (D) + Add or remove newline between 'scope (x)' and '{' (D). nl_unittest_brace { Ignore, Add, Remove, Force } - Add or remove newline between 'unittest' and '{' (D) + Add or remove newline between 'unittest' and '{' (D). nl_version_brace { Ignore, Add, Remove, Force } - Add or remove newline between 'version (x)' and '{' (D) + Add or remove newline between 'version (x)' and '{' (D). nl_using_brace { Ignore, Add, Remove, Force } - Add or remove newline between 'using' and '{' + Add or remove newline between 'using' and '{'. nl_brace_brace { Ignore, Add, Remove, Force } Add or remove newline between two open or close braces. Due to general newline/brace handling, REMOVE may not work. nl_do_brace { Ignore, Add, Remove, Force } - Add or remove newline between 'do' and '{' + Add or remove newline between 'do' and '{'. nl_brace_while { Ignore, Add, Remove, Force } - Add or remove newline between '}' and 'while' of 'do' statement + Add or remove newline between '}' and 'while' of 'do' statement. nl_switch_brace { Ignore, Add, Remove, Force } - Add or remove newline between 'switch' and '{' + Add or remove newline between 'switch' and '{'. nl_synchronized_brace { Ignore, Add, Remove, Force } - Add or remove newline between 'synchronized' and '{' + Add or remove newline between 'synchronized' and '{'. nl_multi_line_cond { False, True } Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. @@ -1096,25 +1116,25 @@ nl_multi_line_define { False, True } Force a newline in a define after the macro name for multi-line defines. nl_before_case { False, True } - Whether to put a newline before 'case' statement, not after the first 'case' + Whether to put a newline before 'case' statement, not after the first 'case'. nl_before_throw { Ignore, Add, Remove, Force } - Add or remove newline between ')' and 'throw' + Add or remove newline between ')' and 'throw'. nl_after_case { False, True } - Whether to put a newline after 'case' statement + Whether to put a newline after 'case' statement. nl_case_colon_brace { Ignore, Add, Remove, Force } Add or remove a newline between a case ':' and '{'. Overrides nl_after_case. nl_namespace_brace { Ignore, Add, Remove, Force } - Newline between namespace and { + Newline between namespace and {. nl_template_class { Ignore, Add, Remove, Force } Add or remove newline between 'template<>' and whatever follows. nl_class_brace { Ignore, Add, Remove, Force } - Add or remove newline between 'class' and '{' + Add or remove newline between 'class' and '{'. nl_class_init_args { Ignore, Add, Remove, Force } Add or remove newline before/after each ',' in the base class list, @@ -1125,10 +1145,10 @@ nl_constr_init_args { Ignore, Add, Remove, Force } Related to nl_constr_colon, pos_constr_colon and pos_constr_comma. nl_enum_own_lines { Ignore, Add, Remove, Force } - Add or remove newline before first element, after comma, and after last element in enum + Add or remove newline before first element, after comma, and after last element in enum. nl_func_type_name { Ignore, Add, Remove, Force } - Add or remove newline between return type and function name in a function definition + Add or remove newline between return type and function name in a function definition. nl_func_type_name_class { Ignore, Add, Remove, Force } Add or remove newline between return type and function name inside a class {} @@ -1136,32 +1156,38 @@ nl_func_type_name_class { Ignore, Add, Remove, Force } nl_func_class_scope { Ignore, Add, Remove, Force } Add or remove newline between class specification and '::' in 'void A::f() { }' - Only appears in separate member implementation (does not appear with in-line implmementation) + Only appears in separate member implementation (does not appear with in-line implmementation). nl_func_scope_name { Ignore, Add, Remove, Force } Add or remove newline between function scope and name - Controls the newline after '::' in 'void A::f() { }' + Controls the newline after '::' in 'void A::f() { }'. nl_func_proto_type_name { Ignore, Add, Remove, Force } - Add or remove newline between return type and function name in a prototype + Add or remove newline between return type and function name in a prototype. nl_func_paren { Ignore, Add, Remove, Force } - Add or remove newline between a function name and the opening '(' in the declaration + Add or remove newline between a function name and the opening '(' in the declaration. nl_func_paren_empty { Ignore, Add, Remove, Force } - Overrides nl_func_paren for functions with no parameters + Overrides nl_func_paren for functions with no parameters. nl_func_def_paren { Ignore, Add, Remove, Force } - Add or remove newline between a function name and the opening '(' in the definition + Add or remove newline between a function name and the opening '(' in the definition. nl_func_def_paren_empty { Ignore, Add, Remove, Force } - Overrides nl_func_def_paren for functions with no parameters + Overrides nl_func_def_paren for functions with no parameters. + +nl_func_call_paren { Ignore, Add, Remove, Force } + Add or remove newline between a function name and the opening '(' in the call + +nl_func_call_paren_empty { Ignore, Add, Remove, Force } + Overrides nl_func_call_paren for functions with no parameters. nl_func_decl_start { Ignore, Add, Remove, Force } - Add or remove newline after '(' in a function declaration + Add or remove newline after '(' in a function declaration. nl_func_def_start { Ignore, Add, Remove, Force } - Add or remove newline after '(' in a function definition + Add or remove newline after '(' in a function definition. nl_func_decl_start_single { Ignore, Add, Remove, Force } Overrides nl_func_decl_start when there is only one parameter. @@ -1176,10 +1202,10 @@ nl_func_def_start_multi_line { False, True } Whether to add newline after '(' in a function definition if '(' and ')' are in different lines. nl_func_decl_args { Ignore, Add, Remove, Force } - Add or remove newline after each ',' in a function declaration + Add or remove newline after each ',' in a function declaration. nl_func_def_args { Ignore, Add, Remove, Force } - Add or remove newline after each ',' in a function definition + Add or remove newline after each ',' in a function definition. nl_func_decl_args_multi_line { False, True } Whether to add newline after each ',' in a function declaration if '(' and ')' are in different lines. @@ -1188,10 +1214,10 @@ nl_func_def_args_multi_line { False, True } Whether to add newline after each ',' in a function definition if '(' and ')' are in different lines. nl_func_decl_end { Ignore, Add, Remove, Force } - Add or remove newline before the ')' in a function declaration + Add or remove newline before the ')' in a function declaration. nl_func_def_end { Ignore, Add, Remove, Force } - Add or remove newline before the ')' in a function definition + Add or remove newline before the ')' in a function definition. nl_func_decl_end_single { Ignore, Add, Remove, Force } Overrides nl_func_decl_end when there is only one parameter. @@ -1211,6 +1237,9 @@ nl_func_decl_empty { Ignore, Add, Remove, Force } nl_func_def_empty { Ignore, Add, Remove, Force } Add or remove newline between '()' in a function definition. +nl_func_call_empty { Ignore, Add, Remove, Force } + Add or remove newline between '()' in a function call. + nl_func_call_start_multi_line { False, True } Whether to add newline after '(' in a function call if '(' and ')' are in different lines. @@ -1222,31 +1251,31 @@ nl_func_call_end_multi_line { False, True } nl_oc_msg_args { False, True } Whether to put each OC message parameter on a separate line - See nl_oc_msg_leave_one_liner + See nl_oc_msg_leave_one_liner. nl_fdef_brace { Ignore, Add, Remove, Force } - Add or remove newline between function signature and '{' + Add or remove newline between function signature and '{'. nl_cpp_ldef_brace { Ignore, Add, Remove, Force } - Add or remove newline between C++11 lambda signature and '{' + Add or remove newline between C++11 lambda signature and '{'. nl_return_expr { Ignore, Add, Remove, Force } Add or remove a newline between the return keyword and return expression. nl_after_semicolon { False, True } - Whether to put a newline after semicolons, except in 'for' statements + Whether to put a newline after semicolons, except in 'for' statements. nl_paren_dbrace_open { Ignore, Add, Remove, Force } Java: Control the newline between the ')' and '{{' of the double brace initializer. nl_type_brace_init_lst { Ignore, Add, Remove, Force } - Whether to put a newline after the type in an unnamed temporary direct-list-initialization + Whether to put a newline after the type in an unnamed temporary direct-list-initialization. nl_type_brace_init_lst_open { Ignore, Add, Remove, Force } - Whether to put a newline after open brace in an unnamed temporary direct-list-initialization + Whether to put a newline after open brace in an unnamed temporary direct-list-initialization. nl_type_brace_init_lst_close { Ignore, Add, Remove, Force } - Whether to put a newline before close brace in an unnamed temporary direct-list-initialization + Whether to put a newline before close brace in an unnamed temporary direct-list-initialization. nl_after_brace_open { False, True } Whether to put a newline after brace open. @@ -1270,14 +1299,14 @@ nl_after_brace_close { False, True } nl_after_vbrace_close { False, True } Whether to put a newline after a virtual brace close. - Would add a newline before return in: 'if (foo) a++; return;' + Would add a newline before return in: 'if (foo) a++; return;'. nl_brace_struct_var { Ignore, Add, Remove, Force } Control the newline between the close brace and 'b' in: 'struct { int a; } b;' - Affects enums, unions and structures. If set to ignore, uses nl_after_brace_close + Affects enums, unions and structures. If set to ignore, uses nl_after_brace_close. nl_define_macro { False, True } - Whether to alter newlines in '#define' macros + Whether to alter newlines in '#define' macros. nl_squeeze_ifdef { False, True } Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and '#endif'. Does not affect top-level #ifdefs. @@ -1286,54 +1315,54 @@ nl_squeeze_ifdef_top_level { False, True } Makes the nl_squeeze_ifdef option affect the top-level #ifdefs as well. nl_before_if { Ignore, Add, Remove, Force } - Add or remove blank line before 'if' + Add or remove blank line before 'if'. nl_after_if { Ignore, Add, Remove, Force } Add or remove blank line after 'if' statement. - Add/Force work only if the next token is not a closing brace + Add/Force work only if the next token is not a closing brace. nl_before_for { Ignore, Add, Remove, Force } - Add or remove blank line before 'for' + Add or remove blank line before 'for'. nl_after_for { Ignore, Add, Remove, Force } - Add or remove blank line after 'for' statement + Add or remove blank line after 'for' statement. nl_before_while { Ignore, Add, Remove, Force } - Add or remove blank line before 'while' + Add or remove blank line before 'while'. nl_after_while { Ignore, Add, Remove, Force } - Add or remove blank line after 'while' statement + Add or remove blank line after 'while' statement. nl_before_switch { Ignore, Add, Remove, Force } - Add or remove blank line before 'switch' + Add or remove blank line before 'switch'. nl_after_switch { Ignore, Add, Remove, Force } - Add or remove blank line after 'switch' statement + Add or remove blank line after 'switch' statement. nl_before_synchronized { Ignore, Add, Remove, Force } - Add or remove blank line before 'synchronized' + Add or remove blank line before 'synchronized'. nl_after_synchronized { Ignore, Add, Remove, Force } - Add or remove blank line after 'synchronized' statement + Add or remove blank line after 'synchronized' statement. nl_before_do { Ignore, Add, Remove, Force } - Add or remove blank line before 'do' + Add or remove blank line before 'do'. nl_after_do { Ignore, Add, Remove, Force } - Add or remove blank line after 'do/while' statement + Add or remove blank line after 'do/while' statement. nl_ds_struct_enum_cmt { False, True } - Whether to double-space commented-entries in struct/union/enum + Whether to double-space commented-entries in struct/union/enum. nl_ds_struct_enum_close_brace { False, True } force nl before } of a struct/union/enum - (lower priority than 'eat_blanks_before_close_brace') + (lower priority than 'eat_blanks_before_close_brace'). nl_before_func_class_def Unsigned Number - Add or remove blank line before 'func_class_def' + Add or remove blank line before 'func_class_def'. nl_before_func_class_proto Unsigned Number - Add or remove blank line before 'func_class_proto' + Add or remove blank line before 'func_class_proto'. nl_class_colon { Ignore, Add, Remove, Force } Add or remove a newline before/after a class colon, @@ -1345,64 +1374,64 @@ nl_constr_colon { Ignore, Add, Remove, Force } nl_create_if_one_liner { False, True } Change simple unbraced if statements into a one-liner - 'if(b)\n i++;' => 'if(b) i++;' + 'if(b)\n i++;' => 'if(b) i++;'. nl_create_for_one_liner { False, True } Change simple unbraced for statements into a one-liner - 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' + 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);'. nl_create_while_one_liner { False, True } Change simple unbraced while statements into a one-liner - 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' + 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);'. nl_split_if_one_liner { False, True } Change a one-liner if statement into simple unbraced if - 'if(b) i++;' => 'if(b)\n i++;' + 'if(b) i++;' => 'if(b)\n i++;'. nl_split_for_one_liner { False, True } Change a one-liner for statement into simple unbraced for - 'for (i=0;<5;i++) foo(i);' => 'for (i=0;<5;i++)\n foo(i);' + 'for (i=0;<5;i++) foo(i);' => 'for (i=0;<5;i++)\n foo(i);'. nl_split_while_one_liner { False, True } Change a one-liner while statement into simple unbraced while - 'while (i<5) foo(i++);' => 'while (i<5)\n foo(i++);' + 'while (i<5) foo(i++);' => 'while (i<5)\n foo(i++);'. # # Blank line options # nl_max Unsigned Number - The maximum consecutive newlines (3 = 2 blank lines) + The maximum consecutive newlines (3 = 2 blank lines). nl_max_blank_in_func Unsigned Number - The maximum consecutive newlines in function + The maximum consecutive newlines in function. nl_after_func_proto Unsigned Number - The number of newlines after a function prototype, if followed by another function prototype + The number of newlines after a function prototype, if followed by another function prototype. nl_after_func_proto_group Unsigned Number - The number of newlines after a function prototype, if not followed by another function prototype + The number of newlines after a function prototype, if not followed by another function prototype. nl_after_func_class_proto Unsigned Number - The number of newlines after a function class prototype, if followed by another function class prototype + The number of newlines after a function class prototype, if followed by another function class prototype. nl_after_func_class_proto_group Unsigned Number - The number of newlines after a function class prototype, if not followed by another function class prototype + The number of newlines after a function class prototype, if not followed by another function class prototype. nl_before_func_body_def Unsigned Number - The number of newlines before a multi-line function def body + The number of newlines before a multi-line function def body. nl_before_func_body_proto Unsigned Number - The number of newlines before a multi-line function prototype body + The number of newlines before a multi-line function prototype body. nl_after_func_body Unsigned Number - The number of newlines after '}' of a multi-line function body + The number of newlines after '}' of a multi-line function body. nl_after_func_body_class Unsigned Number - The number of newlines after '}' of a multi-line function body in a class declaration + The number of newlines after '}' of a multi-line function body in a class declaration. nl_after_func_body_one_liner Unsigned Number - The number of newlines after '}' of a single line function body + The number of newlines after '}' of a single line function body. nl_before_block_comment Unsigned Number The minimum number of newlines before a multi-line comment. @@ -1423,13 +1452,13 @@ nl_after_label_colon { False, True } Whether to force a newline after a label's colon. nl_after_struct Unsigned Number - The number of newlines after '}' or ';' of a struct/enum/union definition + The number of newlines after '}' or ';' of a struct/enum/union definition. nl_before_class Unsigned Number - The number of newlines before a class definition + The number of newlines before a class definition. nl_after_class Unsigned Number - The number of newlines after '}' or ';' of a class definition + The number of newlines after '}' or ';' of a class definition. nl_before_access_spec Unsigned Number The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. @@ -1439,7 +1468,7 @@ nl_before_access_spec Unsigned Number nl_after_access_spec Unsigned Number The number of newlines after a 'private:', 'public:', 'protected:', 'signals:' or 'slots:' label. 0 = No change. - the option 'nl_after_access_spec' takes preference over 'nl_typedef_blk_start' and 'nl_var_def_blk_start' + Overrides 'nl_typedef_blk_start' and 'nl_var_def_blk_start'. nl_comment_func_def Unsigned Number The number of newlines between a function def and the function comment. @@ -1458,13 +1487,13 @@ nl_between_get_set Unsigned Number 0 = No change. nl_property_brace { Ignore, Add, Remove, Force } - Add or remove newline between C# property and the '{' + Add or remove newline between C# property and the '{'. eat_blanks_after_open_brace { False, True } - Whether to remove blank lines after '{' + Whether to remove blank lines after '{'. eat_blanks_before_close_brace { False, True } - Whether to remove blank lines before '}' + Whether to remove blank lines before '}'. nl_remove_extra_newlines Unsigned Number How aggressively to remove extra newlines not in preproc. @@ -1490,26 +1519,26 @@ nl_between_annotation { Ignore, Add, Remove, Force } # pos_arith { Ignore, Lead, Trail } - The position of arithmetic operators in wrapped expressions + The position of arithmetic operators in wrapped expressions. pos_assign { Ignore, Lead, Trail } The position of assignment in wrapped expressions. - Do not affect '=' followed by '{' + Do not affect '=' followed by '{'. pos_bool { Ignore, Lead, Trail } - The position of boolean operators in wrapped expressions + The position of boolean operators in wrapped expressions. pos_compare { Ignore, Lead, Trail } - The position of comparison operators in wrapped expressions + The position of comparison operators in wrapped expressions. pos_conditional { Ignore, Lead, Trail } - The position of conditional (b ? t : f) operators in wrapped expressions + The position of conditional (b ? t : f) operators in wrapped expressions. pos_comma { Ignore, Lead, Trail } - The position of the comma in wrapped expressions + The position of the comma in wrapped expressions. pos_enum_comma { Ignore, Lead, Trail } - The position of the comma in enum entries + The position of the comma in enum entries. pos_class_comma { Ignore, Lead, Trail } The position of the comma in the base class list if there are more than one line, @@ -1536,35 +1565,44 @@ code_width Unsigned Number Try to limit code width to N number of columns ls_for_split_full { False, True } - Whether to fully split long 'for' statements at semi-colons + Whether to fully split long 'for' statements at semi-colons. ls_func_split_full { False, True } - Whether to fully split long function protos/calls at commas + Whether to fully split long function protos/calls at commas. ls_code_width { False, True } - Whether to split lines as close to code_width as possible and ignore some groupings + Whether to split lines as close to code_width as possible and ignore some groupings. # # Code alignment (not left column spaces/tabs) # align_keep_tabs { False, True } - Whether to keep non-indenting tabs + Whether to keep non-indenting tabs. align_with_tabs { False, True } - Whether to use tabs for aligning + Whether to use tabs for aligning. align_on_tabstop { False, True } - Whether to bump out to the next tab when aligning + Whether to bump out to the next tab when aligning. -align_number_right { False, True } - Whether to right-align numbers +align_number_right { False, True } + Whether to right-align numbers. align_keep_extra_space { False, True } Whether to keep whitespace not required for alignment. align_func_params { False, True } - Align variable definitions in prototypes and functions + Align variable definitions in prototypes and functions. + +align_func_params_span Unsigned Number + The span for aligning parameter definitions in function on parameter name (0=don't align). + +align_func_params_thresh Unsigned Number + The threshold for aligning function parameter definitions (0=no limit). + +align_func_params_gap Unsigned Number + The gap for aligning function parameter definitions. align_same_func_call_params { False, True } Align parameters in single-line functions that have the same name. @@ -1589,19 +1627,19 @@ align_var_def_thresh Unsigned Number The threshold for aligning variable definitions (0=no limit) align_var_def_gap Unsigned Number - The gap for aligning variable definitions + The gap for aligning variable definitions. align_var_def_colon { False, True } - Whether to align the colon in struct bit fields + Whether to align the colon in struct bit fields. align_var_def_colon_gap Unsigned Number - align variable defs gap for bit colons + align variable defs gap for bit colons. align_var_def_attribute { False, True } - Whether to align any attribute after the variable name + Whether to align any attribute after the variable name. align_var_def_inline { False, True } - Whether to align inline struct/enum/union variable definitions + Whether to align inline struct/enum/union variable definitions. align_assign_span Unsigned Number The span for aligning on '=' in assignments (0=don't align) @@ -1619,10 +1657,10 @@ align_var_class_span Unsigned Number The span for aligning class (0=don't align) align_var_class_thresh Unsigned Number - The threshold for aligning class member definitions (0=no limit) + The threshold for aligning class member definitions (0=no limit). align_var_class_gap Unsigned Number - The gap for aligning class member definitions + The gap for aligning class member definitions. align_var_struct_span Unsigned Number The span for aligning struct/union (0=don't align) @@ -1631,16 +1669,16 @@ align_var_struct_thresh Unsigned Number The threshold for aligning struct/union member definitions (0=no limit) align_var_struct_gap Unsigned Number - The gap for aligning struct/union member definitions + The gap for aligning struct/union member definitions. align_struct_init_span Unsigned Number The span for aligning struct initializer values (0=don't align) align_typedef_gap Unsigned Number - The minimum space between the type and the synonym of a typedef + The minimum space between the type and the synonym of a typedef. align_typedef_span Unsigned Number - The span for aligning single-line typedefs (0=don't align) + The span for aligning single-line typedefs (0=don't align). align_typedef_func Unsigned Number How to align typedef'd functions with other typedefs @@ -1664,7 +1702,7 @@ align_right_cmt_span Unsigned Number The span for aligning comments that end lines (0=don't align) align_right_cmt_mix { False, True } - If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment + If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment. align_right_cmt_gap Unsigned Number If a trailing comment is more than this number of columns away from the text it follows, @@ -1674,24 +1712,24 @@ align_right_cmt_at_col Unsigned Number Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore) align_func_proto_span Unsigned Number - The span for aligning function prototypes (0=don't align) + The span for aligning function prototypes (0=don't align). align_func_proto_gap Unsigned Number Minimum gap between the return type and the function name. align_on_operator { False, True } - Align function protos on the 'operator' keyword instead of what follows + Align function protos on the 'operator' keyword instead of what follows. align_mix_var_proto { False, True } Whether to mix aligning prototype and variable declarations. If True, align_var_def_XXX options are used instead of align_func_proto_XXX options. align_single_line_func { False, True } - Align single-line functions with function prototypes, uses align_func_proto_span + Align single-line functions with function prototypes, uses align_func_proto_span. align_single_line_brace { False, True } Aligning the open brace of single-line functions. - Requires align_single_line_func=True, uses align_func_proto_span + Requires align_single_line_func=True, uses align_func_proto_span. align_single_line_brace_gap Unsigned Number Gap for align_single_line_brace. @@ -1704,16 +1742,16 @@ align_nl_cont { False, True } This will not work right if the macro contains a multi-line comment. align_pp_define_together { False, True } - # Align macro functions and variables together + # Align macro functions and variables together. align_pp_define_gap Unsigned Number - The minimum space between label and value of a preprocessor define + The minimum space between label and value of a preprocessor define. align_pp_define_span Unsigned Number The span for aligning on '#define' bodies (0=don't align, other=number of lines including comments between blocks) align_left_shift { False, True } - Align lines that start with '<<' with previous '<<'. Default=True + Align lines that start with '<<' with previous '<<'. Default=True. align_asm_colon { False, True } Align text after asm volatile () colons. @@ -1725,7 +1763,7 @@ align_oc_msg_colon_first { False, True } If True, always align with the first parameter, even if it is too short. align_oc_decl_colon { False, True } - Aligning parameters in an Obj-C '+' or '-' declaration on the ':' + Aligning parameters in an Obj-C '+' or '-' declaration on the ':'. # # Comment modifications @@ -1745,41 +1783,41 @@ cmt_convert_tab_to_spaces { False, True } cmt_indent_multi { False, True } If False, disable all multi-line comment changes, including cmt_width. keyword substitution and leading chars. - Default=True + Default=True. cmt_c_group { False, True } - Whether to group c-comments that look like they are in a block + Whether to group c-comments that look like they are in a block. cmt_c_nl_start { False, True } - Whether to put an empty '/*' on the first line of the combined c-comment + Whether to put an empty '/*' on the first line of the combined c-comment. cmt_c_nl_end { False, True } - Whether to put a newline before the closing '*/' of the combined c-comment + Whether to put a newline before the closing '*/' of the combined c-comment. cmt_cpp_group { False, True } - Whether to group cpp-comments that look like they are in a block + Whether to group cpp-comments that look like they are in a block. cmt_cpp_nl_start { False, True } - Whether to put an empty '/*' on the first line of the combined cpp-comment + Whether to put an empty '/*' on the first line of the combined cpp-comment. cmt_cpp_nl_end { False, True } - Whether to put a newline before the closing '*/' of the combined cpp-comment + Whether to put a newline before the closing '*/' of the combined cpp-comment. cmt_cpp_to_c { False, True } - Whether to change cpp-comments into c-comments + Whether to change cpp-comments into c-comments. cmt_star_cont { False, True } - Whether to put a star on subsequent comment lines + Whether to put a star on subsequent comment lines. cmt_sp_before_star_cont Unsigned Number - The number of spaces to insert at the start of subsequent comment lines + The number of spaces to insert at the start of subsequent comment lines. cmt_sp_after_star_cont Number - The number of spaces to insert after the star on subsequent comment lines + The number of spaces to insert after the star on subsequent comment lines. cmt_multi_check_last { False, True } For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of - the comment are the same length. Default=True + the comment are the same length. Default=True. cmt_multi_first_len_minimum Unsigned Number For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of @@ -1796,7 +1834,7 @@ cmt_insert_file_footer String cmt_insert_func_header String The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment. Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. - Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } + Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... }. cmt_insert_class_header String The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment. @@ -1826,13 +1864,13 @@ cmt_insert_before_ctor_dtor { False, True } # mod_full_brace_do { Ignore, Add, Remove, Force } - Add or remove braces on single-line 'do' statement + Add or remove braces on single-line 'do' statement. mod_full_brace_for { Ignore, Add, Remove, Force } - Add or remove braces on single-line 'for' statement + Add or remove braces on single-line 'for' statement. mod_full_brace_function { Ignore, Add, Remove, Force } - Add or remove braces on single-line function definitions. (Pawn) + Add or remove braces on single-line function definitions. (Pawn). mod_full_brace_if { Ignore, Add, Remove, Force } Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. @@ -1853,22 +1891,22 @@ mod_full_brace_nl_block_rem_mlcond { False, True } Blocks removal of braces if the parenthesis of if/for/while/.. span multiple lines. mod_full_brace_while { Ignore, Add, Remove, Force } - Add or remove braces on single-line 'while' statement + Add or remove braces on single-line 'while' statement. mod_full_brace_using { Ignore, Add, Remove, Force } - Add or remove braces on single-line 'using ()' statement + Add or remove braces on single-line 'using ()' statement. mod_paren_on_return { Ignore, Add, Remove, Force } - Add or remove unnecessary paren on 'return' statement + Add or remove unnecessary paren on 'return' statement. mod_pawn_semicolon { False, True } - Whether to change optional semicolons to real semicolons + Whether to change optional semicolons to real semicolons. mod_full_paren_if_bool { False, True } - Add parens on 'while' and 'if' statement around bools + Add parens on 'while' and 'if' statement around bools. mod_remove_extra_semicolon { False, True } - Whether to remove superfluous semicolons + Whether to remove superfluous semicolons. mod_add_long_function_closebrace_comment Unsigned Number If a function body exceeds the specified number of newlines and doesn't have a comment after @@ -1895,10 +1933,10 @@ mod_add_long_ifdef_else_comment Unsigned Number the #else, a comment will be added. mod_sort_import { False, True } - If True, will sort consecutive single-line 'import' statements [Java, D] + If True, will sort consecutive single-line 'import' statements [Java, D]. mod_sort_using { False, True } - If True, will sort consecutive single-line 'using' statements [C#] + If True, will sort consecutive single-line 'using' statements [C#]. mod_sort_include { False, True } If True, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] @@ -1915,55 +1953,55 @@ mod_remove_empty_return { False, True } If True, it will remove a void 'return;' that appears as the last statement in a function. mod_sort_oc_properties { False, True } - If True, it will organize the properties (Obj-C) + If True, it will organize the properties (Obj-C). mod_sort_oc_property_class_weight Number - Determines weight of class property modifier (Obj-C) + Determines weight of class property modifier (Obj-C). mod_sort_oc_property_thread_safe_weight Number - Determines weight of atomic, nonatomic (Obj-C) + Determines weight of atomic, nonatomic (Obj-C). mod_sort_oc_property_readwrite_weight Number - Determines weight of readwrite (Obj-C) + Determines weight of readwrite (Obj-C). mod_sort_oc_property_reference_weight Number - Determines weight of reference type (retain, copy, assign, weak, strong) (Obj-C) + Determines weight of reference type (retain, copy, assign, weak, strong) (Obj-C). mod_sort_oc_property_getter_weight Number - Determines weight of getter type (getter=) (Obj-C) + Determines weight of getter type (getter=) (Obj-C). mod_sort_oc_property_setter_weight Number - Determines weight of setter type (setter=) (Obj-C) + Determines weight of setter type (setter=) (Obj-C). mod_sort_oc_property_nullability_weight Number - Determines weight of nullability type (nullable, nonnull, null_unspecified, null_resettable) (Obj-C) + Determines weight of nullability type (nullable, nonnull, null_unspecified, null_resettable) (Obj-C). # # Preprocessor options # pp_indent { Ignore, Add, Remove, Force } - Control indent of preprocessors inside #if blocks at brace level 0 (file-level) + Control indent of preprocessors inside #if blocks at brace level 0 (file-level). pp_indent_at_level { False, True } - Whether to indent #if/#else/#endif at the brace level (True) or from column 1 (False) + Whether to indent #if/#else/#endif at the brace level (True) or from column 1 (False). pp_indent_count Unsigned Number Specifies the number of columns to indent preprocessors per level at brace level 0 (file-level). If pp_indent_at_level=False, specifies the number of columns to indent preprocessors per level at brace level > 0 (function-level). - Default=1 + Default=1. pp_space { Ignore, Add, Remove, Force } - Add or remove space after # based on pp_level of #if blocks + Add or remove space after # based on pp_level of #if blocks. pp_space_count Unsigned Number - Sets the number of spaces added with pp_space + Sets the number of spaces added with pp_space. pp_indent_region Number - The indent for #region and #endregion in C# and '#pragma region' in C/C++ + The indent for #region and #endregion in C# and '#pragma region' in C/C++. pp_region_indent_code { False, True } - Whether to indent the code between #region and #endregion + Whether to indent the code between #region and #endregion. pp_indent_if Number If pp_indent_at_level=True, sets the indent for #if, #else and #endif when not at file-level. @@ -1974,26 +2012,26 @@ pp_if_indent_code { False, True } Control whether to indent the code between #if, #else and #endif. pp_define_at_level { False, True } - Whether to indent '#define' at the brace level (True) or from column 1 (false) + Whether to indent '#define' at the brace level (True) or from column 1 (false). pp_ignore_define_body { False, True } Whether to ignore the '#define' body while formatting. pp_indent_case { False, True } Whether to indent case statements between #if, #else, and #endif. - Only applies to the indent of the preprocesser that the case statements directly inside of + Only applies to the indent of the preprocesser that the case statements directly inside of. pp_indent_func_def { False, True } Whether to indent whole function definitions between #if, #else, and #endif. - Only applies to the indent of the preprocesser that the function definition is directly inside of + Only applies to the indent of the preprocesser that the function definition is directly inside of. pp_indent_extern { False, True } Whether to indent extern C blocks between #if, #else, and #endif. - Only applies to the indent of the preprocesser that the extern block is directly inside of + Only applies to the indent of the preprocesser that the extern block is directly inside of. pp_indent_brace { False, True } Whether to indent braces directly inside #if, #else, and #endif. - Only applies to the indent of the preprocesser that the braces are directly inside of + Only applies to the indent of the preprocesser that the braces are directly inside of. # # Sort includes options @@ -2014,7 +2052,7 @@ include_category_2 String use_indent_func_call_param { False, True } True: indent_func_call_param will be used (default) - False: indent_func_call_param will NOT be used + False: indent_func_call_param will NOT be used. use_indent_continue_only_once { False, True } The value of the indentation for a continuation line is calculate differently if the line is: @@ -2025,11 +2063,11 @@ use_indent_continue_only_once { False, True } at the function call (if present) To prevent the double use of the option value, use this option with the value 'True'. True: indent_continue will be used only once - False: indent_continue will be used every time (default) + False: indent_continue will be used every time (default). use_options_overriding_for_qt_macros { False, True } SIGNAL/SLOT Qt macros have special formatting options. See options_for_QT.cpp for details. - Default=True + Default=True. # # Warn levels - 1: error, 2: warning (default), 3: note @@ -2090,4 +2128,4 @@ warn_level_tabs_found_in_verbatim_string_literals Unsigned Number # `macro-open BEGIN_MESSAGE_MAP` # `macro-close END_MESSAGE_MAP` # -# \ No newline at end of file +# diff --git a/documentation/htdocs/default.cfg b/documentation/htdocs/default.cfg index 5257131d98..cb6f1681cb 100644 --- a/documentation/htdocs/default.cfg +++ b/documentation/htdocs/default.cfg @@ -1,19 +1,19 @@ -# Uncrustify-0.65-106-9518877-dirty +# Uncrustify-0.66 # # General options # -# The type of line endings. Default=Auto +# The type of line endings. Default=Auto. newlines = auto # auto/lf/crlf/cr -# The original size of tabs in the input. Default=8 +# The original size of tabs in the input. Default=8. input_tab_size = 8 # unsigned number -# The size of tabs in the output (only used if align_with_tabs=true). Default=8 +# The size of tabs in the output (only used if align_with_tabs=true). Default=8. output_tab_size = 8 # unsigned number -# The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn) +# The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn). string_escape_char = 92 # unsigned number # Alternate string escape char for Pawn. Only works right before the quote char. @@ -33,16 +33,16 @@ disable_processing_cmt = "" # string # Override the default ' *INDENT-ON*' in comments for enabling processing of part of the file. enable_processing_cmt = "" # string -# Enable parsing of digraphs. Default=False +# Enable parsing of digraphs. Default=False. enable_digraphs = false # false/true -# Control what to do with the UTF-8 BOM (recommend 'remove') +# Control what to do with the UTF-8 BOM (recommend 'remove'). utf8_bom = ignore # ignore/add/remove/force -# If the file contains bytes with values between 128 and 255, but is not UTF-8, then output as UTF-8 +# If the file contains bytes with values between 128 and 255, but is not UTF-8, then output as UTF-8. utf8_byte = false # false/true -# Force the output encoding to UTF-8 +# Force the output encoding to UTF-8. utf8_force = false # false/true # @@ -50,19 +50,22 @@ utf8_force = false # false/true # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -# also '>>>' '<<' '>>' '%' '|' +# also '>>>' '<<' '>>' '%' '|'. sp_arith = ignore # ignore/add/remove/force -# Add or remove space around assignment operator '=', '+=', etc +# Add or remove space around arithmetic operator '+' and '-'. Overrides sp_arith +sp_arith_additive = ignore # ignore/add/remove/force + +# Add or remove space around assignment operator '=', '+=', etc. sp_assign = ignore # ignore/add/remove/force -# Add or remove space around '=' in C++11 lambda capture specifications. Overrides sp_assign +# Add or remove space around '=' in C++11 lambda capture specifications. Overrides sp_assign. sp_cpp_lambda_assign = ignore # ignore/add/remove/force # Add or remove space after the capture specification in C++11 lambda. sp_cpp_lambda_paren = ignore # ignore/add/remove/force -# Add or remove space around assignment operator '=' in a prototype +# Add or remove space around assignment operator '=' in a prototype. sp_assign_default = ignore # ignore/add/remove/force # Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. @@ -71,10 +74,10 @@ sp_before_assign = ignore # ignore/add/remove/force # Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. sp_after_assign = ignore # ignore/add/remove/force -# Add or remove space in 'NS_ENUM (' +# Add or remove space in 'NS_ENUM ('. sp_enum_paren = ignore # ignore/add/remove/force -# Add or remove space around assignment '=' in enum +# Add or remove space around assignment '=' in enum. sp_enum_assign = ignore # ignore/add/remove/force # Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. @@ -83,10 +86,10 @@ sp_enum_before_assign = ignore # ignore/add/remove/force # Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. sp_enum_after_assign = ignore # ignore/add/remove/force -# Add or remove space around assignment ':' in enum +# Add or remove space around assignment ':' in enum. sp_enum_colon = ignore # ignore/add/remove/force -# Add or remove space around preprocessor '##' concatenation operator. Default=Add +# Add or remove space around preprocessor '##' concatenation operator. Default=Add. sp_pp_concat = add # ignore/add/remove/force # Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator. @@ -95,35 +98,35 @@ sp_pp_stringify = ignore # ignore/add/remove/force # Add or remove space before preprocessor '#' stringify operator as in '#define x(y) L#y'. sp_before_pp_stringify = ignore # ignore/add/remove/force -# Add or remove space around boolean operators '&&' and '||' +# Add or remove space around boolean operators '&&' and '||'. sp_bool = ignore # ignore/add/remove/force -# Add or remove space around compare operator '<', '>', '==', etc +# Add or remove space around compare operator '<', '>', '==', etc. sp_compare = ignore # ignore/add/remove/force -# Add or remove space inside '(' and ')' +# Add or remove space inside '(' and ')'. sp_inside_paren = ignore # ignore/add/remove/force -# Add or remove space between nested parens: '((' vs ') )' +# Add or remove space between nested parens: '((' vs ') )'. sp_paren_paren = ignore # ignore/add/remove/force -# Add or remove space between back-to-back parens: ')(' vs ') (' +# Add or remove space between back-to-back parens: ')(' vs ') ('. sp_cparen_oparen = ignore # ignore/add/remove/force -# Whether to balance spaces inside nested parens +# Whether to balance spaces inside nested parens. sp_balance_nested_parens = false # false/true -# Add or remove space between ')' and '{' +# Add or remove space between ')' and '{'. sp_paren_brace = ignore # ignore/add/remove/force -# Add or remove space before pointer star '*' +# Add or remove space before pointer star '*'. sp_before_ptr_star = ignore # ignore/add/remove/force # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force -# Add or remove space between pointer stars '*' +# Add or remove space between pointer stars '*'. sp_between_ptr_star = ignore # ignore/add/remove/force # Add or remove space after pointer star '*', if followed by a word. @@ -141,10 +144,10 @@ sp_ptr_star_paren = ignore # ignore/add/remove/force # Add or remove space before a pointer star '*', if followed by a func proto/def. sp_before_ptr_star_func = ignore # ignore/add/remove/force -# Add or remove space before a reference sign '&' +# Add or remove space before a reference sign '&'. sp_before_byref = ignore # ignore/add/remove/force -# Add or remove space before a reference sign '&' that isn't followed by a variable name +# Add or remove space before a reference sign '&' that isn't followed by a variable name. # If set to 'ignore', sp_before_byref is used instead. sp_before_unnamed_byref = ignore # ignore/add/remove/force @@ -157,7 +160,7 @@ sp_after_byref_func = ignore # ignore/add/remove/force # Add or remove space before a reference sign '&', if followed by a func proto/def. sp_before_byref_func = ignore # ignore/add/remove/force -# Add or remove space between type and word. Default=Force +# Add or remove space between type and word. Default=Force. sp_after_type = force # ignore/add/remove/force # Add or remove space before the paren in the D constructs 'template Foo(' and 'class Foo('. @@ -167,35 +170,38 @@ sp_before_template_paren = ignore # ignore/add/remove/force # If set to ignore, sp_before_angle is used. sp_template_angle = ignore # ignore/add/remove/force -# Add or remove space before '<>' +# Add or remove space before '<>'. sp_before_angle = ignore # ignore/add/remove/force -# Add or remove space inside '<' and '>' +# Add or remove space inside '<' and '>'. sp_inside_angle = ignore # ignore/add/remove/force -# Add or remove space after '<>' +# Add or remove space between '<>' and ':'. +sp_angle_colon = ignore # ignore/add/remove/force + +# Add or remove space after '<>'. sp_after_angle = ignore # ignore/add/remove/force -# Add or remove space between '<>' and '(' as found in 'new List(foo);' +# Add or remove space between '<>' and '(' as found in 'new List(foo);'. sp_angle_paren = ignore # ignore/add/remove/force -# Add or remove space between '<>' and '()' as found in 'new List();' +# Add or remove space between '<>' and '()' as found in 'new List();'. sp_angle_paren_empty = ignore # ignore/add/remove/force -# Add or remove space between '<>' and a word as in 'List m;' or 'template static ...' +# Add or remove space between '<>' and a word as in 'List m;' or 'template static ...'. sp_angle_word = ignore # ignore/add/remove/force -# Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add +# Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add. sp_angle_shift = add # ignore/add/remove/force -# Permit removal of the space between '>>' in 'foo >' (C++11 only). Default=False +# Permit removal of the space between '>>' in 'foo >' (C++11 only). Default=False. # sp_angle_shift cannot remove the space without this option. sp_permit_cpp11_shift = false # false/true # Add or remove space before '(' of 'if', 'for', 'switch', 'while', etc. sp_before_sparen = ignore # ignore/add/remove/force -# Add or remove space inside if-condition '(' and ')' +# Add or remove space inside if-condition '(' and ')'. sp_inside_sparen = ignore # ignore/add/remove/force # Add or remove space before if-condition ')'. Overrides sp_inside_sparen. @@ -216,158 +222,158 @@ sp_invariant_paren = ignore # ignore/add/remove/force # Add or remove space after the ')' in 'invariant (C) c' in the D language. sp_after_invariant_paren = ignore # ignore/add/remove/force -# Add or remove space before empty statement ';' on 'if', 'for' and 'while' +# Add or remove space before empty statement ';' on 'if', 'for' and 'while'. sp_special_semi = ignore # ignore/add/remove/force -# Add or remove space before ';'. Default=Remove +# Add or remove space before ';'. Default=Remove. sp_before_semi = remove # ignore/add/remove/force -# Add or remove space before ';' in non-empty 'for' statements +# Add or remove space before ';' in non-empty 'for' statements. sp_before_semi_for = ignore # ignore/add/remove/force # Add or remove space before a semicolon of an empty part of a for statement. sp_before_semi_for_empty = ignore # ignore/add/remove/force -# Add or remove space after ';', except when followed by a comment. Default=Add +# Add or remove space after ';', except when followed by a comment. Default=Add. sp_after_semi = add # ignore/add/remove/force -# Add or remove space after ';' in non-empty 'for' statements. Default=Force +# Add or remove space after ';' in non-empty 'for' statements. Default=Force. sp_after_semi_for = force # ignore/add/remove/force # Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; ). sp_after_semi_for_empty = ignore # ignore/add/remove/force -# Add or remove space before '[' (except '[]') +# Add or remove space before '[' (except '[]'). sp_before_square = ignore # ignore/add/remove/force -# Add or remove space before '[]' +# Add or remove space before '[]'. sp_before_squares = ignore # ignore/add/remove/force -# Add or remove space inside a non-empty '[' and ']' +# Add or remove space inside a non-empty '[' and ']'. sp_inside_square = ignore # ignore/add/remove/force -# Add or remove space after ',' +# Add or remove space after ',', 'a,b' vs 'a, b'. sp_after_comma = ignore # ignore/add/remove/force -# Add or remove space before ','. Default=Remove +# Add or remove space before ','. Default=Remove. sp_before_comma = remove # ignore/add/remove/force -# Add or remove space between ',' and ']' in multidimensional array type 'int[,,]' +# Add or remove space between ',' and ']' in multidimensional array type 'int[,,]'. Only for C#. sp_after_mdatype_commas = ignore # ignore/add/remove/force -# Add or remove space between '[' and ',' in multidimensional array type 'int[,,]' +# Add or remove space between '[' and ',' in multidimensional array type 'int[,,]'. Only for C#. sp_before_mdatype_commas = ignore # ignore/add/remove/force -# Add or remove space between ',' in multidimensional array type 'int[,,]' +# Add or remove space between ',' in multidimensional array type 'int[,,]'. Only for C#. sp_between_mdatype_commas = ignore # ignore/add/remove/force -# Add or remove space between an open paren and comma: '(,' vs '( ,'. Default=Force +# Add or remove space between an open paren and comma: '(,' vs '( ,'. Default=Force. sp_paren_comma = force # ignore/add/remove/force -# Add or remove space before the variadic '...' when preceded by a non-punctuator +# Add or remove space before the variadic '...' when preceded by a non-punctuator. sp_before_ellipsis = ignore # ignore/add/remove/force -# Add or remove space after class ':' +# Add or remove space after class ':'. sp_after_class_colon = ignore # ignore/add/remove/force -# Add or remove space before class ':' +# Add or remove space before class ':'. sp_before_class_colon = ignore # ignore/add/remove/force -# Add or remove space after class constructor ':' +# Add or remove space after class constructor ':'. sp_after_constr_colon = ignore # ignore/add/remove/force -# Add or remove space before class constructor ':' +# Add or remove space before class constructor ':'. sp_before_constr_colon = ignore # ignore/add/remove/force -# Add or remove space before case ':'. Default=Remove +# Add or remove space before case ':'. Default=Remove. sp_before_case_colon = remove # ignore/add/remove/force -# Add or remove space between 'operator' and operator sign +# Add or remove space between 'operator' and operator sign. sp_after_operator = ignore # ignore/add/remove/force -# Add or remove space between the operator symbol and the open paren, as in 'operator ++(' +# Add or remove space between the operator symbol and the open paren, as in 'operator ++('. sp_after_operator_sym = ignore # ignore/add/remove/force -# Add or remove space between the operator symbol and the open paren when the operator has no arguments, as in 'operator *()' +# Overrides sp_after_operator_sym when the operator has no arguments, as in 'operator *()'. sp_after_operator_sym_empty = ignore # ignore/add/remove/force -# Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' +# Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a'. sp_after_cast = ignore # ignore/add/remove/force -# Add or remove spaces inside cast parens +# Add or remove spaces inside cast parens. sp_inside_paren_cast = ignore # ignore/add/remove/force -# Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)' +# Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)'. sp_cpp_cast_paren = ignore # ignore/add/remove/force -# Add or remove space between 'sizeof' and '(' +# Add or remove space between 'sizeof' and '('. sp_sizeof_paren = ignore # ignore/add/remove/force -# Add or remove space after the tag keyword (Pawn) +# Add or remove space after the tag keyword (Pawn). sp_after_tag = ignore # ignore/add/remove/force -# Add or remove space inside enum '{' and '}' +# Add or remove space inside enum '{' and '}'. sp_inside_braces_enum = ignore # ignore/add/remove/force -# Add or remove space inside struct/union '{' and '}' +# Add or remove space inside struct/union '{' and '}'. sp_inside_braces_struct = ignore # ignore/add/remove/force -# Add or remove space after open brace in an unnamed temporary direct-list-initialization +# Add or remove space after open brace in an unnamed temporary direct-list-initialization. sp_after_type_brace_init_lst_open = ignore # ignore/add/remove/force -# Add or remove space before close brace in an unnamed temporary direct-list-initialization +# Add or remove space before close brace in an unnamed temporary direct-list-initialization. sp_before_type_brace_init_lst_close = ignore # ignore/add/remove/force -# Add or remove space inside an unnamed temporary direct-list-initialization +# Add or remove space inside an unnamed temporary direct-list-initialization. sp_inside_type_brace_init_lst = ignore # ignore/add/remove/force -# Add or remove space inside '{' and '}' +# Add or remove space inside '{' and '}'. sp_inside_braces = ignore # ignore/add/remove/force -# Add or remove space inside '{}' +# Add or remove space inside '{}'. sp_inside_braces_empty = ignore # ignore/add/remove/force # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. sp_type_func = ignore # ignore/add/remove/force -# Add or remove space between type and open brace of an unnamed temporary direct-list-initialization +# Add or remove space between type and open brace of an unnamed temporary direct-list-initialization. sp_type_brace_init_lst = ignore # ignore/add/remove/force -# Add or remove space between function name and '(' on function declaration +# Add or remove space between function name and '(' on function declaration. sp_func_proto_paren = ignore # ignore/add/remove/force -# Add or remove space between function name and '()' on function declaration without parameters +# Add or remove space between function name and '()' on function declaration without parameters. sp_func_proto_paren_empty = ignore # ignore/add/remove/force -# Add or remove space between function name and '(' on function definition +# Add or remove space between function name and '(' on function definition. sp_func_def_paren = ignore # ignore/add/remove/force -# Add or remove space between function name and '()' on function definition without parameters +# Add or remove space between function name and '()' on function definition without parameters. sp_func_def_paren_empty = ignore # ignore/add/remove/force -# Add or remove space inside empty function '()' +# Add or remove space inside empty function '()'. sp_inside_fparens = ignore # ignore/add/remove/force -# Add or remove space inside function '(' and ')' +# Add or remove space inside function '(' and ')'. sp_inside_fparen = ignore # ignore/add/remove/force -# Add or remove space inside the first parens in the function type: 'void (*x)(...)' +# Add or remove space inside the first parens in the function type: 'void (*x)(...)'. sp_inside_tparen = ignore # ignore/add/remove/force -# Add or remove between the parens in the function type: 'void (*x)(...)' +# Add or remove between the parens in the function type: 'void (*x)(...)'. sp_after_tparen_close = ignore # ignore/add/remove/force # Add or remove space between ']' and '(' when part of a function call. sp_square_fparen = ignore # ignore/add/remove/force -# Add or remove space between ')' and '{' of function +# Add or remove space between ')' and '{' of function. sp_fparen_brace = ignore # ignore/add/remove/force # Java: Add or remove space between ')' and '{{' of double brace initializer. sp_fparen_dbrace = ignore # ignore/add/remove/force -# Add or remove space between function name and '(' on function calls +# Add or remove space between function name and '(' on function calls. sp_func_call_paren = ignore # ignore/add/remove/force # Add or remove space between function name and '()' on function calls without parameters. @@ -378,25 +384,25 @@ sp_func_call_paren_empty = ignore # ignore/add/remove/force # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. sp_func_call_user_paren = ignore # ignore/add/remove/force -# Add or remove space between a constructor/destructor and the open paren +# Add or remove space between a constructor/destructor and the open paren. sp_func_class_paren = ignore # ignore/add/remove/force -# Add or remove space between a constructor without parameters or destructor and '()' +# Add or remove space between a constructor without parameters or destructor and '()'. sp_func_class_paren_empty = ignore # ignore/add/remove/force -# Add or remove space between 'return' and '(' +# Add or remove space between 'return' and '('. sp_return_paren = ignore # ignore/add/remove/force -# Add or remove space between '__attribute__' and '(' +# Add or remove space between '__attribute__' and '('. sp_attribute_paren = ignore # ignore/add/remove/force -# Add or remove space between 'defined' and '(' in '#if defined (FOO)' +# Add or remove space between 'defined' and '(' in '#if defined (FOO)'. sp_defined_paren = ignore # ignore/add/remove/force -# Add or remove space between 'throw' and '(' in 'throw (something)' +# Add or remove space between 'throw' and '(' in 'throw (something)'. sp_throw_paren = ignore # ignore/add/remove/force -# Add or remove space between 'throw' and anything other than '(' as in '@throw [...];' +# Add or remove space between 'throw' and anything other than '(' as in '@throw [...];'. sp_after_throw = ignore # ignore/add/remove/force # Add or remove space between 'catch' and '(' in 'catch (something) { }' @@ -411,151 +417,151 @@ sp_version_paren = ignore # ignore/add/remove/force # If set to ignore, sp_before_sparen is used. sp_scope_paren = ignore # ignore/add/remove/force -# Add or remove space between 'super' and '(' in 'super (something)'. Default=Remove +# Add or remove space between 'super' and '(' in 'super (something)'. Default=Remove. sp_super_paren = remove # ignore/add/remove/force -# Add or remove space between 'this' and '(' in 'this (something)'. Default=Remove +# Add or remove space between 'this' and '(' in 'this (something)'. Default=Remove. sp_this_paren = remove # ignore/add/remove/force -# Add or remove space between macro and value +# Add or remove space between macro and value. sp_macro = ignore # ignore/add/remove/force -# Add or remove space between macro function ')' and value +# Add or remove space between macro function ')' and value. sp_macro_func = ignore # ignore/add/remove/force -# Add or remove space between 'else' and '{' if on the same line +# Add or remove space between 'else' and '{' if on the same line. sp_else_brace = ignore # ignore/add/remove/force -# Add or remove space between '}' and 'else' if on the same line +# Add or remove space between '}' and 'else' if on the same line. sp_brace_else = ignore # ignore/add/remove/force -# Add or remove space between '}' and the name of a typedef on the same line +# Add or remove space between '}' and the name of a typedef on the same line. sp_brace_typedef = ignore # ignore/add/remove/force -# Add or remove space between 'catch' and '{' if on the same line +# Add or remove space between 'catch' and '{' if on the same line. sp_catch_brace = ignore # ignore/add/remove/force -# Add or remove space between '}' and 'catch' if on the same line +# Add or remove space between '}' and 'catch' if on the same line. sp_brace_catch = ignore # ignore/add/remove/force -# Add or remove space between 'finally' and '{' if on the same line +# Add or remove space between 'finally' and '{' if on the same line. sp_finally_brace = ignore # ignore/add/remove/force -# Add or remove space between '}' and 'finally' if on the same line +# Add or remove space between '}' and 'finally' if on the same line. sp_brace_finally = ignore # ignore/add/remove/force -# Add or remove space between 'try' and '{' if on the same line +# Add or remove space between 'try' and '{' if on the same line. sp_try_brace = ignore # ignore/add/remove/force -# Add or remove space between get/set and '{' if on the same line +# Add or remove space between get/set and '{' if on the same line. sp_getset_brace = ignore # ignore/add/remove/force -# Add or remove space between a variable and '{' for C++ uniform initialization. Default=Add +# Add or remove space between a variable and '{' for C++ uniform initialization. Default=Add. sp_word_brace = add # ignore/add/remove/force -# Add or remove space between a variable and '{' for a namespace. Default=Add +# Add or remove space between a variable and '{' for a namespace. Default=Add. sp_word_brace_ns = add # ignore/add/remove/force -# Add or remove space before the '::' operator +# Add or remove space before the '::' operator. sp_before_dc = ignore # ignore/add/remove/force -# Add or remove space after the '::' operator +# Add or remove space after the '::' operator. sp_after_dc = ignore # ignore/add/remove/force -# Add or remove around the D named array initializer ':' operator +# Add or remove around the D named array initializer ':' operator. sp_d_array_colon = ignore # ignore/add/remove/force -# Add or remove space after the '!' (not) operator. Default=Remove +# Add or remove space after the '!' (not) operator. Default=Remove. sp_not = remove # ignore/add/remove/force -# Add or remove space after the '~' (invert) operator. Default=Remove +# Add or remove space after the '~' (invert) operator. Default=Remove. sp_inv = remove # ignore/add/remove/force # Add or remove space after the '&' (address-of) operator. Default=Remove # This does not affect the spacing after a '&' that is part of a type. sp_addr = remove # ignore/add/remove/force -# Add or remove space around the '.' or '->' operators. Default=Remove +# Add or remove space around the '.' or '->' operators. Default=Remove. sp_member = remove # ignore/add/remove/force # Add or remove space after the '*' (dereference) operator. Default=Remove # This does not affect the spacing after a '*' that is part of a type. sp_deref = remove # ignore/add/remove/force -# Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove +# Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove. sp_sign = remove # ignore/add/remove/force -# Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove +# Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove. sp_incdec = remove # ignore/add/remove/force -# Add or remove space before a backslash-newline at the end of a line. Default=Add +# Add or remove space before a backslash-newline at the end of a line. Default=Add. sp_before_nl_cont = add # ignore/add/remove/force -# Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' +# Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;'. sp_after_oc_scope = ignore # ignore/add/remove/force # Add or remove space after the colon in message specs -# '-(int) f:(int) x;' vs '-(int) f: (int) x;' +# '-(int) f:(int) x;' vs '-(int) f: (int) x;'. sp_after_oc_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in message specs -# '-(int) f: (int) x;' vs '-(int) f : (int) x;' +# '-(int) f: (int) x;' vs '-(int) f : (int) x;'. sp_before_oc_colon = ignore # ignore/add/remove/force # Add or remove space after the colon in immutable dictionary expression -# 'NSDictionary *test = @{@"foo" :@"bar"};' +# 'NSDictionary *test = @{@"foo" :@"bar"};'. sp_after_oc_dict_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in immutable dictionary expression -# 'NSDictionary *test = @{@"foo" :@"bar"};' +# 'NSDictionary *test = @{@"foo" :@"bar"};'. sp_before_oc_dict_colon = ignore # ignore/add/remove/force # Add or remove space after the colon in message specs -# '[object setValue:1];' vs '[object setValue: 1];' +# '[object setValue:1];' vs '[object setValue: 1];'. sp_after_send_oc_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in message specs -# '[object setValue:1];' vs '[object setValue :1];' +# '[object setValue:1];' vs '[object setValue :1];'. sp_before_send_oc_colon = ignore # ignore/add/remove/force # Add or remove space after the (type) in message specs -# '-(int)f: (int) x;' vs '-(int)f: (int)x;' +# '-(int)f: (int) x;' vs '-(int)f: (int)x;'. sp_after_oc_type = ignore # ignore/add/remove/force # Add or remove space after the first (type) in message specs -# '-(int) f:(int)x;' vs '-(int)f:(int)x;' +# '-(int) f:(int)x;' vs '-(int)f:(int)x;'. sp_after_oc_return_type = ignore # ignore/add/remove/force # Add or remove space between '@selector' and '(' # '@selector(msgName)' vs '@selector (msgName)' -# Also applies to @protocol() constructs +# Also applies to @protocol() constructs. sp_after_oc_at_sel = ignore # ignore/add/remove/force # Add or remove space between '@selector(x)' and the following word -# '@selector(foo) a:' vs '@selector(foo)a:' +# '@selector(foo) a:' vs '@selector(foo)a:'. sp_after_oc_at_sel_parens = ignore # ignore/add/remove/force # Add or remove space inside '@selector' parens # '@selector(foo)' vs '@selector( foo )' -# Also applies to @protocol() constructs +# Also applies to @protocol() constructs. sp_inside_oc_at_sel_parens = ignore # ignore/add/remove/force # Add or remove space before a block pointer caret -# '^int (int arg){...}' vs. ' ^int (int arg){...}' +# '^int (int arg){...}' vs. ' ^int (int arg){...}'. sp_before_oc_block_caret = ignore # ignore/add/remove/force # Add or remove space after a block pointer caret -# '^int (int arg){...}' vs. '^ int (int arg){...}' +# '^int (int arg){...}' vs. '^ int (int arg){...}'. sp_after_oc_block_caret = ignore # ignore/add/remove/force # Add or remove space between the receiver and selector in a message. -# '[receiver selector ...]' +# '[receiver selector ...]'. sp_after_oc_msg_receiver = ignore # ignore/add/remove/force # Add or remove space after @property. sp_after_oc_property = ignore # ignore/add/remove/force -# Add or remove space around the ':' in 'b ? t : f' +# Add or remove space around the ':' in 'b ? t : f'. sp_cond_colon = ignore # ignore/add/remove/force # Add or remove space before the ':' in 'b ? t : f'. Overrides sp_cond_colon. @@ -564,7 +570,7 @@ sp_cond_colon_before = ignore # ignore/add/remove/force # Add or remove space after the ':' in 'b ? t : f'. Overrides sp_cond_colon. sp_cond_colon_after = ignore # ignore/add/remove/force -# Add or remove space around the '?' in 'b ? t : f' +# Add or remove space around the '?' in 'b ? t : f'. sp_cond_question = ignore # ignore/add/remove/force # Add or remove space before the '?' in 'b ? t : f'. Overrides sp_cond_question. @@ -582,16 +588,16 @@ sp_case_label = ignore # ignore/add/remove/force # Control the space around the D '..' operator. sp_range = ignore # ignore/add/remove/force -# Control the spacing after ':' in 'for (TYPE VAR : EXPR)' +# Control the spacing after ':' in 'for (TYPE VAR : EXPR)'. Only JAVA. sp_after_for_colon = ignore # ignore/add/remove/force -# Control the spacing before ':' in 'for (TYPE VAR : EXPR)' +# Control the spacing before ':' in 'for (TYPE VAR : EXPR)'. Only JAVA. sp_before_for_colon = ignore # ignore/add/remove/force -# Control the spacing in 'extern (C)' (D) +# Control the spacing in 'extern (C)' (D). sp_extern_paren = ignore # ignore/add/remove/force -# Control the space after the opening of a C++ comment '// A' vs '//A' +# Control the space after the opening of a C++ comment '// A' vs '//A'. sp_cmt_cpp_start = ignore # ignore/add/remove/force # True: If space is added with sp_cmt_cpp_start, do it after doxygen sequences like '///', '///<', '//!' and '//!<'. @@ -600,31 +606,33 @@ sp_cmt_cpp_doxygen = false # false/true # True: If space is added with sp_cmt_cpp_start, do it after Qt translator or meta-data comments like '//:', '//=', and '//~'. sp_cmt_cpp_qttr = false # false/true -# Controls the spaces between #else or #endif and a trailing comment +# Controls the spaces between #else or #endif and a trailing comment. sp_endif_cmt = ignore # ignore/add/remove/force -# Controls the spaces after 'new', 'delete' and 'delete[]' +# Controls the spaces after 'new', 'delete' and 'delete[]'. sp_after_new = ignore # ignore/add/remove/force -# Controls the spaces between new and '(' in 'new()' +# Controls the spaces between new and '(' in 'new()'. sp_between_new_paren = ignore # ignore/add/remove/force -# Controls the spaces between ')' and 'type' in 'new(foo) BAR' +# Controls the spaces between ')' and 'type' in 'new(foo) BAR'. sp_after_newop_paren = ignore # ignore/add/remove/force -# Controls the spaces inside paren of the new operator: 'new(foo) BAR' +# Controls the spaces inside paren of the new operator: 'new(foo) BAR'. sp_inside_newop_paren = ignore # ignore/add/remove/force -# Controls the space after open paren of the new operator: 'new(foo) BAR' +# Controls the space after open paren of the new operator: 'new(foo) BAR'. +# Overrides sp_inside_newop_paren. sp_inside_newop_paren_open = ignore # ignore/add/remove/force -# Controls the space before close paren of the new operator: 'new(foo) BAR' +# Controls the space before close paren of the new operator: 'new(foo) BAR'. +# Overrides sp_inside_newop_paren. sp_inside_newop_paren_close = ignore # ignore/add/remove/force -# Controls the spaces before a trailing or embedded comment +# Controls the spaces before a trailing or embedded comment. sp_before_tr_emb_cmt = ignore # ignore/add/remove/force -# Number of spaces before a trailing or embedded comment +# Number of spaces before a trailing or embedded comment. sp_num_before_tr_emb_cmt = 0 # unsigned number # Control space between a Java annotation and the open paren. @@ -641,11 +649,11 @@ force_tab_after_define = false # false/true # # The number of columns to indent per level. -# Usually 2, 3, 4, or 8. Default=8 +# Usually 2, 3, 4, or 8. Default=8. indent_columns = 8 # unsigned number # The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents. -# For FreeBSD, this is set to 4. Negative value is absolute and not increased for each ( level +# For FreeBSD, this is set to 4. Negative value is absolute and not increased for each '(' level. indent_continue = 0 # number # The continuation indent for func_*_param if they are true. @@ -662,26 +670,26 @@ indent_with_tabs = 1 # unsigned number # Requires indent_with_tabs=2. If false, will use spaces. indent_cmt_with_tabs = false # false/true -# Whether to indent strings broken by '\' so that they line up +# Whether to indent strings broken by '\' so that they line up. indent_align_string = false # false/true # The number of spaces to indent multi-line XML strings. -# Requires indent_align_string=True +# Requires indent_align_string=True. indent_xml_string = 0 # unsigned number -# Spaces to indent '{' from level +# Spaces to indent '{' from level. indent_brace = 0 # unsigned number -# Whether braces are indented to the body level +# Whether braces are indented to the body level. indent_braces = false # false/true -# Disabled indenting function braces if indent_braces is True +# Disabled indenting function braces if indent_braces is True. indent_braces_no_func = false # false/true -# Disabled indenting class braces if indent_braces is True +# Disabled indenting class braces if indent_braces is True. indent_braces_no_class = false # false/true -# Disabled indenting struct braces if indent_braces is True +# Disabled indenting struct braces if indent_braces is True. indent_braces_no_struct = false # false/true # Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc. @@ -693,48 +701,48 @@ indent_paren_open_brace = false # false/true # indent a C# delegate by another level, default is to not indent by another level. indent_cs_delegate_brace = false # false/true -# Whether the 'namespace' body is indented +# Whether the 'namespace' body is indented. indent_namespace = false # false/true # Only indent one namespace and no sub-namespaces. # Requires indent_namespace=True. indent_namespace_single_indent = false # false/true -# The number of spaces to indent a namespace block +# The number of spaces to indent a namespace block. indent_namespace_level = 0 # unsigned number # If the body of the namespace is longer than this number, it won't be indented. # Requires indent_namespace=True. Default=0 (no limit) indent_namespace_limit = 0 # unsigned number -# Whether the 'extern "C"' body is indented +# Whether the 'extern "C"' body is indented. indent_extern = false # false/true -# Whether the 'class' body is indented +# Whether the 'class' body is indented. indent_class = false # false/true -# Whether to indent the stuff after a leading base class colon +# Whether to indent the stuff after a leading base class colon. indent_class_colon = false # false/true # Indent based on a class colon instead of the stuff after the colon. -# Requires indent_class_colon=True. Default=False +# Requires indent_class_colon=True. Default=False. indent_class_on_colon = false # false/true -# Whether to indent the stuff after a leading class initializer colon +# Whether to indent the stuff after a leading class initializer colon. indent_constr_colon = false # false/true -# Virtual indent from the ':' for member initializers. Default=2 +# Virtual indent from the ':' for member initializers. Default=2. indent_ctor_init_leading = 2 # unsigned number # Additional indent for constructor initializer list. -# Negative values decrease indent down to the first column. Default=0 +# Negative values decrease indent down to the first column. Default=0. indent_ctor_init = 0 # number # False=treat 'else\nif' as 'else if' for indenting purposes -# True=indent the 'if' one level +# True=indent the 'if' one level. indent_else_if = false # false/true -# Amount to indent variable declarations after a open brace. neg=relative, pos=absolute +# Amount to indent variable declarations after a open brace. neg=relative, pos=absolute. indent_var_def_blk = 0 # number # Indent continued variable declarations instead of aligning. @@ -745,54 +753,54 @@ indent_var_def_cont = false # false/true indent_shift = false # false/true # True: force indentation of function definition to start in column 1 -# False: use the default behavior +# False: use the default behavior. indent_func_def_force_col1 = false # false/true # True: indent continued function call parameters one indent level -# False: align parameters under the open paren +# False: align parameters under the open paren. indent_func_call_param = false # false/true -# Same as indent_func_call_param, but for function defs +# Same as indent_func_call_param, but for function defs. indent_func_def_param = false # false/true -# Same as indent_func_call_param, but for function protos +# Same as indent_func_call_param, but for function protos. indent_func_proto_param = false # false/true -# Same as indent_func_call_param, but for class declarations +# Same as indent_func_call_param, but for class declarations. indent_func_class_param = false # false/true -# Same as indent_func_call_param, but for class variable constructors +# Same as indent_func_call_param, but for class variable constructors. indent_func_ctor_var_param = false # false/true -# Same as indent_func_call_param, but for templates +# Same as indent_func_call_param, but for templates. indent_template_param = false # false/true # Double the indent for indent_func_xxx_param options. -# Use both values of the options indent_columns and indent_param +# Use both values of the options indent_columns and indent_param. indent_func_param_double = false # false/true -# Indentation column for standalone 'const' function decl/proto qualifier +# Indentation column for standalone 'const' function decl/proto qualifier. indent_func_const = 0 # unsigned number -# Indentation column for standalone 'throw' function decl/proto qualifier +# Indentation column for standalone 'throw' function decl/proto qualifier. indent_func_throw = 0 # unsigned number # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. indent_member = 0 # unsigned number -# Spaces to indent single line ('//') comments on lines before code +# Spaces to indent single line ('//') comments on lines before code. indent_sing_line_comments = 0 # unsigned number # If set, will indent trailing single line ('//') comments relative -# to the code instead of trying to keep the same absolute column +# to the code instead of trying to keep the same absolute column. indent_relative_single_line_comments = false # false/true # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. indent_switch_case = 0 # unsigned number -# Whether to indent preproccesor statements inside of switch statements +# Whether to indent preproccesor statements inside of switch statements. indent_switch_pp = true # false/true # Spaces to shift the 'case' line, without affecting any other lines @@ -805,7 +813,7 @@ indent_case_shift = 0 # unsigned number # negative value are OK. indent_case_brace = 0 # number -# Whether to indent comments found in first column +# Whether to indent comments found in first column. indent_col1_comment = false # false/true # How to indent goto labels @@ -818,10 +826,10 @@ indent_label = 1 # number indent_access_spec = 1 # number # Indent the code after an access specifier by one level. -# If set, this option forces 'indent_access_spec=0' +# If set, this option forces 'indent_access_spec=0'. indent_access_spec_body = false # false/true -# If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) +# If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended). indent_paren_nl = false # false/true # Controls the indent of a close paren after a newline. @@ -830,19 +838,28 @@ indent_paren_nl = false # false/true # 2: Indent to the brace level indent_paren_close = 0 # unsigned number -# Controls the indent of a comma when inside a paren.If True, aligns under the open paren +# Controls the indent of the open paren of a function definition, if on it's own line.If True, indents the open paren +indent_paren_after_func_def = false # false/true + +# Controls the indent of the open paren of a function declaration, if on it's own line.If True, indents the open paren +indent_paren_after_func_decl = false # false/true + +# Controls the indent of the open paren of a function call, if on it's own line.If True, indents the open paren +indent_paren_after_func_call = false # false/true + +# Controls the indent of a comma when inside a paren.If True, aligns under the open paren. indent_comma_paren = false # false/true -# Controls the indent of a BOOL operator when inside a paren.If True, aligns under the open paren +# Controls the indent of a BOOL operator when inside a paren.If True, aligns under the open paren. indent_bool_paren = false # false/true -# If 'indent_bool_paren' is True, controls the indent of the first expression. If True, aligns the first expression to the following ones +# If 'indent_bool_paren' is True, controls the indent of the first expression. If True, aligns the first expression to the following ones. indent_first_bool_expr = false # false/true -# If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) +# If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended). indent_square_nl = false # false/true -# Don't change the relative indent of ESQL/C 'EXEC SQL' bodies +# Don't change the relative indent of ESQL/C 'EXEC SQL' bodies. indent_preserve_sql = false # false/true # Align continued statements at the '='. Default=True @@ -860,7 +877,7 @@ indent_oc_block_msg = 0 # unsigned number indent_oc_msg_colon = 0 # unsigned number # If True, prioritize aligning with initial colon (and stripping spaces from lines, if necessary). -# Default=True +# Default=True. indent_oc_msg_prioritize_first_colon = true # false/true # If indent_oc_block_msg and this option are on, blocks will be indented the way that Xcode does by default (from keyword if the parameter is on its own line; otherwise, from the previous indentation level). @@ -884,13 +901,13 @@ indent_min_vbrace_open = 0 # unsigned number # True: When identing after virtual brace open and newline add further spaces after regular indent to reach next tabstop. indent_vbrace_open_on_tabstop = false # false/true -# If True, a brace followed by another token (not a newline) will indent all contained lines to match the token.Default=True +# If True, a brace followed by another token (not a newline) will indent all contained lines to match the token.Default=True. indent_token_after_brace = true # false/true -# If True, cpp lambda body will be indentedDefault=False +# If True, cpp lambda body will be indentedDefault=False. indent_cpp_lambda_body = false # false/true -# indent (or not) an using block if no braces are used. Only for C#.Default=True +# indent (or not) an using block if no braces are used. Only for C#.Default=True. indent_using_block = true # false/true # indent the continuation of ternary operator. @@ -899,194 +916,197 @@ indent_using_block = true # false/true # 2: When the `:` is a continuation, indent it under `?` indent_ternary_operator = 0 # unsigned number +# If true, ignore indent and align for asm blocks as they have their own indentation. +indent_ignore_asm_block = false # false/true + # # Newline adding and removing options # -# Whether to collapse empty blocks between '{' and '}' +# Whether to collapse empty blocks between '{' and '}'. nl_collapse_empty_body = false # false/true -# Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' +# Don't split one-line braced assignments - 'foo_t f = { 1, 2 };'. nl_assign_leave_one_liners = false # false/true -# Don't split one-line braced statements inside a class xx { } body +# Don't split one-line braced statements inside a class xx { } body. nl_class_leave_one_liners = false # false/true # Don't split one-line enums: 'enum foo { BAR = 15 };' nl_enum_leave_one_liners = false # false/true -# Don't split one-line get or set functions +# Don't split one-line get or set functions. nl_getset_leave_one_liners = false # false/true -# Don't split one-line function definitions - 'int foo() { return 0; }' +# Don't split one-line function definitions - 'int foo() { return 0; }'. nl_func_leave_one_liners = false # false/true -# Don't split one-line C++11 lambdas - '[]() { return 0; }' +# Don't split one-line C++11 lambdas - '[]() { return 0; }'. nl_cpp_lambda_leave_one_liners = false # false/true -# Don't split one-line if/else statements - 'if(a) b++;' +# Don't split one-line if/else statements - 'if(a) b++;'. nl_if_leave_one_liners = false # false/true -# Don't split one-line while statements - 'while(a) b++;' +# Don't split one-line while statements - 'while(a) b++;'. nl_while_leave_one_liners = false # false/true -# Don't split one-line OC messages +# Don't split one-line OC messages. nl_oc_msg_leave_one_liner = false # false/true -# Add or remove newline between Objective-C block signature and '{' +# Add or remove newline between Objective-C block signature and '{'. nl_oc_block_brace = ignore # ignore/add/remove/force -# Add or remove newlines at the start of the file +# Add or remove newlines at the start of the file. nl_start_of_file = ignore # ignore/add/remove/force -# The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' +# The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force'. nl_start_of_file_min = 0 # unsigned number -# Add or remove newline at the end of the file +# Add or remove newline at the end of the file. nl_end_of_file = ignore # ignore/add/remove/force -# The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') +# The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force'). nl_end_of_file_min = 0 # unsigned number -# Add or remove newline between '=' and '{' +# Add or remove newline between '=' and '{'. nl_assign_brace = ignore # ignore/add/remove/force -# Add or remove newline between '=' and '[' (D only) +# Add or remove newline between '=' and '[' (D only). nl_assign_square = ignore # ignore/add/remove/force -# Add or remove newline after '= [' (D only). Will also affect the newline before the ']' +# Add or remove newline after '= [' (D only). Will also affect the newline before the ']'. nl_after_square_assign = ignore # ignore/add/remove/force # The number of blank lines after a block of variable definitions at the top of a function body -# 0 = No change (default) +# 0 = No change (default). nl_func_var_def_blk = 0 # unsigned number # The number of newlines before a block of typedefs # 0 = No change (default) -# the option 'nl_after_access_spec' takes preference over 'nl_typedef_blk_start' +# is overridden by the option 'nl_after_access_spec'. nl_typedef_blk_start = 0 # unsigned number # The number of newlines after a block of typedefs -# 0 = No change (default) +# 0 = No change (default). nl_typedef_blk_end = 0 # unsigned number # The maximum consecutive newlines within a block of typedefs -# 0 = No change (default) +# 0 = No change (default). nl_typedef_blk_in = 0 # unsigned number # The number of newlines before a block of variable definitions not at the top of a function body # 0 = No change (default) -# the option 'nl_after_access_spec' takes preference over 'nl_var_def_blk_start' +# is overridden by the option 'nl_after_access_spec'. nl_var_def_blk_start = 0 # unsigned number # The number of newlines after a block of variable definitions not at the top of a function body -# 0 = No change (default) +# 0 = No change (default). nl_var_def_blk_end = 0 # unsigned number # The maximum consecutive newlines within a block of variable definitions -# 0 = No change (default) +# 0 = No change (default). nl_var_def_blk_in = 0 # unsigned number # Add or remove newline between a function call's ')' and '{', as in: -# list_for_each(item, &list) { } +# list_for_each(item, &list) { }. nl_fcall_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'enum' and '{' +# Add or remove newline between 'enum' and '{'. nl_enum_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'enum' and 'class' +# Add or remove newline between 'enum' and 'class'. nl_enum_class = ignore # ignore/add/remove/force -# Add or remove newline between 'enum class' and the identifier +# Add or remove newline between 'enum class' and the identifier. nl_enum_class_identifier = ignore # ignore/add/remove/force -# Add or remove newline between 'enum class' type and ':' +# Add or remove newline between 'enum class' type and ':'. nl_enum_identifier_colon = ignore # ignore/add/remove/force -# Add or remove newline between 'enum class identifier :' and 'type' and/or 'type' +# Add or remove newline between 'enum class identifier :' and 'type' and/or 'type'. nl_enum_colon_type = ignore # ignore/add/remove/force -# Add or remove newline between 'struct and '{' +# Add or remove newline between 'struct and '{'. nl_struct_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'union' and '{' +# Add or remove newline between 'union' and '{'. nl_union_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'if' and '{' +# Add or remove newline between 'if' and '{'. nl_if_brace = ignore # ignore/add/remove/force -# Add or remove newline between '}' and 'else' +# Add or remove newline between '}' and 'else'. nl_brace_else = ignore # ignore/add/remove/force # Add or remove newline between 'else if' and '{' -# If set to ignore, nl_if_brace is used instead +# If set to ignore, nl_if_brace is used instead. nl_elseif_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'else' and '{' +# Add or remove newline between 'else' and '{'. nl_else_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'else' and 'if' +# Add or remove newline between 'else' and 'if'. nl_else_if = ignore # ignore/add/remove/force -# Add or remove newline before 'if'/'else if' closing parenthesis +# Add or remove newline before 'if'/'else if' closing parenthesis. nl_before_if_closing_paren = ignore # ignore/add/remove/force -# Add or remove newline between '}' and 'finally' +# Add or remove newline between '}' and 'finally'. nl_brace_finally = ignore # ignore/add/remove/force -# Add or remove newline between 'finally' and '{' +# Add or remove newline between 'finally' and '{'. nl_finally_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'try' and '{' +# Add or remove newline between 'try' and '{'. nl_try_brace = ignore # ignore/add/remove/force -# Add or remove newline between get/set and '{' +# Add or remove newline between get/set and '{'. nl_getset_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'for' and '{' +# Add or remove newline between 'for' and '{'. nl_for_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'catch' and '{' +# Add or remove newline between 'catch' and '{'. nl_catch_brace = ignore # ignore/add/remove/force -# Add or remove newline between '}' and 'catch' +# Add or remove newline between '}' and 'catch'. nl_brace_catch = ignore # ignore/add/remove/force -# Add or remove newline between '}' and ']' +# Add or remove newline between '}' and ']'. nl_brace_square = ignore # ignore/add/remove/force -# Add or remove newline between '}' and ')' in a function invocation +# Add or remove newline between '}' and ')' in a function invocation. nl_brace_fparen = ignore # ignore/add/remove/force -# Add or remove newline between 'while' and '{' +# Add or remove newline between 'while' and '{'. nl_while_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'scope (x)' and '{' (D) +# Add or remove newline between 'scope (x)' and '{' (D). nl_scope_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'unittest' and '{' (D) +# Add or remove newline between 'unittest' and '{' (D). nl_unittest_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'version (x)' and '{' (D) +# Add or remove newline between 'version (x)' and '{' (D). nl_version_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'using' and '{' +# Add or remove newline between 'using' and '{'. nl_using_brace = ignore # ignore/add/remove/force # Add or remove newline between two open or close braces. # Due to general newline/brace handling, REMOVE may not work. nl_brace_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'do' and '{' +# Add or remove newline between 'do' and '{'. nl_do_brace = ignore # ignore/add/remove/force -# Add or remove newline between '}' and 'while' of 'do' statement +# Add or remove newline between '}' and 'while' of 'do' statement. nl_brace_while = ignore # ignore/add/remove/force -# Add or remove newline between 'switch' and '{' +# Add or remove newline between 'switch' and '{'. nl_switch_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'synchronized' and '{' +# Add or remove newline between 'synchronized' and '{'. nl_synchronized_brace = ignore # ignore/add/remove/force # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. @@ -1096,25 +1116,25 @@ nl_multi_line_cond = false # false/true # Force a newline in a define after the macro name for multi-line defines. nl_multi_line_define = false # false/true -# Whether to put a newline before 'case' statement, not after the first 'case' +# Whether to put a newline before 'case' statement, not after the first 'case'. nl_before_case = false # false/true -# Add or remove newline between ')' and 'throw' +# Add or remove newline between ')' and 'throw'. nl_before_throw = ignore # ignore/add/remove/force -# Whether to put a newline after 'case' statement +# Whether to put a newline after 'case' statement. nl_after_case = false # false/true # Add or remove a newline between a case ':' and '{'. Overrides nl_after_case. nl_case_colon_brace = ignore # ignore/add/remove/force -# Newline between namespace and { +# Newline between namespace and {. nl_namespace_brace = ignore # ignore/add/remove/force # Add or remove newline between 'template<>' and whatever follows. nl_template_class = ignore # ignore/add/remove/force -# Add or remove newline between 'class' and '{' +# Add or remove newline between 'class' and '{'. nl_class_brace = ignore # ignore/add/remove/force # Add or remove newline before/after each ',' in the base class list, @@ -1125,10 +1145,10 @@ nl_class_init_args = ignore # ignore/add/remove/force # Related to nl_constr_colon, pos_constr_colon and pos_constr_comma. nl_constr_init_args = ignore # ignore/add/remove/force -# Add or remove newline before first element, after comma, and after last element in enum +# Add or remove newline before first element, after comma, and after last element in enum. nl_enum_own_lines = ignore # ignore/add/remove/force -# Add or remove newline between return type and function name in a function definition +# Add or remove newline between return type and function name in a function definition. nl_func_type_name = ignore # ignore/add/remove/force # Add or remove newline between return type and function name inside a class {} @@ -1136,32 +1156,38 @@ nl_func_type_name = ignore # ignore/add/remove/force nl_func_type_name_class = ignore # ignore/add/remove/force # Add or remove newline between class specification and '::' in 'void A::f() { }' -# Only appears in separate member implementation (does not appear with in-line implmementation) +# Only appears in separate member implementation (does not appear with in-line implmementation). nl_func_class_scope = ignore # ignore/add/remove/force # Add or remove newline between function scope and name -# Controls the newline after '::' in 'void A::f() { }' +# Controls the newline after '::' in 'void A::f() { }'. nl_func_scope_name = ignore # ignore/add/remove/force -# Add or remove newline between return type and function name in a prototype +# Add or remove newline between return type and function name in a prototype. nl_func_proto_type_name = ignore # ignore/add/remove/force -# Add or remove newline between a function name and the opening '(' in the declaration +# Add or remove newline between a function name and the opening '(' in the declaration. nl_func_paren = ignore # ignore/add/remove/force -# Overrides nl_func_paren for functions with no parameters +# Overrides nl_func_paren for functions with no parameters. nl_func_paren_empty = ignore # ignore/add/remove/force -# Add or remove newline between a function name and the opening '(' in the definition +# Add or remove newline between a function name and the opening '(' in the definition. nl_func_def_paren = ignore # ignore/add/remove/force -# Overrides nl_func_def_paren for functions with no parameters +# Overrides nl_func_def_paren for functions with no parameters. nl_func_def_paren_empty = ignore # ignore/add/remove/force -# Add or remove newline after '(' in a function declaration +# Add or remove newline between a function name and the opening '(' in the call +nl_func_call_paren = ignore # ignore/add/remove/force + +# Overrides nl_func_call_paren for functions with no parameters. +nl_func_call_paren_empty = ignore # ignore/add/remove/force + +# Add or remove newline after '(' in a function declaration. nl_func_decl_start = ignore # ignore/add/remove/force -# Add or remove newline after '(' in a function definition +# Add or remove newline after '(' in a function definition. nl_func_def_start = ignore # ignore/add/remove/force # Overrides nl_func_decl_start when there is only one parameter. @@ -1176,10 +1202,10 @@ nl_func_decl_start_multi_line = false # false/true # Whether to add newline after '(' in a function definition if '(' and ')' are in different lines. nl_func_def_start_multi_line = false # false/true -# Add or remove newline after each ',' in a function declaration +# Add or remove newline after each ',' in a function declaration. nl_func_decl_args = ignore # ignore/add/remove/force -# Add or remove newline after each ',' in a function definition +# Add or remove newline after each ',' in a function definition. nl_func_def_args = ignore # ignore/add/remove/force # Whether to add newline after each ',' in a function declaration if '(' and ')' are in different lines. @@ -1188,10 +1214,10 @@ nl_func_decl_args_multi_line = false # false/true # Whether to add newline after each ',' in a function definition if '(' and ')' are in different lines. nl_func_def_args_multi_line = false # false/true -# Add or remove newline before the ')' in a function declaration +# Add or remove newline before the ')' in a function declaration. nl_func_decl_end = ignore # ignore/add/remove/force -# Add or remove newline before the ')' in a function definition +# Add or remove newline before the ')' in a function definition. nl_func_def_end = ignore # ignore/add/remove/force # Overrides nl_func_decl_end when there is only one parameter. @@ -1212,6 +1238,9 @@ nl_func_decl_empty = ignore # ignore/add/remove/force # Add or remove newline between '()' in a function definition. nl_func_def_empty = ignore # ignore/add/remove/force +# Add or remove newline between '()' in a function call. +nl_func_call_empty = ignore # ignore/add/remove/force + # Whether to add newline after '(' in a function call if '(' and ')' are in different lines. nl_func_call_start_multi_line = false # false/true @@ -1222,31 +1251,31 @@ nl_func_call_args_multi_line = false # false/true nl_func_call_end_multi_line = false # false/true # Whether to put each OC message parameter on a separate line -# See nl_oc_msg_leave_one_liner +# See nl_oc_msg_leave_one_liner. nl_oc_msg_args = false # false/true -# Add or remove newline between function signature and '{' +# Add or remove newline between function signature and '{'. nl_fdef_brace = ignore # ignore/add/remove/force -# Add or remove newline between C++11 lambda signature and '{' +# Add or remove newline between C++11 lambda signature and '{'. nl_cpp_ldef_brace = ignore # ignore/add/remove/force # Add or remove a newline between the return keyword and return expression. nl_return_expr = ignore # ignore/add/remove/force -# Whether to put a newline after semicolons, except in 'for' statements +# Whether to put a newline after semicolons, except in 'for' statements. nl_after_semicolon = false # false/true # Java: Control the newline between the ')' and '{{' of the double brace initializer. nl_paren_dbrace_open = ignore # ignore/add/remove/force -# Whether to put a newline after the type in an unnamed temporary direct-list-initialization +# Whether to put a newline after the type in an unnamed temporary direct-list-initialization. nl_type_brace_init_lst = ignore # ignore/add/remove/force -# Whether to put a newline after open brace in an unnamed temporary direct-list-initialization +# Whether to put a newline after open brace in an unnamed temporary direct-list-initialization. nl_type_brace_init_lst_open = ignore # ignore/add/remove/force -# Whether to put a newline before close brace in an unnamed temporary direct-list-initialization +# Whether to put a newline before close brace in an unnamed temporary direct-list-initialization. nl_type_brace_init_lst_close = ignore # ignore/add/remove/force # Whether to put a newline after brace open. @@ -1270,14 +1299,14 @@ nl_after_vbrace_open_empty = false # false/true nl_after_brace_close = false # false/true # Whether to put a newline after a virtual brace close. -# Would add a newline before return in: 'if (foo) a++; return;' +# Would add a newline before return in: 'if (foo) a++; return;'. nl_after_vbrace_close = false # false/true # Control the newline between the close brace and 'b' in: 'struct { int a; } b;' -# Affects enums, unions and structures. If set to ignore, uses nl_after_brace_close +# Affects enums, unions and structures. If set to ignore, uses nl_after_brace_close. nl_brace_struct_var = ignore # ignore/add/remove/force -# Whether to alter newlines in '#define' macros +# Whether to alter newlines in '#define' macros. nl_define_macro = false # false/true # Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and '#endif'. Does not affect top-level #ifdefs. @@ -1286,54 +1315,54 @@ nl_squeeze_ifdef = false # false/true # Makes the nl_squeeze_ifdef option affect the top-level #ifdefs as well. nl_squeeze_ifdef_top_level = false # false/true -# Add or remove blank line before 'if' +# Add or remove blank line before 'if'. nl_before_if = ignore # ignore/add/remove/force # Add or remove blank line after 'if' statement. -# Add/Force work only if the next token is not a closing brace +# Add/Force work only if the next token is not a closing brace. nl_after_if = ignore # ignore/add/remove/force -# Add or remove blank line before 'for' +# Add or remove blank line before 'for'. nl_before_for = ignore # ignore/add/remove/force -# Add or remove blank line after 'for' statement +# Add or remove blank line after 'for' statement. nl_after_for = ignore # ignore/add/remove/force -# Add or remove blank line before 'while' +# Add or remove blank line before 'while'. nl_before_while = ignore # ignore/add/remove/force -# Add or remove blank line after 'while' statement +# Add or remove blank line after 'while' statement. nl_after_while = ignore # ignore/add/remove/force -# Add or remove blank line before 'switch' +# Add or remove blank line before 'switch'. nl_before_switch = ignore # ignore/add/remove/force -# Add or remove blank line after 'switch' statement +# Add or remove blank line after 'switch' statement. nl_after_switch = ignore # ignore/add/remove/force -# Add or remove blank line before 'synchronized' +# Add or remove blank line before 'synchronized'. nl_before_synchronized = ignore # ignore/add/remove/force -# Add or remove blank line after 'synchronized' statement +# Add or remove blank line after 'synchronized' statement. nl_after_synchronized = ignore # ignore/add/remove/force -# Add or remove blank line before 'do' +# Add or remove blank line before 'do'. nl_before_do = ignore # ignore/add/remove/force -# Add or remove blank line after 'do/while' statement +# Add or remove blank line after 'do/while' statement. nl_after_do = ignore # ignore/add/remove/force -# Whether to double-space commented-entries in struct/union/enum +# Whether to double-space commented-entries in struct/union/enum. nl_ds_struct_enum_cmt = false # false/true # force nl before } of a struct/union/enum -# (lower priority than 'eat_blanks_before_close_brace') +# (lower priority than 'eat_blanks_before_close_brace'). nl_ds_struct_enum_close_brace = false # false/true -# Add or remove blank line before 'func_class_def' +# Add or remove blank line before 'func_class_def'. nl_before_func_class_def = 0 # unsigned number -# Add or remove blank line before 'func_class_proto' +# Add or remove blank line before 'func_class_proto'. nl_before_func_class_proto = 0 # unsigned number # Add or remove a newline before/after a class colon, @@ -1345,64 +1374,64 @@ nl_class_colon = ignore # ignore/add/remove/force nl_constr_colon = ignore # ignore/add/remove/force # Change simple unbraced if statements into a one-liner -# 'if(b)\n i++;' => 'if(b) i++;' +# 'if(b)\n i++;' => 'if(b) i++;'. nl_create_if_one_liner = false # false/true # Change simple unbraced for statements into a one-liner -# 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' +# 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);'. nl_create_for_one_liner = false # false/true # Change simple unbraced while statements into a one-liner -# 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' +# 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);'. nl_create_while_one_liner = false # false/true # Change a one-liner if statement into simple unbraced if -# 'if(b) i++;' => 'if(b)\n i++;' +# 'if(b) i++;' => 'if(b)\n i++;'. nl_split_if_one_liner = false # false/true # Change a one-liner for statement into simple unbraced for -# 'for (i=0;<5;i++) foo(i);' => 'for (i=0;<5;i++)\n foo(i);' +# 'for (i=0;<5;i++) foo(i);' => 'for (i=0;<5;i++)\n foo(i);'. nl_split_for_one_liner = false # false/true # Change a one-liner while statement into simple unbraced while -# 'while (i<5) foo(i++);' => 'while (i<5)\n foo(i++);' +# 'while (i<5) foo(i++);' => 'while (i<5)\n foo(i++);'. nl_split_while_one_liner = false # false/true # # Blank line options # -# The maximum consecutive newlines (3 = 2 blank lines) +# The maximum consecutive newlines (3 = 2 blank lines). nl_max = 0 # unsigned number -# The maximum consecutive newlines in function +# The maximum consecutive newlines in function. nl_max_blank_in_func = 0 # unsigned number -# The number of newlines after a function prototype, if followed by another function prototype +# The number of newlines after a function prototype, if followed by another function prototype. nl_after_func_proto = 0 # unsigned number -# The number of newlines after a function prototype, if not followed by another function prototype +# The number of newlines after a function prototype, if not followed by another function prototype. nl_after_func_proto_group = 0 # unsigned number -# The number of newlines after a function class prototype, if followed by another function class prototype +# The number of newlines after a function class prototype, if followed by another function class prototype. nl_after_func_class_proto = 0 # unsigned number -# The number of newlines after a function class prototype, if not followed by another function class prototype +# The number of newlines after a function class prototype, if not followed by another function class prototype. nl_after_func_class_proto_group = 0 # unsigned number -# The number of newlines before a multi-line function def body +# The number of newlines before a multi-line function def body. nl_before_func_body_def = 0 # unsigned number -# The number of newlines before a multi-line function prototype body +# The number of newlines before a multi-line function prototype body. nl_before_func_body_proto = 0 # unsigned number -# The number of newlines after '}' of a multi-line function body +# The number of newlines after '}' of a multi-line function body. nl_after_func_body = 0 # unsigned number -# The number of newlines after '}' of a multi-line function body in a class declaration +# The number of newlines after '}' of a multi-line function body in a class declaration. nl_after_func_body_class = 0 # unsigned number -# The number of newlines after '}' of a single line function body +# The number of newlines after '}' of a single line function body. nl_after_func_body_one_liner = 0 # unsigned number # The minimum number of newlines before a multi-line comment. @@ -1423,13 +1452,13 @@ nl_after_multiline_comment = false # false/true # Whether to force a newline after a label's colon. nl_after_label_colon = false # false/true -# The number of newlines after '}' or ';' of a struct/enum/union definition +# The number of newlines after '}' or ';' of a struct/enum/union definition. nl_after_struct = 0 # unsigned number -# The number of newlines before a class definition +# The number of newlines before a class definition. nl_before_class = 0 # unsigned number -# The number of newlines after '}' or ';' of a class definition +# The number of newlines after '}' or ';' of a class definition. nl_after_class = 0 # unsigned number # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. @@ -1439,7 +1468,7 @@ nl_before_access_spec = 0 # unsigned number # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:' or 'slots:' label. # 0 = No change. -# the option 'nl_after_access_spec' takes preference over 'nl_typedef_blk_start' and 'nl_var_def_blk_start' +# Overrides 'nl_typedef_blk_start' and 'nl_var_def_blk_start'. nl_after_access_spec = 0 # unsigned number # The number of newlines between a function def and the function comment. @@ -1458,13 +1487,13 @@ nl_around_cs_property = 0 # unsigned number # 0 = No change. nl_between_get_set = 0 # unsigned number -# Add or remove newline between C# property and the '{' +# Add or remove newline between C# property and the '{'. nl_property_brace = ignore # ignore/add/remove/force -# Whether to remove blank lines after '{' +# Whether to remove blank lines after '{'. eat_blanks_after_open_brace = false # false/true -# Whether to remove blank lines before '}' +# Whether to remove blank lines before '}'. eat_blanks_before_close_brace = false # false/true # How aggressively to remove extra newlines not in preproc. @@ -1490,26 +1519,26 @@ nl_between_annotation = ignore # ignore/add/remove/force # Positioning options # -# The position of arithmetic operators in wrapped expressions +# The position of arithmetic operators in wrapped expressions. pos_arith = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of assignment in wrapped expressions. -# Do not affect '=' followed by '{' +# Do not affect '=' followed by '{'. pos_assign = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force -# The position of boolean operators in wrapped expressions +# The position of boolean operators in wrapped expressions. pos_bool = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force -# The position of comparison operators in wrapped expressions +# The position of comparison operators in wrapped expressions. pos_compare = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force -# The position of conditional (b ? t : f) operators in wrapped expressions +# The position of conditional (b ? t : f) operators in wrapped expressions. pos_conditional = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force -# The position of the comma in wrapped expressions +# The position of the comma in wrapped expressions. pos_comma = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force -# The position of the comma in enum entries +# The position of the comma in enum entries. pos_enum_comma = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of the comma in the base class list if there are more than one line, @@ -1536,37 +1565,46 @@ pos_constr_colon = ignore # ignore/join/lead/lead_break/lead_fo # Try to limit code width to N number of columns code_width = 0 # unsigned number -# Whether to fully split long 'for' statements at semi-colons +# Whether to fully split long 'for' statements at semi-colons. ls_for_split_full = false # false/true -# Whether to fully split long function protos/calls at commas +# Whether to fully split long function protos/calls at commas. ls_func_split_full = false # false/true -# Whether to split lines as close to code_width as possible and ignore some groupings +# Whether to split lines as close to code_width as possible and ignore some groupings. ls_code_width = false # false/true # # Code alignment (not left column spaces/tabs) # -# Whether to keep non-indenting tabs +# Whether to keep non-indenting tabs. align_keep_tabs = false # false/true -# Whether to use tabs for aligning +# Whether to use tabs for aligning. align_with_tabs = false # false/true -# Whether to bump out to the next tab when aligning +# Whether to bump out to the next tab when aligning. align_on_tabstop = false # false/true -# Whether to right-align numbers -align_number_right = false # false/true +# Whether to right-align numbers. +align_number_right = false # false/true # Whether to keep whitespace not required for alignment. align_keep_extra_space = false # false/true -# Align variable definitions in prototypes and functions +# Align variable definitions in prototypes and functions. align_func_params = false # false/true +# The span for aligning parameter definitions in function on parameter name (0=don't align). +align_func_params_span = 0 # unsigned number + +# The threshold for aligning function parameter definitions (0=no limit). +align_func_params_thresh = 0 # unsigned number + +# The gap for aligning function parameter definitions. +align_func_params_gap = 0 # unsigned number + # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. align_same_func_call_params = false # false/true @@ -1589,19 +1627,19 @@ align_var_def_amp_style = 0 # unsigned number # The threshold for aligning variable definitions (0=no limit) align_var_def_thresh = 0 # unsigned number -# The gap for aligning variable definitions +# The gap for aligning variable definitions. align_var_def_gap = 0 # unsigned number -# Whether to align the colon in struct bit fields +# Whether to align the colon in struct bit fields. align_var_def_colon = false # false/true -# align variable defs gap for bit colons +# align variable defs gap for bit colons. align_var_def_colon_gap = 0 # unsigned number -# Whether to align any attribute after the variable name +# Whether to align any attribute after the variable name. align_var_def_attribute = false # false/true -# Whether to align inline struct/enum/union variable definitions +# Whether to align inline struct/enum/union variable definitions. align_var_def_inline = false # false/true # The span for aligning on '=' in assignments (0=don't align) @@ -1619,10 +1657,10 @@ align_enum_equ_thresh = 0 # unsigned number # The span for aligning class (0=don't align) align_var_class_span = 0 # unsigned number -# The threshold for aligning class member definitions (0=no limit) +# The threshold for aligning class member definitions (0=no limit). align_var_class_thresh = 0 # unsigned number -# The gap for aligning class member definitions +# The gap for aligning class member definitions. align_var_class_gap = 0 # unsigned number # The span for aligning struct/union (0=don't align) @@ -1631,16 +1669,16 @@ align_var_struct_span = 0 # unsigned number # The threshold for aligning struct/union member definitions (0=no limit) align_var_struct_thresh = 0 # unsigned number -# The gap for aligning struct/union member definitions +# The gap for aligning struct/union member definitions. align_var_struct_gap = 0 # unsigned number # The span for aligning struct initializer values (0=don't align) align_struct_init_span = 0 # unsigned number -# The minimum space between the type and the synonym of a typedef +# The minimum space between the type and the synonym of a typedef. align_typedef_gap = 0 # unsigned number -# The span for aligning single-line typedefs (0=don't align) +# The span for aligning single-line typedefs (0=don't align). align_typedef_span = 0 # unsigned number # How to align typedef'd functions with other typedefs @@ -1664,7 +1702,7 @@ align_typedef_amp_style = 0 # unsigned number # The span for aligning comments that end lines (0=don't align) align_right_cmt_span = 0 # unsigned number -# If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment +# If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment. align_right_cmt_mix = false # false/true # If a trailing comment is more than this number of columns away from the text it follows, @@ -1674,24 +1712,24 @@ align_right_cmt_gap = 0 # unsigned number # Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore) align_right_cmt_at_col = 0 # unsigned number -# The span for aligning function prototypes (0=don't align) +# The span for aligning function prototypes (0=don't align). align_func_proto_span = 0 # unsigned number # Minimum gap between the return type and the function name. align_func_proto_gap = 0 # unsigned number -# Align function protos on the 'operator' keyword instead of what follows +# Align function protos on the 'operator' keyword instead of what follows. align_on_operator = false # false/true # Whether to mix aligning prototype and variable declarations. # If True, align_var_def_XXX options are used instead of align_func_proto_XXX options. align_mix_var_proto = false # false/true -# Align single-line functions with function prototypes, uses align_func_proto_span +# Align single-line functions with function prototypes, uses align_func_proto_span. align_single_line_func = false # false/true # Aligning the open brace of single-line functions. -# Requires align_single_line_func=True, uses align_func_proto_span +# Requires align_single_line_func=True, uses align_func_proto_span. align_single_line_brace = false # false/true # Gap for align_single_line_brace. @@ -1704,16 +1742,16 @@ align_oc_msg_spec_span = 0 # unsigned number # This will not work right if the macro contains a multi-line comment. align_nl_cont = false # false/true -# # Align macro functions and variables together +# # Align macro functions and variables together. align_pp_define_together = false # false/true -# The minimum space between label and value of a preprocessor define +# The minimum space between label and value of a preprocessor define. align_pp_define_gap = 0 # unsigned number # The span for aligning on '#define' bodies (0=don't align, other=number of lines including comments between blocks) align_pp_define_span = 0 # unsigned number -# Align lines that start with '<<' with previous '<<'. Default=True +# Align lines that start with '<<' with previous '<<'. Default=True. align_left_shift = true # false/true # Align text after asm volatile () colons. @@ -1725,7 +1763,7 @@ align_oc_msg_colon_span = 0 # unsigned number # If True, always align with the first parameter, even if it is too short. align_oc_msg_colon_first = false # false/true -# Aligning parameters in an Obj-C '+' or '-' declaration on the ':' +# Aligning parameters in an Obj-C '+' or '-' declaration on the ':'. align_oc_decl_colon = false # false/true # @@ -1745,41 +1783,41 @@ cmt_reflow_mode = 0 # unsigned number cmt_convert_tab_to_spaces = false # false/true # If False, disable all multi-line comment changes, including cmt_width. keyword substitution and leading chars. -# Default=True +# Default=True. cmt_indent_multi = true # false/true -# Whether to group c-comments that look like they are in a block +# Whether to group c-comments that look like they are in a block. cmt_c_group = false # false/true -# Whether to put an empty '/*' on the first line of the combined c-comment +# Whether to put an empty '/*' on the first line of the combined c-comment. cmt_c_nl_start = false # false/true -# Whether to put a newline before the closing '*/' of the combined c-comment +# Whether to put a newline before the closing '*/' of the combined c-comment. cmt_c_nl_end = false # false/true -# Whether to group cpp-comments that look like they are in a block +# Whether to group cpp-comments that look like they are in a block. cmt_cpp_group = false # false/true -# Whether to put an empty '/*' on the first line of the combined cpp-comment +# Whether to put an empty '/*' on the first line of the combined cpp-comment. cmt_cpp_nl_start = false # false/true -# Whether to put a newline before the closing '*/' of the combined cpp-comment +# Whether to put a newline before the closing '*/' of the combined cpp-comment. cmt_cpp_nl_end = false # false/true -# Whether to change cpp-comments into c-comments +# Whether to change cpp-comments into c-comments. cmt_cpp_to_c = false # false/true -# Whether to put a star on subsequent comment lines +# Whether to put a star on subsequent comment lines. cmt_star_cont = false # false/true -# The number of spaces to insert at the start of subsequent comment lines +# The number of spaces to insert at the start of subsequent comment lines. cmt_sp_before_star_cont = 0 # unsigned number -# The number of spaces to insert after the star on subsequent comment lines +# The number of spaces to insert after the star on subsequent comment lines. cmt_sp_after_star_cont = 0 # number # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of -# the comment are the same length. Default=True +# the comment are the same length. Default=True. cmt_multi_check_last = true # false/true # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of @@ -1796,7 +1834,7 @@ cmt_insert_file_footer = "" # string # The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment. # Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. -# Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } +# Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... }. cmt_insert_func_header = "" # string # The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment. @@ -1826,13 +1864,13 @@ cmt_insert_before_ctor_dtor = false # false/true # Code modifying options (non-whitespace) # -# Add or remove braces on single-line 'do' statement +# Add or remove braces on single-line 'do' statement. mod_full_brace_do = ignore # ignore/add/remove/force -# Add or remove braces on single-line 'for' statement +# Add or remove braces on single-line 'for' statement. mod_full_brace_for = ignore # ignore/add/remove/force -# Add or remove braces on single-line function definitions. (Pawn) +# Add or remove braces on single-line function definitions. (Pawn). mod_full_brace_function = ignore # ignore/add/remove/force # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. @@ -1853,22 +1891,22 @@ mod_full_brace_nl = 0 # unsigned number # Blocks removal of braces if the parenthesis of if/for/while/.. span multiple lines. mod_full_brace_nl_block_rem_mlcond = false # false/true -# Add or remove braces on single-line 'while' statement +# Add or remove braces on single-line 'while' statement. mod_full_brace_while = ignore # ignore/add/remove/force -# Add or remove braces on single-line 'using ()' statement +# Add or remove braces on single-line 'using ()' statement. mod_full_brace_using = ignore # ignore/add/remove/force -# Add or remove unnecessary paren on 'return' statement +# Add or remove unnecessary paren on 'return' statement. mod_paren_on_return = ignore # ignore/add/remove/force -# Whether to change optional semicolons to real semicolons +# Whether to change optional semicolons to real semicolons. mod_pawn_semicolon = false # false/true -# Add parens on 'while' and 'if' statement around bools +# Add parens on 'while' and 'if' statement around bools. mod_full_paren_if_bool = false # false/true -# Whether to remove superfluous semicolons +# Whether to remove superfluous semicolons. mod_remove_extra_semicolon = false # false/true # If a function body exceeds the specified number of newlines and doesn't have a comment after @@ -1895,10 +1933,10 @@ mod_add_long_ifdef_endif_comment = 0 # unsigned number # the #else, a comment will be added. mod_add_long_ifdef_else_comment = 0 # unsigned number -# If True, will sort consecutive single-line 'import' statements [Java, D] +# If True, will sort consecutive single-line 'import' statements [Java, D]. mod_sort_import = false # false/true -# If True, will sort consecutive single-line 'using' statements [C#] +# If True, will sort consecutive single-line 'using' statements [C#]. mod_sort_using = false # false/true # If True, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] @@ -1915,55 +1953,55 @@ mod_case_brace = ignore # ignore/add/remove/force # If True, it will remove a void 'return;' that appears as the last statement in a function. mod_remove_empty_return = false # false/true -# If True, it will organize the properties (Obj-C) +# If True, it will organize the properties (Obj-C). mod_sort_oc_properties = false # false/true -# Determines weight of class property modifier (Obj-C) +# Determines weight of class property modifier (Obj-C). mod_sort_oc_property_class_weight = 0 # number -# Determines weight of atomic, nonatomic (Obj-C) +# Determines weight of atomic, nonatomic (Obj-C). mod_sort_oc_property_thread_safe_weight = 0 # number -# Determines weight of readwrite (Obj-C) +# Determines weight of readwrite (Obj-C). mod_sort_oc_property_readwrite_weight = 0 # number -# Determines weight of reference type (retain, copy, assign, weak, strong) (Obj-C) +# Determines weight of reference type (retain, copy, assign, weak, strong) (Obj-C). mod_sort_oc_property_reference_weight = 0 # number -# Determines weight of getter type (getter=) (Obj-C) +# Determines weight of getter type (getter=) (Obj-C). mod_sort_oc_property_getter_weight = 0 # number -# Determines weight of setter type (setter=) (Obj-C) +# Determines weight of setter type (setter=) (Obj-C). mod_sort_oc_property_setter_weight = 0 # number -# Determines weight of nullability type (nullable, nonnull, null_unspecified, null_resettable) (Obj-C) +# Determines weight of nullability type (nullable, nonnull, null_unspecified, null_resettable) (Obj-C). mod_sort_oc_property_nullability_weight = 0 # number # # Preprocessor options # -# Control indent of preprocessors inside #if blocks at brace level 0 (file-level) +# Control indent of preprocessors inside #if blocks at brace level 0 (file-level). pp_indent = ignore # ignore/add/remove/force -# Whether to indent #if/#else/#endif at the brace level (True) or from column 1 (False) +# Whether to indent #if/#else/#endif at the brace level (True) or from column 1 (False). pp_indent_at_level = false # false/true # Specifies the number of columns to indent preprocessors per level at brace level 0 (file-level). # If pp_indent_at_level=False, specifies the number of columns to indent preprocessors per level at brace level > 0 (function-level). -# Default=1 +# Default=1. pp_indent_count = 1 # unsigned number -# Add or remove space after # based on pp_level of #if blocks +# Add or remove space after # based on pp_level of #if blocks. pp_space = ignore # ignore/add/remove/force -# Sets the number of spaces added with pp_space +# Sets the number of spaces added with pp_space. pp_space_count = 0 # unsigned number -# The indent for #region and #endregion in C# and '#pragma region' in C/C++ +# The indent for #region and #endregion in C# and '#pragma region' in C/C++. pp_indent_region = 0 # number -# Whether to indent the code between #region and #endregion +# Whether to indent the code between #region and #endregion. pp_region_indent_code = false # false/true # If pp_indent_at_level=True, sets the indent for #if, #else and #endif when not at file-level. @@ -1974,26 +2012,26 @@ pp_indent_if = 0 # number # Control whether to indent the code between #if, #else and #endif. pp_if_indent_code = false # false/true -# Whether to indent '#define' at the brace level (True) or from column 1 (false) +# Whether to indent '#define' at the brace level (True) or from column 1 (false). pp_define_at_level = false # false/true # Whether to ignore the '#define' body while formatting. pp_ignore_define_body = false # false/true # Whether to indent case statements between #if, #else, and #endif. -# Only applies to the indent of the preprocesser that the case statements directly inside of +# Only applies to the indent of the preprocesser that the case statements directly inside of. pp_indent_case = true # false/true # Whether to indent whole function definitions between #if, #else, and #endif. -# Only applies to the indent of the preprocesser that the function definition is directly inside of +# Only applies to the indent of the preprocesser that the function definition is directly inside of. pp_indent_func_def = true # false/true # Whether to indent extern C blocks between #if, #else, and #endif. -# Only applies to the indent of the preprocesser that the extern block is directly inside of +# Only applies to the indent of the preprocesser that the extern block is directly inside of. pp_indent_extern = true # false/true # Whether to indent braces directly inside #if, #else, and #endif. -# Only applies to the indent of the preprocesser that the braces are directly inside of +# Only applies to the indent of the preprocesser that the braces are directly inside of. pp_indent_brace = true # false/true # @@ -2014,7 +2052,7 @@ include_category_2 = "" # string # # True: indent_func_call_param will be used (default) -# False: indent_func_call_param will NOT be used +# False: indent_func_call_param will NOT be used. use_indent_func_call_param = true # false/true # The value of the indentation for a continuation line is calculate differently if the line is: @@ -2025,11 +2063,11 @@ use_indent_func_call_param = true # false/true # at the function call (if present) # To prevent the double use of the option value, use this option with the value 'True'. # True: indent_continue will be used only once -# False: indent_continue will be used every time (default) +# False: indent_continue will be used every time (default). use_indent_continue_only_once = false # false/true # SIGNAL/SLOT Qt macros have special formatting options. See options_for_QT.cpp for details. -# Default=True +# Default=True. use_options_overriding_for_qt_macros = true # false/true # diff --git a/etc/defaults.cfg b/etc/defaults.cfg index 5257131d98..cb6f1681cb 100644 --- a/etc/defaults.cfg +++ b/etc/defaults.cfg @@ -1,19 +1,19 @@ -# Uncrustify-0.65-106-9518877-dirty +# Uncrustify-0.66 # # General options # -# The type of line endings. Default=Auto +# The type of line endings. Default=Auto. newlines = auto # auto/lf/crlf/cr -# The original size of tabs in the input. Default=8 +# The original size of tabs in the input. Default=8. input_tab_size = 8 # unsigned number -# The size of tabs in the output (only used if align_with_tabs=true). Default=8 +# The size of tabs in the output (only used if align_with_tabs=true). Default=8. output_tab_size = 8 # unsigned number -# The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn) +# The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn). string_escape_char = 92 # unsigned number # Alternate string escape char for Pawn. Only works right before the quote char. @@ -33,16 +33,16 @@ disable_processing_cmt = "" # string # Override the default ' *INDENT-ON*' in comments for enabling processing of part of the file. enable_processing_cmt = "" # string -# Enable parsing of digraphs. Default=False +# Enable parsing of digraphs. Default=False. enable_digraphs = false # false/true -# Control what to do with the UTF-8 BOM (recommend 'remove') +# Control what to do with the UTF-8 BOM (recommend 'remove'). utf8_bom = ignore # ignore/add/remove/force -# If the file contains bytes with values between 128 and 255, but is not UTF-8, then output as UTF-8 +# If the file contains bytes with values between 128 and 255, but is not UTF-8, then output as UTF-8. utf8_byte = false # false/true -# Force the output encoding to UTF-8 +# Force the output encoding to UTF-8. utf8_force = false # false/true # @@ -50,19 +50,22 @@ utf8_force = false # false/true # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -# also '>>>' '<<' '>>' '%' '|' +# also '>>>' '<<' '>>' '%' '|'. sp_arith = ignore # ignore/add/remove/force -# Add or remove space around assignment operator '=', '+=', etc +# Add or remove space around arithmetic operator '+' and '-'. Overrides sp_arith +sp_arith_additive = ignore # ignore/add/remove/force + +# Add or remove space around assignment operator '=', '+=', etc. sp_assign = ignore # ignore/add/remove/force -# Add or remove space around '=' in C++11 lambda capture specifications. Overrides sp_assign +# Add or remove space around '=' in C++11 lambda capture specifications. Overrides sp_assign. sp_cpp_lambda_assign = ignore # ignore/add/remove/force # Add or remove space after the capture specification in C++11 lambda. sp_cpp_lambda_paren = ignore # ignore/add/remove/force -# Add or remove space around assignment operator '=' in a prototype +# Add or remove space around assignment operator '=' in a prototype. sp_assign_default = ignore # ignore/add/remove/force # Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. @@ -71,10 +74,10 @@ sp_before_assign = ignore # ignore/add/remove/force # Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. sp_after_assign = ignore # ignore/add/remove/force -# Add or remove space in 'NS_ENUM (' +# Add or remove space in 'NS_ENUM ('. sp_enum_paren = ignore # ignore/add/remove/force -# Add or remove space around assignment '=' in enum +# Add or remove space around assignment '=' in enum. sp_enum_assign = ignore # ignore/add/remove/force # Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. @@ -83,10 +86,10 @@ sp_enum_before_assign = ignore # ignore/add/remove/force # Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. sp_enum_after_assign = ignore # ignore/add/remove/force -# Add or remove space around assignment ':' in enum +# Add or remove space around assignment ':' in enum. sp_enum_colon = ignore # ignore/add/remove/force -# Add or remove space around preprocessor '##' concatenation operator. Default=Add +# Add or remove space around preprocessor '##' concatenation operator. Default=Add. sp_pp_concat = add # ignore/add/remove/force # Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator. @@ -95,35 +98,35 @@ sp_pp_stringify = ignore # ignore/add/remove/force # Add or remove space before preprocessor '#' stringify operator as in '#define x(y) L#y'. sp_before_pp_stringify = ignore # ignore/add/remove/force -# Add or remove space around boolean operators '&&' and '||' +# Add or remove space around boolean operators '&&' and '||'. sp_bool = ignore # ignore/add/remove/force -# Add or remove space around compare operator '<', '>', '==', etc +# Add or remove space around compare operator '<', '>', '==', etc. sp_compare = ignore # ignore/add/remove/force -# Add or remove space inside '(' and ')' +# Add or remove space inside '(' and ')'. sp_inside_paren = ignore # ignore/add/remove/force -# Add or remove space between nested parens: '((' vs ') )' +# Add or remove space between nested parens: '((' vs ') )'. sp_paren_paren = ignore # ignore/add/remove/force -# Add or remove space between back-to-back parens: ')(' vs ') (' +# Add or remove space between back-to-back parens: ')(' vs ') ('. sp_cparen_oparen = ignore # ignore/add/remove/force -# Whether to balance spaces inside nested parens +# Whether to balance spaces inside nested parens. sp_balance_nested_parens = false # false/true -# Add or remove space between ')' and '{' +# Add or remove space between ')' and '{'. sp_paren_brace = ignore # ignore/add/remove/force -# Add or remove space before pointer star '*' +# Add or remove space before pointer star '*'. sp_before_ptr_star = ignore # ignore/add/remove/force # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force -# Add or remove space between pointer stars '*' +# Add or remove space between pointer stars '*'. sp_between_ptr_star = ignore # ignore/add/remove/force # Add or remove space after pointer star '*', if followed by a word. @@ -141,10 +144,10 @@ sp_ptr_star_paren = ignore # ignore/add/remove/force # Add or remove space before a pointer star '*', if followed by a func proto/def. sp_before_ptr_star_func = ignore # ignore/add/remove/force -# Add or remove space before a reference sign '&' +# Add or remove space before a reference sign '&'. sp_before_byref = ignore # ignore/add/remove/force -# Add or remove space before a reference sign '&' that isn't followed by a variable name +# Add or remove space before a reference sign '&' that isn't followed by a variable name. # If set to 'ignore', sp_before_byref is used instead. sp_before_unnamed_byref = ignore # ignore/add/remove/force @@ -157,7 +160,7 @@ sp_after_byref_func = ignore # ignore/add/remove/force # Add or remove space before a reference sign '&', if followed by a func proto/def. sp_before_byref_func = ignore # ignore/add/remove/force -# Add or remove space between type and word. Default=Force +# Add or remove space between type and word. Default=Force. sp_after_type = force # ignore/add/remove/force # Add or remove space before the paren in the D constructs 'template Foo(' and 'class Foo('. @@ -167,35 +170,38 @@ sp_before_template_paren = ignore # ignore/add/remove/force # If set to ignore, sp_before_angle is used. sp_template_angle = ignore # ignore/add/remove/force -# Add or remove space before '<>' +# Add or remove space before '<>'. sp_before_angle = ignore # ignore/add/remove/force -# Add or remove space inside '<' and '>' +# Add or remove space inside '<' and '>'. sp_inside_angle = ignore # ignore/add/remove/force -# Add or remove space after '<>' +# Add or remove space between '<>' and ':'. +sp_angle_colon = ignore # ignore/add/remove/force + +# Add or remove space after '<>'. sp_after_angle = ignore # ignore/add/remove/force -# Add or remove space between '<>' and '(' as found in 'new List(foo);' +# Add or remove space between '<>' and '(' as found in 'new List(foo);'. sp_angle_paren = ignore # ignore/add/remove/force -# Add or remove space between '<>' and '()' as found in 'new List();' +# Add or remove space between '<>' and '()' as found in 'new List();'. sp_angle_paren_empty = ignore # ignore/add/remove/force -# Add or remove space between '<>' and a word as in 'List m;' or 'template static ...' +# Add or remove space between '<>' and a word as in 'List m;' or 'template static ...'. sp_angle_word = ignore # ignore/add/remove/force -# Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add +# Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add. sp_angle_shift = add # ignore/add/remove/force -# Permit removal of the space between '>>' in 'foo >' (C++11 only). Default=False +# Permit removal of the space between '>>' in 'foo >' (C++11 only). Default=False. # sp_angle_shift cannot remove the space without this option. sp_permit_cpp11_shift = false # false/true # Add or remove space before '(' of 'if', 'for', 'switch', 'while', etc. sp_before_sparen = ignore # ignore/add/remove/force -# Add or remove space inside if-condition '(' and ')' +# Add or remove space inside if-condition '(' and ')'. sp_inside_sparen = ignore # ignore/add/remove/force # Add or remove space before if-condition ')'. Overrides sp_inside_sparen. @@ -216,158 +222,158 @@ sp_invariant_paren = ignore # ignore/add/remove/force # Add or remove space after the ')' in 'invariant (C) c' in the D language. sp_after_invariant_paren = ignore # ignore/add/remove/force -# Add or remove space before empty statement ';' on 'if', 'for' and 'while' +# Add or remove space before empty statement ';' on 'if', 'for' and 'while'. sp_special_semi = ignore # ignore/add/remove/force -# Add or remove space before ';'. Default=Remove +# Add or remove space before ';'. Default=Remove. sp_before_semi = remove # ignore/add/remove/force -# Add or remove space before ';' in non-empty 'for' statements +# Add or remove space before ';' in non-empty 'for' statements. sp_before_semi_for = ignore # ignore/add/remove/force # Add or remove space before a semicolon of an empty part of a for statement. sp_before_semi_for_empty = ignore # ignore/add/remove/force -# Add or remove space after ';', except when followed by a comment. Default=Add +# Add or remove space after ';', except when followed by a comment. Default=Add. sp_after_semi = add # ignore/add/remove/force -# Add or remove space after ';' in non-empty 'for' statements. Default=Force +# Add or remove space after ';' in non-empty 'for' statements. Default=Force. sp_after_semi_for = force # ignore/add/remove/force # Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; ). sp_after_semi_for_empty = ignore # ignore/add/remove/force -# Add or remove space before '[' (except '[]') +# Add or remove space before '[' (except '[]'). sp_before_square = ignore # ignore/add/remove/force -# Add or remove space before '[]' +# Add or remove space before '[]'. sp_before_squares = ignore # ignore/add/remove/force -# Add or remove space inside a non-empty '[' and ']' +# Add or remove space inside a non-empty '[' and ']'. sp_inside_square = ignore # ignore/add/remove/force -# Add or remove space after ',' +# Add or remove space after ',', 'a,b' vs 'a, b'. sp_after_comma = ignore # ignore/add/remove/force -# Add or remove space before ','. Default=Remove +# Add or remove space before ','. Default=Remove. sp_before_comma = remove # ignore/add/remove/force -# Add or remove space between ',' and ']' in multidimensional array type 'int[,,]' +# Add or remove space between ',' and ']' in multidimensional array type 'int[,,]'. Only for C#. sp_after_mdatype_commas = ignore # ignore/add/remove/force -# Add or remove space between '[' and ',' in multidimensional array type 'int[,,]' +# Add or remove space between '[' and ',' in multidimensional array type 'int[,,]'. Only for C#. sp_before_mdatype_commas = ignore # ignore/add/remove/force -# Add or remove space between ',' in multidimensional array type 'int[,,]' +# Add or remove space between ',' in multidimensional array type 'int[,,]'. Only for C#. sp_between_mdatype_commas = ignore # ignore/add/remove/force -# Add or remove space between an open paren and comma: '(,' vs '( ,'. Default=Force +# Add or remove space between an open paren and comma: '(,' vs '( ,'. Default=Force. sp_paren_comma = force # ignore/add/remove/force -# Add or remove space before the variadic '...' when preceded by a non-punctuator +# Add or remove space before the variadic '...' when preceded by a non-punctuator. sp_before_ellipsis = ignore # ignore/add/remove/force -# Add or remove space after class ':' +# Add or remove space after class ':'. sp_after_class_colon = ignore # ignore/add/remove/force -# Add or remove space before class ':' +# Add or remove space before class ':'. sp_before_class_colon = ignore # ignore/add/remove/force -# Add or remove space after class constructor ':' +# Add or remove space after class constructor ':'. sp_after_constr_colon = ignore # ignore/add/remove/force -# Add or remove space before class constructor ':' +# Add or remove space before class constructor ':'. sp_before_constr_colon = ignore # ignore/add/remove/force -# Add or remove space before case ':'. Default=Remove +# Add or remove space before case ':'. Default=Remove. sp_before_case_colon = remove # ignore/add/remove/force -# Add or remove space between 'operator' and operator sign +# Add or remove space between 'operator' and operator sign. sp_after_operator = ignore # ignore/add/remove/force -# Add or remove space between the operator symbol and the open paren, as in 'operator ++(' +# Add or remove space between the operator symbol and the open paren, as in 'operator ++('. sp_after_operator_sym = ignore # ignore/add/remove/force -# Add or remove space between the operator symbol and the open paren when the operator has no arguments, as in 'operator *()' +# Overrides sp_after_operator_sym when the operator has no arguments, as in 'operator *()'. sp_after_operator_sym_empty = ignore # ignore/add/remove/force -# Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' +# Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a'. sp_after_cast = ignore # ignore/add/remove/force -# Add or remove spaces inside cast parens +# Add or remove spaces inside cast parens. sp_inside_paren_cast = ignore # ignore/add/remove/force -# Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)' +# Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)'. sp_cpp_cast_paren = ignore # ignore/add/remove/force -# Add or remove space between 'sizeof' and '(' +# Add or remove space between 'sizeof' and '('. sp_sizeof_paren = ignore # ignore/add/remove/force -# Add or remove space after the tag keyword (Pawn) +# Add or remove space after the tag keyword (Pawn). sp_after_tag = ignore # ignore/add/remove/force -# Add or remove space inside enum '{' and '}' +# Add or remove space inside enum '{' and '}'. sp_inside_braces_enum = ignore # ignore/add/remove/force -# Add or remove space inside struct/union '{' and '}' +# Add or remove space inside struct/union '{' and '}'. sp_inside_braces_struct = ignore # ignore/add/remove/force -# Add or remove space after open brace in an unnamed temporary direct-list-initialization +# Add or remove space after open brace in an unnamed temporary direct-list-initialization. sp_after_type_brace_init_lst_open = ignore # ignore/add/remove/force -# Add or remove space before close brace in an unnamed temporary direct-list-initialization +# Add or remove space before close brace in an unnamed temporary direct-list-initialization. sp_before_type_brace_init_lst_close = ignore # ignore/add/remove/force -# Add or remove space inside an unnamed temporary direct-list-initialization +# Add or remove space inside an unnamed temporary direct-list-initialization. sp_inside_type_brace_init_lst = ignore # ignore/add/remove/force -# Add or remove space inside '{' and '}' +# Add or remove space inside '{' and '}'. sp_inside_braces = ignore # ignore/add/remove/force -# Add or remove space inside '{}' +# Add or remove space inside '{}'. sp_inside_braces_empty = ignore # ignore/add/remove/force # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. sp_type_func = ignore # ignore/add/remove/force -# Add or remove space between type and open brace of an unnamed temporary direct-list-initialization +# Add or remove space between type and open brace of an unnamed temporary direct-list-initialization. sp_type_brace_init_lst = ignore # ignore/add/remove/force -# Add or remove space between function name and '(' on function declaration +# Add or remove space between function name and '(' on function declaration. sp_func_proto_paren = ignore # ignore/add/remove/force -# Add or remove space between function name and '()' on function declaration without parameters +# Add or remove space between function name and '()' on function declaration without parameters. sp_func_proto_paren_empty = ignore # ignore/add/remove/force -# Add or remove space between function name and '(' on function definition +# Add or remove space between function name and '(' on function definition. sp_func_def_paren = ignore # ignore/add/remove/force -# Add or remove space between function name and '()' on function definition without parameters +# Add or remove space between function name and '()' on function definition without parameters. sp_func_def_paren_empty = ignore # ignore/add/remove/force -# Add or remove space inside empty function '()' +# Add or remove space inside empty function '()'. sp_inside_fparens = ignore # ignore/add/remove/force -# Add or remove space inside function '(' and ')' +# Add or remove space inside function '(' and ')'. sp_inside_fparen = ignore # ignore/add/remove/force -# Add or remove space inside the first parens in the function type: 'void (*x)(...)' +# Add or remove space inside the first parens in the function type: 'void (*x)(...)'. sp_inside_tparen = ignore # ignore/add/remove/force -# Add or remove between the parens in the function type: 'void (*x)(...)' +# Add or remove between the parens in the function type: 'void (*x)(...)'. sp_after_tparen_close = ignore # ignore/add/remove/force # Add or remove space between ']' and '(' when part of a function call. sp_square_fparen = ignore # ignore/add/remove/force -# Add or remove space between ')' and '{' of function +# Add or remove space between ')' and '{' of function. sp_fparen_brace = ignore # ignore/add/remove/force # Java: Add or remove space between ')' and '{{' of double brace initializer. sp_fparen_dbrace = ignore # ignore/add/remove/force -# Add or remove space between function name and '(' on function calls +# Add or remove space between function name and '(' on function calls. sp_func_call_paren = ignore # ignore/add/remove/force # Add or remove space between function name and '()' on function calls without parameters. @@ -378,25 +384,25 @@ sp_func_call_paren_empty = ignore # ignore/add/remove/force # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. sp_func_call_user_paren = ignore # ignore/add/remove/force -# Add or remove space between a constructor/destructor and the open paren +# Add or remove space between a constructor/destructor and the open paren. sp_func_class_paren = ignore # ignore/add/remove/force -# Add or remove space between a constructor without parameters or destructor and '()' +# Add or remove space between a constructor without parameters or destructor and '()'. sp_func_class_paren_empty = ignore # ignore/add/remove/force -# Add or remove space between 'return' and '(' +# Add or remove space between 'return' and '('. sp_return_paren = ignore # ignore/add/remove/force -# Add or remove space between '__attribute__' and '(' +# Add or remove space between '__attribute__' and '('. sp_attribute_paren = ignore # ignore/add/remove/force -# Add or remove space between 'defined' and '(' in '#if defined (FOO)' +# Add or remove space between 'defined' and '(' in '#if defined (FOO)'. sp_defined_paren = ignore # ignore/add/remove/force -# Add or remove space between 'throw' and '(' in 'throw (something)' +# Add or remove space between 'throw' and '(' in 'throw (something)'. sp_throw_paren = ignore # ignore/add/remove/force -# Add or remove space between 'throw' and anything other than '(' as in '@throw [...];' +# Add or remove space between 'throw' and anything other than '(' as in '@throw [...];'. sp_after_throw = ignore # ignore/add/remove/force # Add or remove space between 'catch' and '(' in 'catch (something) { }' @@ -411,151 +417,151 @@ sp_version_paren = ignore # ignore/add/remove/force # If set to ignore, sp_before_sparen is used. sp_scope_paren = ignore # ignore/add/remove/force -# Add or remove space between 'super' and '(' in 'super (something)'. Default=Remove +# Add or remove space between 'super' and '(' in 'super (something)'. Default=Remove. sp_super_paren = remove # ignore/add/remove/force -# Add or remove space between 'this' and '(' in 'this (something)'. Default=Remove +# Add or remove space between 'this' and '(' in 'this (something)'. Default=Remove. sp_this_paren = remove # ignore/add/remove/force -# Add or remove space between macro and value +# Add or remove space between macro and value. sp_macro = ignore # ignore/add/remove/force -# Add or remove space between macro function ')' and value +# Add or remove space between macro function ')' and value. sp_macro_func = ignore # ignore/add/remove/force -# Add or remove space between 'else' and '{' if on the same line +# Add or remove space between 'else' and '{' if on the same line. sp_else_brace = ignore # ignore/add/remove/force -# Add or remove space between '}' and 'else' if on the same line +# Add or remove space between '}' and 'else' if on the same line. sp_brace_else = ignore # ignore/add/remove/force -# Add or remove space between '}' and the name of a typedef on the same line +# Add or remove space between '}' and the name of a typedef on the same line. sp_brace_typedef = ignore # ignore/add/remove/force -# Add or remove space between 'catch' and '{' if on the same line +# Add or remove space between 'catch' and '{' if on the same line. sp_catch_brace = ignore # ignore/add/remove/force -# Add or remove space between '}' and 'catch' if on the same line +# Add or remove space between '}' and 'catch' if on the same line. sp_brace_catch = ignore # ignore/add/remove/force -# Add or remove space between 'finally' and '{' if on the same line +# Add or remove space between 'finally' and '{' if on the same line. sp_finally_brace = ignore # ignore/add/remove/force -# Add or remove space between '}' and 'finally' if on the same line +# Add or remove space between '}' and 'finally' if on the same line. sp_brace_finally = ignore # ignore/add/remove/force -# Add or remove space between 'try' and '{' if on the same line +# Add or remove space between 'try' and '{' if on the same line. sp_try_brace = ignore # ignore/add/remove/force -# Add or remove space between get/set and '{' if on the same line +# Add or remove space between get/set and '{' if on the same line. sp_getset_brace = ignore # ignore/add/remove/force -# Add or remove space between a variable and '{' for C++ uniform initialization. Default=Add +# Add or remove space between a variable and '{' for C++ uniform initialization. Default=Add. sp_word_brace = add # ignore/add/remove/force -# Add or remove space between a variable and '{' for a namespace. Default=Add +# Add or remove space between a variable and '{' for a namespace. Default=Add. sp_word_brace_ns = add # ignore/add/remove/force -# Add or remove space before the '::' operator +# Add or remove space before the '::' operator. sp_before_dc = ignore # ignore/add/remove/force -# Add or remove space after the '::' operator +# Add or remove space after the '::' operator. sp_after_dc = ignore # ignore/add/remove/force -# Add or remove around the D named array initializer ':' operator +# Add or remove around the D named array initializer ':' operator. sp_d_array_colon = ignore # ignore/add/remove/force -# Add or remove space after the '!' (not) operator. Default=Remove +# Add or remove space after the '!' (not) operator. Default=Remove. sp_not = remove # ignore/add/remove/force -# Add or remove space after the '~' (invert) operator. Default=Remove +# Add or remove space after the '~' (invert) operator. Default=Remove. sp_inv = remove # ignore/add/remove/force # Add or remove space after the '&' (address-of) operator. Default=Remove # This does not affect the spacing after a '&' that is part of a type. sp_addr = remove # ignore/add/remove/force -# Add or remove space around the '.' or '->' operators. Default=Remove +# Add or remove space around the '.' or '->' operators. Default=Remove. sp_member = remove # ignore/add/remove/force # Add or remove space after the '*' (dereference) operator. Default=Remove # This does not affect the spacing after a '*' that is part of a type. sp_deref = remove # ignore/add/remove/force -# Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove +# Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove. sp_sign = remove # ignore/add/remove/force -# Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove +# Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove. sp_incdec = remove # ignore/add/remove/force -# Add or remove space before a backslash-newline at the end of a line. Default=Add +# Add or remove space before a backslash-newline at the end of a line. Default=Add. sp_before_nl_cont = add # ignore/add/remove/force -# Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' +# Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;'. sp_after_oc_scope = ignore # ignore/add/remove/force # Add or remove space after the colon in message specs -# '-(int) f:(int) x;' vs '-(int) f: (int) x;' +# '-(int) f:(int) x;' vs '-(int) f: (int) x;'. sp_after_oc_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in message specs -# '-(int) f: (int) x;' vs '-(int) f : (int) x;' +# '-(int) f: (int) x;' vs '-(int) f : (int) x;'. sp_before_oc_colon = ignore # ignore/add/remove/force # Add or remove space after the colon in immutable dictionary expression -# 'NSDictionary *test = @{@"foo" :@"bar"};' +# 'NSDictionary *test = @{@"foo" :@"bar"};'. sp_after_oc_dict_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in immutable dictionary expression -# 'NSDictionary *test = @{@"foo" :@"bar"};' +# 'NSDictionary *test = @{@"foo" :@"bar"};'. sp_before_oc_dict_colon = ignore # ignore/add/remove/force # Add or remove space after the colon in message specs -# '[object setValue:1];' vs '[object setValue: 1];' +# '[object setValue:1];' vs '[object setValue: 1];'. sp_after_send_oc_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in message specs -# '[object setValue:1];' vs '[object setValue :1];' +# '[object setValue:1];' vs '[object setValue :1];'. sp_before_send_oc_colon = ignore # ignore/add/remove/force # Add or remove space after the (type) in message specs -# '-(int)f: (int) x;' vs '-(int)f: (int)x;' +# '-(int)f: (int) x;' vs '-(int)f: (int)x;'. sp_after_oc_type = ignore # ignore/add/remove/force # Add or remove space after the first (type) in message specs -# '-(int) f:(int)x;' vs '-(int)f:(int)x;' +# '-(int) f:(int)x;' vs '-(int)f:(int)x;'. sp_after_oc_return_type = ignore # ignore/add/remove/force # Add or remove space between '@selector' and '(' # '@selector(msgName)' vs '@selector (msgName)' -# Also applies to @protocol() constructs +# Also applies to @protocol() constructs. sp_after_oc_at_sel = ignore # ignore/add/remove/force # Add or remove space between '@selector(x)' and the following word -# '@selector(foo) a:' vs '@selector(foo)a:' +# '@selector(foo) a:' vs '@selector(foo)a:'. sp_after_oc_at_sel_parens = ignore # ignore/add/remove/force # Add or remove space inside '@selector' parens # '@selector(foo)' vs '@selector( foo )' -# Also applies to @protocol() constructs +# Also applies to @protocol() constructs. sp_inside_oc_at_sel_parens = ignore # ignore/add/remove/force # Add or remove space before a block pointer caret -# '^int (int arg){...}' vs. ' ^int (int arg){...}' +# '^int (int arg){...}' vs. ' ^int (int arg){...}'. sp_before_oc_block_caret = ignore # ignore/add/remove/force # Add or remove space after a block pointer caret -# '^int (int arg){...}' vs. '^ int (int arg){...}' +# '^int (int arg){...}' vs. '^ int (int arg){...}'. sp_after_oc_block_caret = ignore # ignore/add/remove/force # Add or remove space between the receiver and selector in a message. -# '[receiver selector ...]' +# '[receiver selector ...]'. sp_after_oc_msg_receiver = ignore # ignore/add/remove/force # Add or remove space after @property. sp_after_oc_property = ignore # ignore/add/remove/force -# Add or remove space around the ':' in 'b ? t : f' +# Add or remove space around the ':' in 'b ? t : f'. sp_cond_colon = ignore # ignore/add/remove/force # Add or remove space before the ':' in 'b ? t : f'. Overrides sp_cond_colon. @@ -564,7 +570,7 @@ sp_cond_colon_before = ignore # ignore/add/remove/force # Add or remove space after the ':' in 'b ? t : f'. Overrides sp_cond_colon. sp_cond_colon_after = ignore # ignore/add/remove/force -# Add or remove space around the '?' in 'b ? t : f' +# Add or remove space around the '?' in 'b ? t : f'. sp_cond_question = ignore # ignore/add/remove/force # Add or remove space before the '?' in 'b ? t : f'. Overrides sp_cond_question. @@ -582,16 +588,16 @@ sp_case_label = ignore # ignore/add/remove/force # Control the space around the D '..' operator. sp_range = ignore # ignore/add/remove/force -# Control the spacing after ':' in 'for (TYPE VAR : EXPR)' +# Control the spacing after ':' in 'for (TYPE VAR : EXPR)'. Only JAVA. sp_after_for_colon = ignore # ignore/add/remove/force -# Control the spacing before ':' in 'for (TYPE VAR : EXPR)' +# Control the spacing before ':' in 'for (TYPE VAR : EXPR)'. Only JAVA. sp_before_for_colon = ignore # ignore/add/remove/force -# Control the spacing in 'extern (C)' (D) +# Control the spacing in 'extern (C)' (D). sp_extern_paren = ignore # ignore/add/remove/force -# Control the space after the opening of a C++ comment '// A' vs '//A' +# Control the space after the opening of a C++ comment '// A' vs '//A'. sp_cmt_cpp_start = ignore # ignore/add/remove/force # True: If space is added with sp_cmt_cpp_start, do it after doxygen sequences like '///', '///<', '//!' and '//!<'. @@ -600,31 +606,33 @@ sp_cmt_cpp_doxygen = false # false/true # True: If space is added with sp_cmt_cpp_start, do it after Qt translator or meta-data comments like '//:', '//=', and '//~'. sp_cmt_cpp_qttr = false # false/true -# Controls the spaces between #else or #endif and a trailing comment +# Controls the spaces between #else or #endif and a trailing comment. sp_endif_cmt = ignore # ignore/add/remove/force -# Controls the spaces after 'new', 'delete' and 'delete[]' +# Controls the spaces after 'new', 'delete' and 'delete[]'. sp_after_new = ignore # ignore/add/remove/force -# Controls the spaces between new and '(' in 'new()' +# Controls the spaces between new and '(' in 'new()'. sp_between_new_paren = ignore # ignore/add/remove/force -# Controls the spaces between ')' and 'type' in 'new(foo) BAR' +# Controls the spaces between ')' and 'type' in 'new(foo) BAR'. sp_after_newop_paren = ignore # ignore/add/remove/force -# Controls the spaces inside paren of the new operator: 'new(foo) BAR' +# Controls the spaces inside paren of the new operator: 'new(foo) BAR'. sp_inside_newop_paren = ignore # ignore/add/remove/force -# Controls the space after open paren of the new operator: 'new(foo) BAR' +# Controls the space after open paren of the new operator: 'new(foo) BAR'. +# Overrides sp_inside_newop_paren. sp_inside_newop_paren_open = ignore # ignore/add/remove/force -# Controls the space before close paren of the new operator: 'new(foo) BAR' +# Controls the space before close paren of the new operator: 'new(foo) BAR'. +# Overrides sp_inside_newop_paren. sp_inside_newop_paren_close = ignore # ignore/add/remove/force -# Controls the spaces before a trailing or embedded comment +# Controls the spaces before a trailing or embedded comment. sp_before_tr_emb_cmt = ignore # ignore/add/remove/force -# Number of spaces before a trailing or embedded comment +# Number of spaces before a trailing or embedded comment. sp_num_before_tr_emb_cmt = 0 # unsigned number # Control space between a Java annotation and the open paren. @@ -641,11 +649,11 @@ force_tab_after_define = false # false/true # # The number of columns to indent per level. -# Usually 2, 3, 4, or 8. Default=8 +# Usually 2, 3, 4, or 8. Default=8. indent_columns = 8 # unsigned number # The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents. -# For FreeBSD, this is set to 4. Negative value is absolute and not increased for each ( level +# For FreeBSD, this is set to 4. Negative value is absolute and not increased for each '(' level. indent_continue = 0 # number # The continuation indent for func_*_param if they are true. @@ -662,26 +670,26 @@ indent_with_tabs = 1 # unsigned number # Requires indent_with_tabs=2. If false, will use spaces. indent_cmt_with_tabs = false # false/true -# Whether to indent strings broken by '\' so that they line up +# Whether to indent strings broken by '\' so that they line up. indent_align_string = false # false/true # The number of spaces to indent multi-line XML strings. -# Requires indent_align_string=True +# Requires indent_align_string=True. indent_xml_string = 0 # unsigned number -# Spaces to indent '{' from level +# Spaces to indent '{' from level. indent_brace = 0 # unsigned number -# Whether braces are indented to the body level +# Whether braces are indented to the body level. indent_braces = false # false/true -# Disabled indenting function braces if indent_braces is True +# Disabled indenting function braces if indent_braces is True. indent_braces_no_func = false # false/true -# Disabled indenting class braces if indent_braces is True +# Disabled indenting class braces if indent_braces is True. indent_braces_no_class = false # false/true -# Disabled indenting struct braces if indent_braces is True +# Disabled indenting struct braces if indent_braces is True. indent_braces_no_struct = false # false/true # Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc. @@ -693,48 +701,48 @@ indent_paren_open_brace = false # false/true # indent a C# delegate by another level, default is to not indent by another level. indent_cs_delegate_brace = false # false/true -# Whether the 'namespace' body is indented +# Whether the 'namespace' body is indented. indent_namespace = false # false/true # Only indent one namespace and no sub-namespaces. # Requires indent_namespace=True. indent_namespace_single_indent = false # false/true -# The number of spaces to indent a namespace block +# The number of spaces to indent a namespace block. indent_namespace_level = 0 # unsigned number # If the body of the namespace is longer than this number, it won't be indented. # Requires indent_namespace=True. Default=0 (no limit) indent_namespace_limit = 0 # unsigned number -# Whether the 'extern "C"' body is indented +# Whether the 'extern "C"' body is indented. indent_extern = false # false/true -# Whether the 'class' body is indented +# Whether the 'class' body is indented. indent_class = false # false/true -# Whether to indent the stuff after a leading base class colon +# Whether to indent the stuff after a leading base class colon. indent_class_colon = false # false/true # Indent based on a class colon instead of the stuff after the colon. -# Requires indent_class_colon=True. Default=False +# Requires indent_class_colon=True. Default=False. indent_class_on_colon = false # false/true -# Whether to indent the stuff after a leading class initializer colon +# Whether to indent the stuff after a leading class initializer colon. indent_constr_colon = false # false/true -# Virtual indent from the ':' for member initializers. Default=2 +# Virtual indent from the ':' for member initializers. Default=2. indent_ctor_init_leading = 2 # unsigned number # Additional indent for constructor initializer list. -# Negative values decrease indent down to the first column. Default=0 +# Negative values decrease indent down to the first column. Default=0. indent_ctor_init = 0 # number # False=treat 'else\nif' as 'else if' for indenting purposes -# True=indent the 'if' one level +# True=indent the 'if' one level. indent_else_if = false # false/true -# Amount to indent variable declarations after a open brace. neg=relative, pos=absolute +# Amount to indent variable declarations after a open brace. neg=relative, pos=absolute. indent_var_def_blk = 0 # number # Indent continued variable declarations instead of aligning. @@ -745,54 +753,54 @@ indent_var_def_cont = false # false/true indent_shift = false # false/true # True: force indentation of function definition to start in column 1 -# False: use the default behavior +# False: use the default behavior. indent_func_def_force_col1 = false # false/true # True: indent continued function call parameters one indent level -# False: align parameters under the open paren +# False: align parameters under the open paren. indent_func_call_param = false # false/true -# Same as indent_func_call_param, but for function defs +# Same as indent_func_call_param, but for function defs. indent_func_def_param = false # false/true -# Same as indent_func_call_param, but for function protos +# Same as indent_func_call_param, but for function protos. indent_func_proto_param = false # false/true -# Same as indent_func_call_param, but for class declarations +# Same as indent_func_call_param, but for class declarations. indent_func_class_param = false # false/true -# Same as indent_func_call_param, but for class variable constructors +# Same as indent_func_call_param, but for class variable constructors. indent_func_ctor_var_param = false # false/true -# Same as indent_func_call_param, but for templates +# Same as indent_func_call_param, but for templates. indent_template_param = false # false/true # Double the indent for indent_func_xxx_param options. -# Use both values of the options indent_columns and indent_param +# Use both values of the options indent_columns and indent_param. indent_func_param_double = false # false/true -# Indentation column for standalone 'const' function decl/proto qualifier +# Indentation column for standalone 'const' function decl/proto qualifier. indent_func_const = 0 # unsigned number -# Indentation column for standalone 'throw' function decl/proto qualifier +# Indentation column for standalone 'throw' function decl/proto qualifier. indent_func_throw = 0 # unsigned number # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. indent_member = 0 # unsigned number -# Spaces to indent single line ('//') comments on lines before code +# Spaces to indent single line ('//') comments on lines before code. indent_sing_line_comments = 0 # unsigned number # If set, will indent trailing single line ('//') comments relative -# to the code instead of trying to keep the same absolute column +# to the code instead of trying to keep the same absolute column. indent_relative_single_line_comments = false # false/true # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. indent_switch_case = 0 # unsigned number -# Whether to indent preproccesor statements inside of switch statements +# Whether to indent preproccesor statements inside of switch statements. indent_switch_pp = true # false/true # Spaces to shift the 'case' line, without affecting any other lines @@ -805,7 +813,7 @@ indent_case_shift = 0 # unsigned number # negative value are OK. indent_case_brace = 0 # number -# Whether to indent comments found in first column +# Whether to indent comments found in first column. indent_col1_comment = false # false/true # How to indent goto labels @@ -818,10 +826,10 @@ indent_label = 1 # number indent_access_spec = 1 # number # Indent the code after an access specifier by one level. -# If set, this option forces 'indent_access_spec=0' +# If set, this option forces 'indent_access_spec=0'. indent_access_spec_body = false # false/true -# If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) +# If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended). indent_paren_nl = false # false/true # Controls the indent of a close paren after a newline. @@ -830,19 +838,28 @@ indent_paren_nl = false # false/true # 2: Indent to the brace level indent_paren_close = 0 # unsigned number -# Controls the indent of a comma when inside a paren.If True, aligns under the open paren +# Controls the indent of the open paren of a function definition, if on it's own line.If True, indents the open paren +indent_paren_after_func_def = false # false/true + +# Controls the indent of the open paren of a function declaration, if on it's own line.If True, indents the open paren +indent_paren_after_func_decl = false # false/true + +# Controls the indent of the open paren of a function call, if on it's own line.If True, indents the open paren +indent_paren_after_func_call = false # false/true + +# Controls the indent of a comma when inside a paren.If True, aligns under the open paren. indent_comma_paren = false # false/true -# Controls the indent of a BOOL operator when inside a paren.If True, aligns under the open paren +# Controls the indent of a BOOL operator when inside a paren.If True, aligns under the open paren. indent_bool_paren = false # false/true -# If 'indent_bool_paren' is True, controls the indent of the first expression. If True, aligns the first expression to the following ones +# If 'indent_bool_paren' is True, controls the indent of the first expression. If True, aligns the first expression to the following ones. indent_first_bool_expr = false # false/true -# If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) +# If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended). indent_square_nl = false # false/true -# Don't change the relative indent of ESQL/C 'EXEC SQL' bodies +# Don't change the relative indent of ESQL/C 'EXEC SQL' bodies. indent_preserve_sql = false # false/true # Align continued statements at the '='. Default=True @@ -860,7 +877,7 @@ indent_oc_block_msg = 0 # unsigned number indent_oc_msg_colon = 0 # unsigned number # If True, prioritize aligning with initial colon (and stripping spaces from lines, if necessary). -# Default=True +# Default=True. indent_oc_msg_prioritize_first_colon = true # false/true # If indent_oc_block_msg and this option are on, blocks will be indented the way that Xcode does by default (from keyword if the parameter is on its own line; otherwise, from the previous indentation level). @@ -884,13 +901,13 @@ indent_min_vbrace_open = 0 # unsigned number # True: When identing after virtual brace open and newline add further spaces after regular indent to reach next tabstop. indent_vbrace_open_on_tabstop = false # false/true -# If True, a brace followed by another token (not a newline) will indent all contained lines to match the token.Default=True +# If True, a brace followed by another token (not a newline) will indent all contained lines to match the token.Default=True. indent_token_after_brace = true # false/true -# If True, cpp lambda body will be indentedDefault=False +# If True, cpp lambda body will be indentedDefault=False. indent_cpp_lambda_body = false # false/true -# indent (or not) an using block if no braces are used. Only for C#.Default=True +# indent (or not) an using block if no braces are used. Only for C#.Default=True. indent_using_block = true # false/true # indent the continuation of ternary operator. @@ -899,194 +916,197 @@ indent_using_block = true # false/true # 2: When the `:` is a continuation, indent it under `?` indent_ternary_operator = 0 # unsigned number +# If true, ignore indent and align for asm blocks as they have their own indentation. +indent_ignore_asm_block = false # false/true + # # Newline adding and removing options # -# Whether to collapse empty blocks between '{' and '}' +# Whether to collapse empty blocks between '{' and '}'. nl_collapse_empty_body = false # false/true -# Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' +# Don't split one-line braced assignments - 'foo_t f = { 1, 2 };'. nl_assign_leave_one_liners = false # false/true -# Don't split one-line braced statements inside a class xx { } body +# Don't split one-line braced statements inside a class xx { } body. nl_class_leave_one_liners = false # false/true # Don't split one-line enums: 'enum foo { BAR = 15 };' nl_enum_leave_one_liners = false # false/true -# Don't split one-line get or set functions +# Don't split one-line get or set functions. nl_getset_leave_one_liners = false # false/true -# Don't split one-line function definitions - 'int foo() { return 0; }' +# Don't split one-line function definitions - 'int foo() { return 0; }'. nl_func_leave_one_liners = false # false/true -# Don't split one-line C++11 lambdas - '[]() { return 0; }' +# Don't split one-line C++11 lambdas - '[]() { return 0; }'. nl_cpp_lambda_leave_one_liners = false # false/true -# Don't split one-line if/else statements - 'if(a) b++;' +# Don't split one-line if/else statements - 'if(a) b++;'. nl_if_leave_one_liners = false # false/true -# Don't split one-line while statements - 'while(a) b++;' +# Don't split one-line while statements - 'while(a) b++;'. nl_while_leave_one_liners = false # false/true -# Don't split one-line OC messages +# Don't split one-line OC messages. nl_oc_msg_leave_one_liner = false # false/true -# Add or remove newline between Objective-C block signature and '{' +# Add or remove newline between Objective-C block signature and '{'. nl_oc_block_brace = ignore # ignore/add/remove/force -# Add or remove newlines at the start of the file +# Add or remove newlines at the start of the file. nl_start_of_file = ignore # ignore/add/remove/force -# The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' +# The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force'. nl_start_of_file_min = 0 # unsigned number -# Add or remove newline at the end of the file +# Add or remove newline at the end of the file. nl_end_of_file = ignore # ignore/add/remove/force -# The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') +# The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force'). nl_end_of_file_min = 0 # unsigned number -# Add or remove newline between '=' and '{' +# Add or remove newline between '=' and '{'. nl_assign_brace = ignore # ignore/add/remove/force -# Add or remove newline between '=' and '[' (D only) +# Add or remove newline between '=' and '[' (D only). nl_assign_square = ignore # ignore/add/remove/force -# Add or remove newline after '= [' (D only). Will also affect the newline before the ']' +# Add or remove newline after '= [' (D only). Will also affect the newline before the ']'. nl_after_square_assign = ignore # ignore/add/remove/force # The number of blank lines after a block of variable definitions at the top of a function body -# 0 = No change (default) +# 0 = No change (default). nl_func_var_def_blk = 0 # unsigned number # The number of newlines before a block of typedefs # 0 = No change (default) -# the option 'nl_after_access_spec' takes preference over 'nl_typedef_blk_start' +# is overridden by the option 'nl_after_access_spec'. nl_typedef_blk_start = 0 # unsigned number # The number of newlines after a block of typedefs -# 0 = No change (default) +# 0 = No change (default). nl_typedef_blk_end = 0 # unsigned number # The maximum consecutive newlines within a block of typedefs -# 0 = No change (default) +# 0 = No change (default). nl_typedef_blk_in = 0 # unsigned number # The number of newlines before a block of variable definitions not at the top of a function body # 0 = No change (default) -# the option 'nl_after_access_spec' takes preference over 'nl_var_def_blk_start' +# is overridden by the option 'nl_after_access_spec'. nl_var_def_blk_start = 0 # unsigned number # The number of newlines after a block of variable definitions not at the top of a function body -# 0 = No change (default) +# 0 = No change (default). nl_var_def_blk_end = 0 # unsigned number # The maximum consecutive newlines within a block of variable definitions -# 0 = No change (default) +# 0 = No change (default). nl_var_def_blk_in = 0 # unsigned number # Add or remove newline between a function call's ')' and '{', as in: -# list_for_each(item, &list) { } +# list_for_each(item, &list) { }. nl_fcall_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'enum' and '{' +# Add or remove newline between 'enum' and '{'. nl_enum_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'enum' and 'class' +# Add or remove newline between 'enum' and 'class'. nl_enum_class = ignore # ignore/add/remove/force -# Add or remove newline between 'enum class' and the identifier +# Add or remove newline between 'enum class' and the identifier. nl_enum_class_identifier = ignore # ignore/add/remove/force -# Add or remove newline between 'enum class' type and ':' +# Add or remove newline between 'enum class' type and ':'. nl_enum_identifier_colon = ignore # ignore/add/remove/force -# Add or remove newline between 'enum class identifier :' and 'type' and/or 'type' +# Add or remove newline between 'enum class identifier :' and 'type' and/or 'type'. nl_enum_colon_type = ignore # ignore/add/remove/force -# Add or remove newline between 'struct and '{' +# Add or remove newline between 'struct and '{'. nl_struct_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'union' and '{' +# Add or remove newline between 'union' and '{'. nl_union_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'if' and '{' +# Add or remove newline between 'if' and '{'. nl_if_brace = ignore # ignore/add/remove/force -# Add or remove newline between '}' and 'else' +# Add or remove newline between '}' and 'else'. nl_brace_else = ignore # ignore/add/remove/force # Add or remove newline between 'else if' and '{' -# If set to ignore, nl_if_brace is used instead +# If set to ignore, nl_if_brace is used instead. nl_elseif_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'else' and '{' +# Add or remove newline between 'else' and '{'. nl_else_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'else' and 'if' +# Add or remove newline between 'else' and 'if'. nl_else_if = ignore # ignore/add/remove/force -# Add or remove newline before 'if'/'else if' closing parenthesis +# Add or remove newline before 'if'/'else if' closing parenthesis. nl_before_if_closing_paren = ignore # ignore/add/remove/force -# Add or remove newline between '}' and 'finally' +# Add or remove newline between '}' and 'finally'. nl_brace_finally = ignore # ignore/add/remove/force -# Add or remove newline between 'finally' and '{' +# Add or remove newline between 'finally' and '{'. nl_finally_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'try' and '{' +# Add or remove newline between 'try' and '{'. nl_try_brace = ignore # ignore/add/remove/force -# Add or remove newline between get/set and '{' +# Add or remove newline between get/set and '{'. nl_getset_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'for' and '{' +# Add or remove newline between 'for' and '{'. nl_for_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'catch' and '{' +# Add or remove newline between 'catch' and '{'. nl_catch_brace = ignore # ignore/add/remove/force -# Add or remove newline between '}' and 'catch' +# Add or remove newline between '}' and 'catch'. nl_brace_catch = ignore # ignore/add/remove/force -# Add or remove newline between '}' and ']' +# Add or remove newline between '}' and ']'. nl_brace_square = ignore # ignore/add/remove/force -# Add or remove newline between '}' and ')' in a function invocation +# Add or remove newline between '}' and ')' in a function invocation. nl_brace_fparen = ignore # ignore/add/remove/force -# Add or remove newline between 'while' and '{' +# Add or remove newline between 'while' and '{'. nl_while_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'scope (x)' and '{' (D) +# Add or remove newline between 'scope (x)' and '{' (D). nl_scope_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'unittest' and '{' (D) +# Add or remove newline between 'unittest' and '{' (D). nl_unittest_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'version (x)' and '{' (D) +# Add or remove newline between 'version (x)' and '{' (D). nl_version_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'using' and '{' +# Add or remove newline between 'using' and '{'. nl_using_brace = ignore # ignore/add/remove/force # Add or remove newline between two open or close braces. # Due to general newline/brace handling, REMOVE may not work. nl_brace_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'do' and '{' +# Add or remove newline between 'do' and '{'. nl_do_brace = ignore # ignore/add/remove/force -# Add or remove newline between '}' and 'while' of 'do' statement +# Add or remove newline between '}' and 'while' of 'do' statement. nl_brace_while = ignore # ignore/add/remove/force -# Add or remove newline between 'switch' and '{' +# Add or remove newline between 'switch' and '{'. nl_switch_brace = ignore # ignore/add/remove/force -# Add or remove newline between 'synchronized' and '{' +# Add or remove newline between 'synchronized' and '{'. nl_synchronized_brace = ignore # ignore/add/remove/force # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. @@ -1096,25 +1116,25 @@ nl_multi_line_cond = false # false/true # Force a newline in a define after the macro name for multi-line defines. nl_multi_line_define = false # false/true -# Whether to put a newline before 'case' statement, not after the first 'case' +# Whether to put a newline before 'case' statement, not after the first 'case'. nl_before_case = false # false/true -# Add or remove newline between ')' and 'throw' +# Add or remove newline between ')' and 'throw'. nl_before_throw = ignore # ignore/add/remove/force -# Whether to put a newline after 'case' statement +# Whether to put a newline after 'case' statement. nl_after_case = false # false/true # Add or remove a newline between a case ':' and '{'. Overrides nl_after_case. nl_case_colon_brace = ignore # ignore/add/remove/force -# Newline between namespace and { +# Newline between namespace and {. nl_namespace_brace = ignore # ignore/add/remove/force # Add or remove newline between 'template<>' and whatever follows. nl_template_class = ignore # ignore/add/remove/force -# Add or remove newline between 'class' and '{' +# Add or remove newline between 'class' and '{'. nl_class_brace = ignore # ignore/add/remove/force # Add or remove newline before/after each ',' in the base class list, @@ -1125,10 +1145,10 @@ nl_class_init_args = ignore # ignore/add/remove/force # Related to nl_constr_colon, pos_constr_colon and pos_constr_comma. nl_constr_init_args = ignore # ignore/add/remove/force -# Add or remove newline before first element, after comma, and after last element in enum +# Add or remove newline before first element, after comma, and after last element in enum. nl_enum_own_lines = ignore # ignore/add/remove/force -# Add or remove newline between return type and function name in a function definition +# Add or remove newline between return type and function name in a function definition. nl_func_type_name = ignore # ignore/add/remove/force # Add or remove newline between return type and function name inside a class {} @@ -1136,32 +1156,38 @@ nl_func_type_name = ignore # ignore/add/remove/force nl_func_type_name_class = ignore # ignore/add/remove/force # Add or remove newline between class specification and '::' in 'void A::f() { }' -# Only appears in separate member implementation (does not appear with in-line implmementation) +# Only appears in separate member implementation (does not appear with in-line implmementation). nl_func_class_scope = ignore # ignore/add/remove/force # Add or remove newline between function scope and name -# Controls the newline after '::' in 'void A::f() { }' +# Controls the newline after '::' in 'void A::f() { }'. nl_func_scope_name = ignore # ignore/add/remove/force -# Add or remove newline between return type and function name in a prototype +# Add or remove newline between return type and function name in a prototype. nl_func_proto_type_name = ignore # ignore/add/remove/force -# Add or remove newline between a function name and the opening '(' in the declaration +# Add or remove newline between a function name and the opening '(' in the declaration. nl_func_paren = ignore # ignore/add/remove/force -# Overrides nl_func_paren for functions with no parameters +# Overrides nl_func_paren for functions with no parameters. nl_func_paren_empty = ignore # ignore/add/remove/force -# Add or remove newline between a function name and the opening '(' in the definition +# Add or remove newline between a function name and the opening '(' in the definition. nl_func_def_paren = ignore # ignore/add/remove/force -# Overrides nl_func_def_paren for functions with no parameters +# Overrides nl_func_def_paren for functions with no parameters. nl_func_def_paren_empty = ignore # ignore/add/remove/force -# Add or remove newline after '(' in a function declaration +# Add or remove newline between a function name and the opening '(' in the call +nl_func_call_paren = ignore # ignore/add/remove/force + +# Overrides nl_func_call_paren for functions with no parameters. +nl_func_call_paren_empty = ignore # ignore/add/remove/force + +# Add or remove newline after '(' in a function declaration. nl_func_decl_start = ignore # ignore/add/remove/force -# Add or remove newline after '(' in a function definition +# Add or remove newline after '(' in a function definition. nl_func_def_start = ignore # ignore/add/remove/force # Overrides nl_func_decl_start when there is only one parameter. @@ -1176,10 +1202,10 @@ nl_func_decl_start_multi_line = false # false/true # Whether to add newline after '(' in a function definition if '(' and ')' are in different lines. nl_func_def_start_multi_line = false # false/true -# Add or remove newline after each ',' in a function declaration +# Add or remove newline after each ',' in a function declaration. nl_func_decl_args = ignore # ignore/add/remove/force -# Add or remove newline after each ',' in a function definition +# Add or remove newline after each ',' in a function definition. nl_func_def_args = ignore # ignore/add/remove/force # Whether to add newline after each ',' in a function declaration if '(' and ')' are in different lines. @@ -1188,10 +1214,10 @@ nl_func_decl_args_multi_line = false # false/true # Whether to add newline after each ',' in a function definition if '(' and ')' are in different lines. nl_func_def_args_multi_line = false # false/true -# Add or remove newline before the ')' in a function declaration +# Add or remove newline before the ')' in a function declaration. nl_func_decl_end = ignore # ignore/add/remove/force -# Add or remove newline before the ')' in a function definition +# Add or remove newline before the ')' in a function definition. nl_func_def_end = ignore # ignore/add/remove/force # Overrides nl_func_decl_end when there is only one parameter. @@ -1212,6 +1238,9 @@ nl_func_decl_empty = ignore # ignore/add/remove/force # Add or remove newline between '()' in a function definition. nl_func_def_empty = ignore # ignore/add/remove/force +# Add or remove newline between '()' in a function call. +nl_func_call_empty = ignore # ignore/add/remove/force + # Whether to add newline after '(' in a function call if '(' and ')' are in different lines. nl_func_call_start_multi_line = false # false/true @@ -1222,31 +1251,31 @@ nl_func_call_args_multi_line = false # false/true nl_func_call_end_multi_line = false # false/true # Whether to put each OC message parameter on a separate line -# See nl_oc_msg_leave_one_liner +# See nl_oc_msg_leave_one_liner. nl_oc_msg_args = false # false/true -# Add or remove newline between function signature and '{' +# Add or remove newline between function signature and '{'. nl_fdef_brace = ignore # ignore/add/remove/force -# Add or remove newline between C++11 lambda signature and '{' +# Add or remove newline between C++11 lambda signature and '{'. nl_cpp_ldef_brace = ignore # ignore/add/remove/force # Add or remove a newline between the return keyword and return expression. nl_return_expr = ignore # ignore/add/remove/force -# Whether to put a newline after semicolons, except in 'for' statements +# Whether to put a newline after semicolons, except in 'for' statements. nl_after_semicolon = false # false/true # Java: Control the newline between the ')' and '{{' of the double brace initializer. nl_paren_dbrace_open = ignore # ignore/add/remove/force -# Whether to put a newline after the type in an unnamed temporary direct-list-initialization +# Whether to put a newline after the type in an unnamed temporary direct-list-initialization. nl_type_brace_init_lst = ignore # ignore/add/remove/force -# Whether to put a newline after open brace in an unnamed temporary direct-list-initialization +# Whether to put a newline after open brace in an unnamed temporary direct-list-initialization. nl_type_brace_init_lst_open = ignore # ignore/add/remove/force -# Whether to put a newline before close brace in an unnamed temporary direct-list-initialization +# Whether to put a newline before close brace in an unnamed temporary direct-list-initialization. nl_type_brace_init_lst_close = ignore # ignore/add/remove/force # Whether to put a newline after brace open. @@ -1270,14 +1299,14 @@ nl_after_vbrace_open_empty = false # false/true nl_after_brace_close = false # false/true # Whether to put a newline after a virtual brace close. -# Would add a newline before return in: 'if (foo) a++; return;' +# Would add a newline before return in: 'if (foo) a++; return;'. nl_after_vbrace_close = false # false/true # Control the newline between the close brace and 'b' in: 'struct { int a; } b;' -# Affects enums, unions and structures. If set to ignore, uses nl_after_brace_close +# Affects enums, unions and structures. If set to ignore, uses nl_after_brace_close. nl_brace_struct_var = ignore # ignore/add/remove/force -# Whether to alter newlines in '#define' macros +# Whether to alter newlines in '#define' macros. nl_define_macro = false # false/true # Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and '#endif'. Does not affect top-level #ifdefs. @@ -1286,54 +1315,54 @@ nl_squeeze_ifdef = false # false/true # Makes the nl_squeeze_ifdef option affect the top-level #ifdefs as well. nl_squeeze_ifdef_top_level = false # false/true -# Add or remove blank line before 'if' +# Add or remove blank line before 'if'. nl_before_if = ignore # ignore/add/remove/force # Add or remove blank line after 'if' statement. -# Add/Force work only if the next token is not a closing brace +# Add/Force work only if the next token is not a closing brace. nl_after_if = ignore # ignore/add/remove/force -# Add or remove blank line before 'for' +# Add or remove blank line before 'for'. nl_before_for = ignore # ignore/add/remove/force -# Add or remove blank line after 'for' statement +# Add or remove blank line after 'for' statement. nl_after_for = ignore # ignore/add/remove/force -# Add or remove blank line before 'while' +# Add or remove blank line before 'while'. nl_before_while = ignore # ignore/add/remove/force -# Add or remove blank line after 'while' statement +# Add or remove blank line after 'while' statement. nl_after_while = ignore # ignore/add/remove/force -# Add or remove blank line before 'switch' +# Add or remove blank line before 'switch'. nl_before_switch = ignore # ignore/add/remove/force -# Add or remove blank line after 'switch' statement +# Add or remove blank line after 'switch' statement. nl_after_switch = ignore # ignore/add/remove/force -# Add or remove blank line before 'synchronized' +# Add or remove blank line before 'synchronized'. nl_before_synchronized = ignore # ignore/add/remove/force -# Add or remove blank line after 'synchronized' statement +# Add or remove blank line after 'synchronized' statement. nl_after_synchronized = ignore # ignore/add/remove/force -# Add or remove blank line before 'do' +# Add or remove blank line before 'do'. nl_before_do = ignore # ignore/add/remove/force -# Add or remove blank line after 'do/while' statement +# Add or remove blank line after 'do/while' statement. nl_after_do = ignore # ignore/add/remove/force -# Whether to double-space commented-entries in struct/union/enum +# Whether to double-space commented-entries in struct/union/enum. nl_ds_struct_enum_cmt = false # false/true # force nl before } of a struct/union/enum -# (lower priority than 'eat_blanks_before_close_brace') +# (lower priority than 'eat_blanks_before_close_brace'). nl_ds_struct_enum_close_brace = false # false/true -# Add or remove blank line before 'func_class_def' +# Add or remove blank line before 'func_class_def'. nl_before_func_class_def = 0 # unsigned number -# Add or remove blank line before 'func_class_proto' +# Add or remove blank line before 'func_class_proto'. nl_before_func_class_proto = 0 # unsigned number # Add or remove a newline before/after a class colon, @@ -1345,64 +1374,64 @@ nl_class_colon = ignore # ignore/add/remove/force nl_constr_colon = ignore # ignore/add/remove/force # Change simple unbraced if statements into a one-liner -# 'if(b)\n i++;' => 'if(b) i++;' +# 'if(b)\n i++;' => 'if(b) i++;'. nl_create_if_one_liner = false # false/true # Change simple unbraced for statements into a one-liner -# 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' +# 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);'. nl_create_for_one_liner = false # false/true # Change simple unbraced while statements into a one-liner -# 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' +# 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);'. nl_create_while_one_liner = false # false/true # Change a one-liner if statement into simple unbraced if -# 'if(b) i++;' => 'if(b)\n i++;' +# 'if(b) i++;' => 'if(b)\n i++;'. nl_split_if_one_liner = false # false/true # Change a one-liner for statement into simple unbraced for -# 'for (i=0;<5;i++) foo(i);' => 'for (i=0;<5;i++)\n foo(i);' +# 'for (i=0;<5;i++) foo(i);' => 'for (i=0;<5;i++)\n foo(i);'. nl_split_for_one_liner = false # false/true # Change a one-liner while statement into simple unbraced while -# 'while (i<5) foo(i++);' => 'while (i<5)\n foo(i++);' +# 'while (i<5) foo(i++);' => 'while (i<5)\n foo(i++);'. nl_split_while_one_liner = false # false/true # # Blank line options # -# The maximum consecutive newlines (3 = 2 blank lines) +# The maximum consecutive newlines (3 = 2 blank lines). nl_max = 0 # unsigned number -# The maximum consecutive newlines in function +# The maximum consecutive newlines in function. nl_max_blank_in_func = 0 # unsigned number -# The number of newlines after a function prototype, if followed by another function prototype +# The number of newlines after a function prototype, if followed by another function prototype. nl_after_func_proto = 0 # unsigned number -# The number of newlines after a function prototype, if not followed by another function prototype +# The number of newlines after a function prototype, if not followed by another function prototype. nl_after_func_proto_group = 0 # unsigned number -# The number of newlines after a function class prototype, if followed by another function class prototype +# The number of newlines after a function class prototype, if followed by another function class prototype. nl_after_func_class_proto = 0 # unsigned number -# The number of newlines after a function class prototype, if not followed by another function class prototype +# The number of newlines after a function class prototype, if not followed by another function class prototype. nl_after_func_class_proto_group = 0 # unsigned number -# The number of newlines before a multi-line function def body +# The number of newlines before a multi-line function def body. nl_before_func_body_def = 0 # unsigned number -# The number of newlines before a multi-line function prototype body +# The number of newlines before a multi-line function prototype body. nl_before_func_body_proto = 0 # unsigned number -# The number of newlines after '}' of a multi-line function body +# The number of newlines after '}' of a multi-line function body. nl_after_func_body = 0 # unsigned number -# The number of newlines after '}' of a multi-line function body in a class declaration +# The number of newlines after '}' of a multi-line function body in a class declaration. nl_after_func_body_class = 0 # unsigned number -# The number of newlines after '}' of a single line function body +# The number of newlines after '}' of a single line function body. nl_after_func_body_one_liner = 0 # unsigned number # The minimum number of newlines before a multi-line comment. @@ -1423,13 +1452,13 @@ nl_after_multiline_comment = false # false/true # Whether to force a newline after a label's colon. nl_after_label_colon = false # false/true -# The number of newlines after '}' or ';' of a struct/enum/union definition +# The number of newlines after '}' or ';' of a struct/enum/union definition. nl_after_struct = 0 # unsigned number -# The number of newlines before a class definition +# The number of newlines before a class definition. nl_before_class = 0 # unsigned number -# The number of newlines after '}' or ';' of a class definition +# The number of newlines after '}' or ';' of a class definition. nl_after_class = 0 # unsigned number # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. @@ -1439,7 +1468,7 @@ nl_before_access_spec = 0 # unsigned number # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:' or 'slots:' label. # 0 = No change. -# the option 'nl_after_access_spec' takes preference over 'nl_typedef_blk_start' and 'nl_var_def_blk_start' +# Overrides 'nl_typedef_blk_start' and 'nl_var_def_blk_start'. nl_after_access_spec = 0 # unsigned number # The number of newlines between a function def and the function comment. @@ -1458,13 +1487,13 @@ nl_around_cs_property = 0 # unsigned number # 0 = No change. nl_between_get_set = 0 # unsigned number -# Add or remove newline between C# property and the '{' +# Add or remove newline between C# property and the '{'. nl_property_brace = ignore # ignore/add/remove/force -# Whether to remove blank lines after '{' +# Whether to remove blank lines after '{'. eat_blanks_after_open_brace = false # false/true -# Whether to remove blank lines before '}' +# Whether to remove blank lines before '}'. eat_blanks_before_close_brace = false # false/true # How aggressively to remove extra newlines not in preproc. @@ -1490,26 +1519,26 @@ nl_between_annotation = ignore # ignore/add/remove/force # Positioning options # -# The position of arithmetic operators in wrapped expressions +# The position of arithmetic operators in wrapped expressions. pos_arith = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of assignment in wrapped expressions. -# Do not affect '=' followed by '{' +# Do not affect '=' followed by '{'. pos_assign = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force -# The position of boolean operators in wrapped expressions +# The position of boolean operators in wrapped expressions. pos_bool = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force -# The position of comparison operators in wrapped expressions +# The position of comparison operators in wrapped expressions. pos_compare = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force -# The position of conditional (b ? t : f) operators in wrapped expressions +# The position of conditional (b ? t : f) operators in wrapped expressions. pos_conditional = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force -# The position of the comma in wrapped expressions +# The position of the comma in wrapped expressions. pos_comma = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force -# The position of the comma in enum entries +# The position of the comma in enum entries. pos_enum_comma = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of the comma in the base class list if there are more than one line, @@ -1536,37 +1565,46 @@ pos_constr_colon = ignore # ignore/join/lead/lead_break/lead_fo # Try to limit code width to N number of columns code_width = 0 # unsigned number -# Whether to fully split long 'for' statements at semi-colons +# Whether to fully split long 'for' statements at semi-colons. ls_for_split_full = false # false/true -# Whether to fully split long function protos/calls at commas +# Whether to fully split long function protos/calls at commas. ls_func_split_full = false # false/true -# Whether to split lines as close to code_width as possible and ignore some groupings +# Whether to split lines as close to code_width as possible and ignore some groupings. ls_code_width = false # false/true # # Code alignment (not left column spaces/tabs) # -# Whether to keep non-indenting tabs +# Whether to keep non-indenting tabs. align_keep_tabs = false # false/true -# Whether to use tabs for aligning +# Whether to use tabs for aligning. align_with_tabs = false # false/true -# Whether to bump out to the next tab when aligning +# Whether to bump out to the next tab when aligning. align_on_tabstop = false # false/true -# Whether to right-align numbers -align_number_right = false # false/true +# Whether to right-align numbers. +align_number_right = false # false/true # Whether to keep whitespace not required for alignment. align_keep_extra_space = false # false/true -# Align variable definitions in prototypes and functions +# Align variable definitions in prototypes and functions. align_func_params = false # false/true +# The span for aligning parameter definitions in function on parameter name (0=don't align). +align_func_params_span = 0 # unsigned number + +# The threshold for aligning function parameter definitions (0=no limit). +align_func_params_thresh = 0 # unsigned number + +# The gap for aligning function parameter definitions. +align_func_params_gap = 0 # unsigned number + # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. align_same_func_call_params = false # false/true @@ -1589,19 +1627,19 @@ align_var_def_amp_style = 0 # unsigned number # The threshold for aligning variable definitions (0=no limit) align_var_def_thresh = 0 # unsigned number -# The gap for aligning variable definitions +# The gap for aligning variable definitions. align_var_def_gap = 0 # unsigned number -# Whether to align the colon in struct bit fields +# Whether to align the colon in struct bit fields. align_var_def_colon = false # false/true -# align variable defs gap for bit colons +# align variable defs gap for bit colons. align_var_def_colon_gap = 0 # unsigned number -# Whether to align any attribute after the variable name +# Whether to align any attribute after the variable name. align_var_def_attribute = false # false/true -# Whether to align inline struct/enum/union variable definitions +# Whether to align inline struct/enum/union variable definitions. align_var_def_inline = false # false/true # The span for aligning on '=' in assignments (0=don't align) @@ -1619,10 +1657,10 @@ align_enum_equ_thresh = 0 # unsigned number # The span for aligning class (0=don't align) align_var_class_span = 0 # unsigned number -# The threshold for aligning class member definitions (0=no limit) +# The threshold for aligning class member definitions (0=no limit). align_var_class_thresh = 0 # unsigned number -# The gap for aligning class member definitions +# The gap for aligning class member definitions. align_var_class_gap = 0 # unsigned number # The span for aligning struct/union (0=don't align) @@ -1631,16 +1669,16 @@ align_var_struct_span = 0 # unsigned number # The threshold for aligning struct/union member definitions (0=no limit) align_var_struct_thresh = 0 # unsigned number -# The gap for aligning struct/union member definitions +# The gap for aligning struct/union member definitions. align_var_struct_gap = 0 # unsigned number # The span for aligning struct initializer values (0=don't align) align_struct_init_span = 0 # unsigned number -# The minimum space between the type and the synonym of a typedef +# The minimum space between the type and the synonym of a typedef. align_typedef_gap = 0 # unsigned number -# The span for aligning single-line typedefs (0=don't align) +# The span for aligning single-line typedefs (0=don't align). align_typedef_span = 0 # unsigned number # How to align typedef'd functions with other typedefs @@ -1664,7 +1702,7 @@ align_typedef_amp_style = 0 # unsigned number # The span for aligning comments that end lines (0=don't align) align_right_cmt_span = 0 # unsigned number -# If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment +# If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment. align_right_cmt_mix = false # false/true # If a trailing comment is more than this number of columns away from the text it follows, @@ -1674,24 +1712,24 @@ align_right_cmt_gap = 0 # unsigned number # Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore) align_right_cmt_at_col = 0 # unsigned number -# The span for aligning function prototypes (0=don't align) +# The span for aligning function prototypes (0=don't align). align_func_proto_span = 0 # unsigned number # Minimum gap between the return type and the function name. align_func_proto_gap = 0 # unsigned number -# Align function protos on the 'operator' keyword instead of what follows +# Align function protos on the 'operator' keyword instead of what follows. align_on_operator = false # false/true # Whether to mix aligning prototype and variable declarations. # If True, align_var_def_XXX options are used instead of align_func_proto_XXX options. align_mix_var_proto = false # false/true -# Align single-line functions with function prototypes, uses align_func_proto_span +# Align single-line functions with function prototypes, uses align_func_proto_span. align_single_line_func = false # false/true # Aligning the open brace of single-line functions. -# Requires align_single_line_func=True, uses align_func_proto_span +# Requires align_single_line_func=True, uses align_func_proto_span. align_single_line_brace = false # false/true # Gap for align_single_line_brace. @@ -1704,16 +1742,16 @@ align_oc_msg_spec_span = 0 # unsigned number # This will not work right if the macro contains a multi-line comment. align_nl_cont = false # false/true -# # Align macro functions and variables together +# # Align macro functions and variables together. align_pp_define_together = false # false/true -# The minimum space between label and value of a preprocessor define +# The minimum space between label and value of a preprocessor define. align_pp_define_gap = 0 # unsigned number # The span for aligning on '#define' bodies (0=don't align, other=number of lines including comments between blocks) align_pp_define_span = 0 # unsigned number -# Align lines that start with '<<' with previous '<<'. Default=True +# Align lines that start with '<<' with previous '<<'. Default=True. align_left_shift = true # false/true # Align text after asm volatile () colons. @@ -1725,7 +1763,7 @@ align_oc_msg_colon_span = 0 # unsigned number # If True, always align with the first parameter, even if it is too short. align_oc_msg_colon_first = false # false/true -# Aligning parameters in an Obj-C '+' or '-' declaration on the ':' +# Aligning parameters in an Obj-C '+' or '-' declaration on the ':'. align_oc_decl_colon = false # false/true # @@ -1745,41 +1783,41 @@ cmt_reflow_mode = 0 # unsigned number cmt_convert_tab_to_spaces = false # false/true # If False, disable all multi-line comment changes, including cmt_width. keyword substitution and leading chars. -# Default=True +# Default=True. cmt_indent_multi = true # false/true -# Whether to group c-comments that look like they are in a block +# Whether to group c-comments that look like they are in a block. cmt_c_group = false # false/true -# Whether to put an empty '/*' on the first line of the combined c-comment +# Whether to put an empty '/*' on the first line of the combined c-comment. cmt_c_nl_start = false # false/true -# Whether to put a newline before the closing '*/' of the combined c-comment +# Whether to put a newline before the closing '*/' of the combined c-comment. cmt_c_nl_end = false # false/true -# Whether to group cpp-comments that look like they are in a block +# Whether to group cpp-comments that look like they are in a block. cmt_cpp_group = false # false/true -# Whether to put an empty '/*' on the first line of the combined cpp-comment +# Whether to put an empty '/*' on the first line of the combined cpp-comment. cmt_cpp_nl_start = false # false/true -# Whether to put a newline before the closing '*/' of the combined cpp-comment +# Whether to put a newline before the closing '*/' of the combined cpp-comment. cmt_cpp_nl_end = false # false/true -# Whether to change cpp-comments into c-comments +# Whether to change cpp-comments into c-comments. cmt_cpp_to_c = false # false/true -# Whether to put a star on subsequent comment lines +# Whether to put a star on subsequent comment lines. cmt_star_cont = false # false/true -# The number of spaces to insert at the start of subsequent comment lines +# The number of spaces to insert at the start of subsequent comment lines. cmt_sp_before_star_cont = 0 # unsigned number -# The number of spaces to insert after the star on subsequent comment lines +# The number of spaces to insert after the star on subsequent comment lines. cmt_sp_after_star_cont = 0 # number # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of -# the comment are the same length. Default=True +# the comment are the same length. Default=True. cmt_multi_check_last = true # false/true # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of @@ -1796,7 +1834,7 @@ cmt_insert_file_footer = "" # string # The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment. # Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. -# Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } +# Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... }. cmt_insert_func_header = "" # string # The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment. @@ -1826,13 +1864,13 @@ cmt_insert_before_ctor_dtor = false # false/true # Code modifying options (non-whitespace) # -# Add or remove braces on single-line 'do' statement +# Add or remove braces on single-line 'do' statement. mod_full_brace_do = ignore # ignore/add/remove/force -# Add or remove braces on single-line 'for' statement +# Add or remove braces on single-line 'for' statement. mod_full_brace_for = ignore # ignore/add/remove/force -# Add or remove braces on single-line function definitions. (Pawn) +# Add or remove braces on single-line function definitions. (Pawn). mod_full_brace_function = ignore # ignore/add/remove/force # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. @@ -1853,22 +1891,22 @@ mod_full_brace_nl = 0 # unsigned number # Blocks removal of braces if the parenthesis of if/for/while/.. span multiple lines. mod_full_brace_nl_block_rem_mlcond = false # false/true -# Add or remove braces on single-line 'while' statement +# Add or remove braces on single-line 'while' statement. mod_full_brace_while = ignore # ignore/add/remove/force -# Add or remove braces on single-line 'using ()' statement +# Add or remove braces on single-line 'using ()' statement. mod_full_brace_using = ignore # ignore/add/remove/force -# Add or remove unnecessary paren on 'return' statement +# Add or remove unnecessary paren on 'return' statement. mod_paren_on_return = ignore # ignore/add/remove/force -# Whether to change optional semicolons to real semicolons +# Whether to change optional semicolons to real semicolons. mod_pawn_semicolon = false # false/true -# Add parens on 'while' and 'if' statement around bools +# Add parens on 'while' and 'if' statement around bools. mod_full_paren_if_bool = false # false/true -# Whether to remove superfluous semicolons +# Whether to remove superfluous semicolons. mod_remove_extra_semicolon = false # false/true # If a function body exceeds the specified number of newlines and doesn't have a comment after @@ -1895,10 +1933,10 @@ mod_add_long_ifdef_endif_comment = 0 # unsigned number # the #else, a comment will be added. mod_add_long_ifdef_else_comment = 0 # unsigned number -# If True, will sort consecutive single-line 'import' statements [Java, D] +# If True, will sort consecutive single-line 'import' statements [Java, D]. mod_sort_import = false # false/true -# If True, will sort consecutive single-line 'using' statements [C#] +# If True, will sort consecutive single-line 'using' statements [C#]. mod_sort_using = false # false/true # If True, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] @@ -1915,55 +1953,55 @@ mod_case_brace = ignore # ignore/add/remove/force # If True, it will remove a void 'return;' that appears as the last statement in a function. mod_remove_empty_return = false # false/true -# If True, it will organize the properties (Obj-C) +# If True, it will organize the properties (Obj-C). mod_sort_oc_properties = false # false/true -# Determines weight of class property modifier (Obj-C) +# Determines weight of class property modifier (Obj-C). mod_sort_oc_property_class_weight = 0 # number -# Determines weight of atomic, nonatomic (Obj-C) +# Determines weight of atomic, nonatomic (Obj-C). mod_sort_oc_property_thread_safe_weight = 0 # number -# Determines weight of readwrite (Obj-C) +# Determines weight of readwrite (Obj-C). mod_sort_oc_property_readwrite_weight = 0 # number -# Determines weight of reference type (retain, copy, assign, weak, strong) (Obj-C) +# Determines weight of reference type (retain, copy, assign, weak, strong) (Obj-C). mod_sort_oc_property_reference_weight = 0 # number -# Determines weight of getter type (getter=) (Obj-C) +# Determines weight of getter type (getter=) (Obj-C). mod_sort_oc_property_getter_weight = 0 # number -# Determines weight of setter type (setter=) (Obj-C) +# Determines weight of setter type (setter=) (Obj-C). mod_sort_oc_property_setter_weight = 0 # number -# Determines weight of nullability type (nullable, nonnull, null_unspecified, null_resettable) (Obj-C) +# Determines weight of nullability type (nullable, nonnull, null_unspecified, null_resettable) (Obj-C). mod_sort_oc_property_nullability_weight = 0 # number # # Preprocessor options # -# Control indent of preprocessors inside #if blocks at brace level 0 (file-level) +# Control indent of preprocessors inside #if blocks at brace level 0 (file-level). pp_indent = ignore # ignore/add/remove/force -# Whether to indent #if/#else/#endif at the brace level (True) or from column 1 (False) +# Whether to indent #if/#else/#endif at the brace level (True) or from column 1 (False). pp_indent_at_level = false # false/true # Specifies the number of columns to indent preprocessors per level at brace level 0 (file-level). # If pp_indent_at_level=False, specifies the number of columns to indent preprocessors per level at brace level > 0 (function-level). -# Default=1 +# Default=1. pp_indent_count = 1 # unsigned number -# Add or remove space after # based on pp_level of #if blocks +# Add or remove space after # based on pp_level of #if blocks. pp_space = ignore # ignore/add/remove/force -# Sets the number of spaces added with pp_space +# Sets the number of spaces added with pp_space. pp_space_count = 0 # unsigned number -# The indent for #region and #endregion in C# and '#pragma region' in C/C++ +# The indent for #region and #endregion in C# and '#pragma region' in C/C++. pp_indent_region = 0 # number -# Whether to indent the code between #region and #endregion +# Whether to indent the code between #region and #endregion. pp_region_indent_code = false # false/true # If pp_indent_at_level=True, sets the indent for #if, #else and #endif when not at file-level. @@ -1974,26 +2012,26 @@ pp_indent_if = 0 # number # Control whether to indent the code between #if, #else and #endif. pp_if_indent_code = false # false/true -# Whether to indent '#define' at the brace level (True) or from column 1 (false) +# Whether to indent '#define' at the brace level (True) or from column 1 (false). pp_define_at_level = false # false/true # Whether to ignore the '#define' body while formatting. pp_ignore_define_body = false # false/true # Whether to indent case statements between #if, #else, and #endif. -# Only applies to the indent of the preprocesser that the case statements directly inside of +# Only applies to the indent of the preprocesser that the case statements directly inside of. pp_indent_case = true # false/true # Whether to indent whole function definitions between #if, #else, and #endif. -# Only applies to the indent of the preprocesser that the function definition is directly inside of +# Only applies to the indent of the preprocesser that the function definition is directly inside of. pp_indent_func_def = true # false/true # Whether to indent extern C blocks between #if, #else, and #endif. -# Only applies to the indent of the preprocesser that the extern block is directly inside of +# Only applies to the indent of the preprocesser that the extern block is directly inside of. pp_indent_extern = true # false/true # Whether to indent braces directly inside #if, #else, and #endif. -# Only applies to the indent of the preprocesser that the braces are directly inside of +# Only applies to the indent of the preprocesser that the braces are directly inside of. pp_indent_brace = true # false/true # @@ -2014,7 +2052,7 @@ include_category_2 = "" # string # # True: indent_func_call_param will be used (default) -# False: indent_func_call_param will NOT be used +# False: indent_func_call_param will NOT be used. use_indent_func_call_param = true # false/true # The value of the indentation for a continuation line is calculate differently if the line is: @@ -2025,11 +2063,11 @@ use_indent_func_call_param = true # false/true # at the function call (if present) # To prevent the double use of the option value, use this option with the value 'True'. # True: indent_continue will be used only once -# False: indent_continue will be used every time (default) +# False: indent_continue will be used every time (default). use_indent_continue_only_once = false # false/true # SIGNAL/SLOT Qt macros have special formatting options. See options_for_QT.cpp for details. -# Default=True +# Default=True. use_options_overriding_for_qt_macros = true # false/true # diff --git a/etc/uigui_uncrustify.ini b/etc/uigui_uncrustify.ini index 0bc67187f1..570920f73d 100644 --- a/etc/uigui_uncrustify.ini +++ b/etc/uigui_uncrustify.ini @@ -15,11 +15,11 @@ parameterOrder=ipo showHelpParameter=-h stringparaminquotes=false useCfgFileParameter="-c " -version=Uncrustify-0.65-106-9518877-dirty +version=Uncrustify-0.66 [Newlines] Category=0 -Description="The type of line endings. Default=Auto" +Description="The type of line endings. Default=Auto." Enabled=false EditorType=multiple Choices="newlines=lf|newlines=crlf|newlines=cr|newlines=auto" @@ -28,7 +28,7 @@ ValueDefault=3 [Input Tab Size] Category=0 -Description="The original size of tabs in the input. Default=8" +Description="The original size of tabs in the input. Default=8." Enabled=false EditorType=numeric CallName="input_tab_size=" @@ -38,7 +38,7 @@ ValueDefault=8 [Output Tab Size] Category=0 -Description="The size of tabs in the output (only used if align_with_tabs=true). Default=8" +Description="The size of tabs in the output (only used if align_with_tabs=true). Default=8." Enabled=false EditorType=numeric CallName="output_tab_size=" @@ -48,7 +48,7 @@ ValueDefault=8 [String Escape Char] Category=0 -Description="The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn)" +Description="The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn)." Enabled=false EditorType=numeric CallName="string_escape_char=" @@ -100,7 +100,7 @@ ValueDefault= [Enable Digraphs] Category=0 -Description="Enable parsing of digraphs. Default=False" +Description="Enable parsing of digraphs. Default=False." Enabled=false EditorType=boolean TrueFalse=enable_digraphs=true|enable_digraphs=false @@ -108,7 +108,7 @@ ValueDefault=0 [Utf8 Bom] Category=0 -Description="Control what to do with the UTF-8 BOM (recommend 'remove')" +Description="Control what to do with the UTF-8 BOM (recommend 'remove')." Enabled=false EditorType=multiple Choices="utf8_bom=ignore|utf8_bom=add|utf8_bom=remove|utf8_bom=force" @@ -117,7 +117,7 @@ ValueDefault=0 [Utf8 Byte] Category=0 -Description="If the file contains bytes with values between 128 and 255, but is not UTF-8, then output as UTF-8" +Description="If the file contains bytes with values between 128 and 255, but is not UTF-8, then output as UTF-8." Enabled=false EditorType=boolean TrueFalse=utf8_byte=true|utf8_byte=false @@ -125,7 +125,7 @@ ValueDefault=0 [Utf8 Force] Category=0 -Description="Force the output encoding to UTF-8" +Description="Force the output encoding to UTF-8." Enabled=false EditorType=boolean TrueFalse=utf8_force=true|utf8_force=false @@ -133,16 +133,25 @@ ValueDefault=0 [Sp Arith] Category=1 -Description="Add or remove space around arithmetic operator '+', '-', '/', '*', etc
    also '>>>' '<<' '>>' '%' '|'" +Description="Add or remove space around arithmetic operator '+', '-', '/', '*', etc
    also '>>>' '<<' '>>' '%' '|'." Enabled=false EditorType=multiple Choices="sp_arith=ignore|sp_arith=add|sp_arith=remove|sp_arith=force" ChoicesReadable="Ignore Sp Arith|Add Sp Arith|Remove Sp Arith|Force Sp Arith" ValueDefault=0 +[Sp Arith Additive] +Category=1 +Description="Add or remove space around arithmetic operator '+' and '-'. Overrides sp_arith" +Enabled=false +EditorType=multiple +Choices="sp_arith_additive=ignore|sp_arith_additive=add|sp_arith_additive=remove|sp_arith_additive=force" +ChoicesReadable="Ignore Sp Arith Additive|Add Sp Arith Additive|Remove Sp Arith Additive|Force Sp Arith Additive" +ValueDefault=0 + [Sp Assign] Category=1 -Description="Add or remove space around assignment operator '=', '+=', etc" +Description="Add or remove space around assignment operator '=', '+=', etc." Enabled=false EditorType=multiple Choices="sp_assign=ignore|sp_assign=add|sp_assign=remove|sp_assign=force" @@ -151,7 +160,7 @@ ValueDefault=0 [Sp Cpp Lambda Assign] Category=1 -Description="Add or remove space around '=' in C++11 lambda capture specifications. Overrides sp_assign" +Description="Add or remove space around '=' in C++11 lambda capture specifications. Overrides sp_assign." Enabled=false EditorType=multiple Choices="sp_cpp_lambda_assign=ignore|sp_cpp_lambda_assign=add|sp_cpp_lambda_assign=remove|sp_cpp_lambda_assign=force" @@ -169,7 +178,7 @@ ValueDefault=0 [Sp Assign Default] Category=1 -Description="Add or remove space around assignment operator '=' in a prototype" +Description="Add or remove space around assignment operator '=' in a prototype." Enabled=false EditorType=multiple Choices="sp_assign_default=ignore|sp_assign_default=add|sp_assign_default=remove|sp_assign_default=force" @@ -196,7 +205,7 @@ ValueDefault=0 [Sp Enum Paren] Category=1 -Description="Add or remove space in 'NS_ENUM ('" +Description="Add or remove space in 'NS_ENUM ('." Enabled=false EditorType=multiple Choices="sp_enum_paren=ignore|sp_enum_paren=add|sp_enum_paren=remove|sp_enum_paren=force" @@ -205,7 +214,7 @@ ValueDefault=0 [Sp Enum Assign] Category=1 -Description="Add or remove space around assignment '=' in enum" +Description="Add or remove space around assignment '=' in enum." Enabled=false EditorType=multiple Choices="sp_enum_assign=ignore|sp_enum_assign=add|sp_enum_assign=remove|sp_enum_assign=force" @@ -232,7 +241,7 @@ ValueDefault=0 [Sp Enum Colon] Category=1 -Description="Add or remove space around assignment ':' in enum" +Description="Add or remove space around assignment ':' in enum." Enabled=false EditorType=multiple Choices="sp_enum_colon=ignore|sp_enum_colon=add|sp_enum_colon=remove|sp_enum_colon=force" @@ -241,7 +250,7 @@ ValueDefault=0 [Sp Pp Concat] Category=1 -Description="Add or remove space around preprocessor '##' concatenation operator. Default=Add" +Description="Add or remove space around preprocessor '##' concatenation operator. Default=Add." Enabled=false EditorType=multiple Choices="sp_pp_concat=ignore|sp_pp_concat=add|sp_pp_concat=remove|sp_pp_concat=force" @@ -268,7 +277,7 @@ ValueDefault=0 [Sp Bool] Category=1 -Description="Add or remove space around boolean operators '&&' and '||'" +Description="Add or remove space around boolean operators '&&' and '||'." Enabled=false EditorType=multiple Choices="sp_bool=ignore|sp_bool=add|sp_bool=remove|sp_bool=force" @@ -277,7 +286,7 @@ ValueDefault=0 [Sp Compare] Category=1 -Description="Add or remove space around compare operator '<', '>', '==', etc" +Description="Add or remove space around compare operator '<', '>', '==', etc." Enabled=false EditorType=multiple Choices="sp_compare=ignore|sp_compare=add|sp_compare=remove|sp_compare=force" @@ -286,7 +295,7 @@ ValueDefault=0 [Sp Inside Paren] Category=1 -Description="Add or remove space inside '(' and ')'" +Description="Add or remove space inside '(' and ')'." Enabled=false EditorType=multiple Choices="sp_inside_paren=ignore|sp_inside_paren=add|sp_inside_paren=remove|sp_inside_paren=force" @@ -295,7 +304,7 @@ ValueDefault=0 [Sp Paren Paren] Category=1 -Description="Add or remove space between nested parens: '((' vs ') )'" +Description="Add or remove space between nested parens: '((' vs ') )'." Enabled=false EditorType=multiple Choices="sp_paren_paren=ignore|sp_paren_paren=add|sp_paren_paren=remove|sp_paren_paren=force" @@ -304,7 +313,7 @@ ValueDefault=0 [Sp Cparen Oparen] Category=1 -Description="Add or remove space between back-to-back parens: ')(' vs ') ('" +Description="Add or remove space between back-to-back parens: ')(' vs ') ('." Enabled=false EditorType=multiple Choices="sp_cparen_oparen=ignore|sp_cparen_oparen=add|sp_cparen_oparen=remove|sp_cparen_oparen=force" @@ -313,7 +322,7 @@ ValueDefault=0 [Sp Balance Nested Parens] Category=1 -Description="Whether to balance spaces inside nested parens" +Description="Whether to balance spaces inside nested parens." Enabled=false EditorType=boolean TrueFalse=sp_balance_nested_parens=true|sp_balance_nested_parens=false @@ -321,7 +330,7 @@ ValueDefault=0 [Sp Paren Brace] Category=1 -Description="Add or remove space between ')' and '{'" +Description="Add or remove space between ')' and '{'." Enabled=false EditorType=multiple Choices="sp_paren_brace=ignore|sp_paren_brace=add|sp_paren_brace=remove|sp_paren_brace=force" @@ -330,7 +339,7 @@ ValueDefault=0 [Sp Before Ptr Star] Category=1 -Description="Add or remove space before pointer star '*'" +Description="Add or remove space before pointer star '*'." Enabled=false EditorType=multiple Choices="sp_before_ptr_star=ignore|sp_before_ptr_star=add|sp_before_ptr_star=remove|sp_before_ptr_star=force" @@ -348,7 +357,7 @@ ValueDefault=0 [Sp Between Ptr Star] Category=1 -Description="Add or remove space between pointer stars '*'" +Description="Add or remove space between pointer stars '*'." Enabled=false EditorType=multiple Choices="sp_between_ptr_star=ignore|sp_between_ptr_star=add|sp_between_ptr_star=remove|sp_between_ptr_star=force" @@ -402,7 +411,7 @@ ValueDefault=0 [Sp Before Byref] Category=1 -Description="Add or remove space before a reference sign '&'" +Description="Add or remove space before a reference sign '&'." Enabled=false EditorType=multiple Choices="sp_before_byref=ignore|sp_before_byref=add|sp_before_byref=remove|sp_before_byref=force" @@ -411,7 +420,7 @@ ValueDefault=0 [Sp Before Unnamed Byref] Category=1 -Description="Add or remove space before a reference sign '&' that isn't followed by a variable name
    If set to 'ignore', sp_before_byref is used instead." +Description="Add or remove space before a reference sign '&' that isn't followed by a variable name.
    If set to 'ignore', sp_before_byref is used instead." Enabled=false EditorType=multiple Choices="sp_before_unnamed_byref=ignore|sp_before_unnamed_byref=add|sp_before_unnamed_byref=remove|sp_before_unnamed_byref=force" @@ -447,7 +456,7 @@ ValueDefault=0 [Sp After Type] Category=1 -Description="Add or remove space between type and word. Default=Force" +Description="Add or remove space between type and word. Default=Force." Enabled=false EditorType=multiple Choices="sp_after_type=ignore|sp_after_type=add|sp_after_type=remove|sp_after_type=force" @@ -474,7 +483,7 @@ ValueDefault=0 [Sp Before Angle] Category=1 -Description="Add or remove space before '<>'" +Description="Add or remove space before '<>'." Enabled=false EditorType=multiple Choices="sp_before_angle=ignore|sp_before_angle=add|sp_before_angle=remove|sp_before_angle=force" @@ -483,16 +492,25 @@ ValueDefault=0 [Sp Inside Angle] Category=1 -Description="Add or remove space inside '<' and '>'" +Description="Add or remove space inside '<' and '>'." Enabled=false EditorType=multiple Choices="sp_inside_angle=ignore|sp_inside_angle=add|sp_inside_angle=remove|sp_inside_angle=force" ChoicesReadable="Ignore Sp Inside Angle|Add Sp Inside Angle|Remove Sp Inside Angle|Force Sp Inside Angle" ValueDefault=0 +[Sp Angle Colon] +Category=1 +Description="Add or remove space between '<>' and ':'." +Enabled=false +EditorType=multiple +Choices="sp_angle_colon=ignore|sp_angle_colon=add|sp_angle_colon=remove|sp_angle_colon=force" +ChoicesReadable="Ignore Sp Angle Colon|Add Sp Angle Colon|Remove Sp Angle Colon|Force Sp Angle Colon" +ValueDefault=0 + [Sp After Angle] Category=1 -Description="Add or remove space after '<>'" +Description="Add or remove space after '<>'." Enabled=false EditorType=multiple Choices="sp_after_angle=ignore|sp_after_angle=add|sp_after_angle=remove|sp_after_angle=force" @@ -501,7 +519,7 @@ ValueDefault=0 [Sp Angle Paren] Category=1 -Description="Add or remove space between '<>' and '(' as found in 'new List<byte>(foo);'" +Description="Add or remove space between '<>' and '(' as found in 'new List<byte>(foo);'." Enabled=false EditorType=multiple Choices="sp_angle_paren=ignore|sp_angle_paren=add|sp_angle_paren=remove|sp_angle_paren=force" @@ -510,7 +528,7 @@ ValueDefault=0 [Sp Angle Paren Empty] Category=1 -Description="Add or remove space between '<>' and '()' as found in 'new List<byte>();'" +Description="Add or remove space between '<>' and '()' as found in 'new List<byte>();'." Enabled=false EditorType=multiple Choices="sp_angle_paren_empty=ignore|sp_angle_paren_empty=add|sp_angle_paren_empty=remove|sp_angle_paren_empty=force" @@ -519,7 +537,7 @@ ValueDefault=0 [Sp Angle Word] Category=1 -Description="Add or remove space between '<>' and a word as in 'List<byte> m;' or 'template <typename T> static ...'" +Description="Add or remove space between '<>' and a word as in 'List<byte> m;' or 'template <typename T> static ...'." Enabled=false EditorType=multiple Choices="sp_angle_word=ignore|sp_angle_word=add|sp_angle_word=remove|sp_angle_word=force" @@ -528,7 +546,7 @@ ValueDefault=0 [Sp Angle Shift] Category=1 -Description="Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add" +Description="Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add." Enabled=false EditorType=multiple Choices="sp_angle_shift=ignore|sp_angle_shift=add|sp_angle_shift=remove|sp_angle_shift=force" @@ -537,7 +555,7 @@ ValueDefault=1 [Sp Permit Cpp11 Shift] Category=1 -Description="Permit removal of the space between '>>' in 'foo<bar<int> >' (C++11 only). Default=False
    sp_angle_shift cannot remove the space without this option." +Description="Permit removal of the space between '>>' in 'foo<bar<int> >' (C++11 only). Default=False.
    sp_angle_shift cannot remove the space without this option." Enabled=false EditorType=boolean TrueFalse=sp_permit_cpp11_shift=true|sp_permit_cpp11_shift=false @@ -554,7 +572,7 @@ ValueDefault=0 [Sp Inside Sparen] Category=1 -Description="Add or remove space inside if-condition '(' and ')'" +Description="Add or remove space inside if-condition '(' and ')'." Enabled=false EditorType=multiple Choices="sp_inside_sparen=ignore|sp_inside_sparen=add|sp_inside_sparen=remove|sp_inside_sparen=force" @@ -617,7 +635,7 @@ ValueDefault=0 [Sp Special Semi] Category=1 -Description="Add or remove space before empty statement ';' on 'if', 'for' and 'while'" +Description="Add or remove space before empty statement ';' on 'if', 'for' and 'while'." Enabled=false EditorType=multiple Choices="sp_special_semi=ignore|sp_special_semi=add|sp_special_semi=remove|sp_special_semi=force" @@ -626,7 +644,7 @@ ValueDefault=0 [Sp Before Semi] Category=1 -Description="Add or remove space before ';'. Default=Remove" +Description="Add or remove space before ';'. Default=Remove." Enabled=false EditorType=multiple Choices="sp_before_semi=ignore|sp_before_semi=add|sp_before_semi=remove|sp_before_semi=force" @@ -635,7 +653,7 @@ ValueDefault=2 [Sp Before Semi For] Category=1 -Description="Add or remove space before ';' in non-empty 'for' statements" +Description="Add or remove space before ';' in non-empty 'for' statements." Enabled=false EditorType=multiple Choices="sp_before_semi_for=ignore|sp_before_semi_for=add|sp_before_semi_for=remove|sp_before_semi_for=force" @@ -653,7 +671,7 @@ ValueDefault=0 [Sp After Semi] Category=1 -Description="Add or remove space after ';', except when followed by a comment. Default=Add" +Description="Add or remove space after ';', except when followed by a comment. Default=Add." Enabled=false EditorType=multiple Choices="sp_after_semi=ignore|sp_after_semi=add|sp_after_semi=remove|sp_after_semi=force" @@ -662,7 +680,7 @@ ValueDefault=1 [Sp After Semi For] Category=1 -Description="Add or remove space after ';' in non-empty 'for' statements. Default=Force" +Description="Add or remove space after ';' in non-empty 'for' statements. Default=Force." Enabled=false EditorType=multiple Choices="sp_after_semi_for=ignore|sp_after_semi_for=add|sp_after_semi_for=remove|sp_after_semi_for=force" @@ -680,7 +698,7 @@ ValueDefault=0 [Sp Before Square] Category=1 -Description="Add or remove space before '[' (except '[]')" +Description="Add or remove space before '[' (except '[]')." Enabled=false EditorType=multiple Choices="sp_before_square=ignore|sp_before_square=add|sp_before_square=remove|sp_before_square=force" @@ -689,7 +707,7 @@ ValueDefault=0 [Sp Before Squares] Category=1 -Description="Add or remove space before '[]'" +Description="Add or remove space before '[]'." Enabled=false EditorType=multiple Choices="sp_before_squares=ignore|sp_before_squares=add|sp_before_squares=remove|sp_before_squares=force" @@ -698,7 +716,7 @@ ValueDefault=0 [Sp Inside Square] Category=1 -Description="Add or remove space inside a non-empty '[' and ']'" +Description="Add or remove space inside a non-empty '[' and ']'." Enabled=false EditorType=multiple Choices="sp_inside_square=ignore|sp_inside_square=add|sp_inside_square=remove|sp_inside_square=force" @@ -707,7 +725,7 @@ ValueDefault=0 [Sp After Comma] Category=1 -Description="Add or remove space after ','" +Description="Add or remove space after ',', 'a,b' vs 'a, b'." Enabled=false EditorType=multiple Choices="sp_after_comma=ignore|sp_after_comma=add|sp_after_comma=remove|sp_after_comma=force" @@ -716,7 +734,7 @@ ValueDefault=0 [Sp Before Comma] Category=1 -Description="Add or remove space before ','. Default=Remove" +Description="Add or remove space before ','. Default=Remove." Enabled=false EditorType=multiple Choices="sp_before_comma=ignore|sp_before_comma=add|sp_before_comma=remove|sp_before_comma=force" @@ -725,7 +743,7 @@ ValueDefault=2 [Sp After Mdatype Commas] Category=1 -Description="Add or remove space between ',' and ']' in multidimensional array type 'int[,,]'" +Description="Add or remove space between ',' and ']' in multidimensional array type 'int[,,]'. Only for C#." Enabled=false EditorType=multiple Choices="sp_after_mdatype_commas=ignore|sp_after_mdatype_commas=add|sp_after_mdatype_commas=remove|sp_after_mdatype_commas=force" @@ -734,7 +752,7 @@ ValueDefault=0 [Sp Before Mdatype Commas] Category=1 -Description="Add or remove space between '[' and ',' in multidimensional array type 'int[,,]'" +Description="Add or remove space between '[' and ',' in multidimensional array type 'int[,,]'. Only for C#." Enabled=false EditorType=multiple Choices="sp_before_mdatype_commas=ignore|sp_before_mdatype_commas=add|sp_before_mdatype_commas=remove|sp_before_mdatype_commas=force" @@ -743,7 +761,7 @@ ValueDefault=0 [Sp Between Mdatype Commas] Category=1 -Description="Add or remove space between ',' in multidimensional array type 'int[,,]'" +Description="Add or remove space between ',' in multidimensional array type 'int[,,]'. Only for C#." Enabled=false EditorType=multiple Choices="sp_between_mdatype_commas=ignore|sp_between_mdatype_commas=add|sp_between_mdatype_commas=remove|sp_between_mdatype_commas=force" @@ -752,7 +770,7 @@ ValueDefault=0 [Sp Paren Comma] Category=1 -Description="Add or remove space between an open paren and comma: '(,' vs '( ,'. Default=Force" +Description="Add or remove space between an open paren and comma: '(,' vs '( ,'. Default=Force." Enabled=false EditorType=multiple Choices="sp_paren_comma=ignore|sp_paren_comma=add|sp_paren_comma=remove|sp_paren_comma=force" @@ -761,7 +779,7 @@ ValueDefault=3 [Sp Before Ellipsis] Category=1 -Description="Add or remove space before the variadic '...' when preceded by a non-punctuator" +Description="Add or remove space before the variadic '...' when preceded by a non-punctuator." Enabled=false EditorType=multiple Choices="sp_before_ellipsis=ignore|sp_before_ellipsis=add|sp_before_ellipsis=remove|sp_before_ellipsis=force" @@ -770,7 +788,7 @@ ValueDefault=0 [Sp After Class Colon] Category=1 -Description="Add or remove space after class ':'" +Description="Add or remove space after class ':'." Enabled=false EditorType=multiple Choices="sp_after_class_colon=ignore|sp_after_class_colon=add|sp_after_class_colon=remove|sp_after_class_colon=force" @@ -779,7 +797,7 @@ ValueDefault=0 [Sp Before Class Colon] Category=1 -Description="Add or remove space before class ':'" +Description="Add or remove space before class ':'." Enabled=false EditorType=multiple Choices="sp_before_class_colon=ignore|sp_before_class_colon=add|sp_before_class_colon=remove|sp_before_class_colon=force" @@ -788,7 +806,7 @@ ValueDefault=0 [Sp After Constr Colon] Category=1 -Description="Add or remove space after class constructor ':'" +Description="Add or remove space after class constructor ':'." Enabled=false EditorType=multiple Choices="sp_after_constr_colon=ignore|sp_after_constr_colon=add|sp_after_constr_colon=remove|sp_after_constr_colon=force" @@ -797,7 +815,7 @@ ValueDefault=0 [Sp Before Constr Colon] Category=1 -Description="Add or remove space before class constructor ':'" +Description="Add or remove space before class constructor ':'." Enabled=false EditorType=multiple Choices="sp_before_constr_colon=ignore|sp_before_constr_colon=add|sp_before_constr_colon=remove|sp_before_constr_colon=force" @@ -806,7 +824,7 @@ ValueDefault=0 [Sp Before Case Colon] Category=1 -Description="Add or remove space before case ':'. Default=Remove" +Description="Add or remove space before case ':'. Default=Remove." Enabled=false EditorType=multiple Choices="sp_before_case_colon=ignore|sp_before_case_colon=add|sp_before_case_colon=remove|sp_before_case_colon=force" @@ -815,7 +833,7 @@ ValueDefault=2 [Sp After Operator] Category=1 -Description="Add or remove space between 'operator' and operator sign" +Description="Add or remove space between 'operator' and operator sign." Enabled=false EditorType=multiple Choices="sp_after_operator=ignore|sp_after_operator=add|sp_after_operator=remove|sp_after_operator=force" @@ -824,7 +842,7 @@ ValueDefault=0 [Sp After Operator Sym] Category=1 -Description="Add or remove space between the operator symbol and the open paren, as in 'operator ++('" +Description="Add or remove space between the operator symbol and the open paren, as in 'operator ++('." Enabled=false EditorType=multiple Choices="sp_after_operator_sym=ignore|sp_after_operator_sym=add|sp_after_operator_sym=remove|sp_after_operator_sym=force" @@ -833,7 +851,7 @@ ValueDefault=0 [Sp After Operator Sym Empty] Category=1 -Description="Add or remove space between the operator symbol and the open paren when the operator has no arguments, as in 'operator *()'" +Description="Overrides sp_after_operator_sym when the operator has no arguments, as in 'operator *()'." Enabled=false EditorType=multiple Choices="sp_after_operator_sym_empty=ignore|sp_after_operator_sym_empty=add|sp_after_operator_sym_empty=remove|sp_after_operator_sym_empty=force" @@ -842,7 +860,7 @@ ValueDefault=0 [Sp After Cast] Category=1 -Description="Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a'" +Description="Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a'." Enabled=false EditorType=multiple Choices="sp_after_cast=ignore|sp_after_cast=add|sp_after_cast=remove|sp_after_cast=force" @@ -851,7 +869,7 @@ ValueDefault=0 [Sp Inside Paren Cast] Category=1 -Description="Add or remove spaces inside cast parens" +Description="Add or remove spaces inside cast parens." Enabled=false EditorType=multiple Choices="sp_inside_paren_cast=ignore|sp_inside_paren_cast=add|sp_inside_paren_cast=remove|sp_inside_paren_cast=force" @@ -860,7 +878,7 @@ ValueDefault=0 [Sp Cpp Cast Paren] Category=1 -Description="Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)'" +Description="Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)'." Enabled=false EditorType=multiple Choices="sp_cpp_cast_paren=ignore|sp_cpp_cast_paren=add|sp_cpp_cast_paren=remove|sp_cpp_cast_paren=force" @@ -869,7 +887,7 @@ ValueDefault=0 [Sp Sizeof Paren] Category=1 -Description="Add or remove space between 'sizeof' and '('" +Description="Add or remove space between 'sizeof' and '('." Enabled=false EditorType=multiple Choices="sp_sizeof_paren=ignore|sp_sizeof_paren=add|sp_sizeof_paren=remove|sp_sizeof_paren=force" @@ -878,7 +896,7 @@ ValueDefault=0 [Sp After Tag] Category=1 -Description="Add or remove space after the tag keyword (Pawn)" +Description="Add or remove space after the tag keyword (Pawn)." Enabled=false EditorType=multiple Choices="sp_after_tag=ignore|sp_after_tag=add|sp_after_tag=remove|sp_after_tag=force" @@ -887,7 +905,7 @@ ValueDefault=0 [Sp Inside Braces Enum] Category=1 -Description="Add or remove space inside enum '{' and '}'" +Description="Add or remove space inside enum '{' and '}'." Enabled=false EditorType=multiple Choices="sp_inside_braces_enum=ignore|sp_inside_braces_enum=add|sp_inside_braces_enum=remove|sp_inside_braces_enum=force" @@ -896,7 +914,7 @@ ValueDefault=0 [Sp Inside Braces Struct] Category=1 -Description="Add or remove space inside struct/union '{' and '}'" +Description="Add or remove space inside struct/union '{' and '}'." Enabled=false EditorType=multiple Choices="sp_inside_braces_struct=ignore|sp_inside_braces_struct=add|sp_inside_braces_struct=remove|sp_inside_braces_struct=force" @@ -905,7 +923,7 @@ ValueDefault=0 [Sp After Type Brace Init Lst Open] Category=1 -Description="Add or remove space after open brace in an unnamed temporary direct-list-initialization" +Description="Add or remove space after open brace in an unnamed temporary direct-list-initialization." Enabled=false EditorType=multiple Choices="sp_after_type_brace_init_lst_open=ignore|sp_after_type_brace_init_lst_open=add|sp_after_type_brace_init_lst_open=remove|sp_after_type_brace_init_lst_open=force" @@ -914,7 +932,7 @@ ValueDefault=0 [Sp Before Type Brace Init Lst Close] Category=1 -Description="Add or remove space before close brace in an unnamed temporary direct-list-initialization" +Description="Add or remove space before close brace in an unnamed temporary direct-list-initialization." Enabled=false EditorType=multiple Choices="sp_before_type_brace_init_lst_close=ignore|sp_before_type_brace_init_lst_close=add|sp_before_type_brace_init_lst_close=remove|sp_before_type_brace_init_lst_close=force" @@ -923,7 +941,7 @@ ValueDefault=0 [Sp Inside Type Brace Init Lst] Category=1 -Description="Add or remove space inside an unnamed temporary direct-list-initialization" +Description="Add or remove space inside an unnamed temporary direct-list-initialization." Enabled=false EditorType=multiple Choices="sp_inside_type_brace_init_lst=ignore|sp_inside_type_brace_init_lst=add|sp_inside_type_brace_init_lst=remove|sp_inside_type_brace_init_lst=force" @@ -932,7 +950,7 @@ ValueDefault=0 [Sp Inside Braces] Category=1 -Description="Add or remove space inside '{' and '}'" +Description="Add or remove space inside '{' and '}'." Enabled=false EditorType=multiple Choices="sp_inside_braces=ignore|sp_inside_braces=add|sp_inside_braces=remove|sp_inside_braces=force" @@ -941,7 +959,7 @@ ValueDefault=0 [Sp Inside Braces Empty] Category=1 -Description="Add or remove space inside '{}'" +Description="Add or remove space inside '{}'." Enabled=false EditorType=multiple Choices="sp_inside_braces_empty=ignore|sp_inside_braces_empty=add|sp_inside_braces_empty=remove|sp_inside_braces_empty=force" @@ -959,7 +977,7 @@ ValueDefault=0 [Sp Type Brace Init Lst] Category=1 -Description="Add or remove space between type and open brace of an unnamed temporary direct-list-initialization" +Description="Add or remove space between type and open brace of an unnamed temporary direct-list-initialization." Enabled=false EditorType=multiple Choices="sp_type_brace_init_lst=ignore|sp_type_brace_init_lst=add|sp_type_brace_init_lst=remove|sp_type_brace_init_lst=force" @@ -968,7 +986,7 @@ ValueDefault=0 [Sp Func Proto Paren] Category=1 -Description="Add or remove space between function name and '(' on function declaration" +Description="Add or remove space between function name and '(' on function declaration." Enabled=false EditorType=multiple Choices="sp_func_proto_paren=ignore|sp_func_proto_paren=add|sp_func_proto_paren=remove|sp_func_proto_paren=force" @@ -977,7 +995,7 @@ ValueDefault=0 [Sp Func Proto Paren Empty] Category=1 -Description="Add or remove space between function name and '()' on function declaration without parameters" +Description="Add or remove space between function name and '()' on function declaration without parameters." Enabled=false EditorType=multiple Choices="sp_func_proto_paren_empty=ignore|sp_func_proto_paren_empty=add|sp_func_proto_paren_empty=remove|sp_func_proto_paren_empty=force" @@ -986,7 +1004,7 @@ ValueDefault=0 [Sp Func Def Paren] Category=1 -Description="Add or remove space between function name and '(' on function definition" +Description="Add or remove space between function name and '(' on function definition." Enabled=false EditorType=multiple Choices="sp_func_def_paren=ignore|sp_func_def_paren=add|sp_func_def_paren=remove|sp_func_def_paren=force" @@ -995,7 +1013,7 @@ ValueDefault=0 [Sp Func Def Paren Empty] Category=1 -Description="Add or remove space between function name and '()' on function definition without parameters" +Description="Add or remove space between function name and '()' on function definition without parameters." Enabled=false EditorType=multiple Choices="sp_func_def_paren_empty=ignore|sp_func_def_paren_empty=add|sp_func_def_paren_empty=remove|sp_func_def_paren_empty=force" @@ -1004,7 +1022,7 @@ ValueDefault=0 [Sp Inside Fparens] Category=1 -Description="Add or remove space inside empty function '()'" +Description="Add or remove space inside empty function '()'." Enabled=false EditorType=multiple Choices="sp_inside_fparens=ignore|sp_inside_fparens=add|sp_inside_fparens=remove|sp_inside_fparens=force" @@ -1013,7 +1031,7 @@ ValueDefault=0 [Sp Inside Fparen] Category=1 -Description="Add or remove space inside function '(' and ')'" +Description="Add or remove space inside function '(' and ')'." Enabled=false EditorType=multiple Choices="sp_inside_fparen=ignore|sp_inside_fparen=add|sp_inside_fparen=remove|sp_inside_fparen=force" @@ -1022,7 +1040,7 @@ ValueDefault=0 [Sp Inside Tparen] Category=1 -Description="Add or remove space inside the first parens in the function type: 'void (*x)(...)'" +Description="Add or remove space inside the first parens in the function type: 'void (*x)(...)'." Enabled=false EditorType=multiple Choices="sp_inside_tparen=ignore|sp_inside_tparen=add|sp_inside_tparen=remove|sp_inside_tparen=force" @@ -1031,7 +1049,7 @@ ValueDefault=0 [Sp After Tparen Close] Category=1 -Description="Add or remove between the parens in the function type: 'void (*x)(...)'" +Description="Add or remove between the parens in the function type: 'void (*x)(...)'." Enabled=false EditorType=multiple Choices="sp_after_tparen_close=ignore|sp_after_tparen_close=add|sp_after_tparen_close=remove|sp_after_tparen_close=force" @@ -1049,7 +1067,7 @@ ValueDefault=0 [Sp Fparen Brace] Category=1 -Description="Add or remove space between ')' and '{' of function" +Description="Add or remove space between ')' and '{' of function." Enabled=false EditorType=multiple Choices="sp_fparen_brace=ignore|sp_fparen_brace=add|sp_fparen_brace=remove|sp_fparen_brace=force" @@ -1067,7 +1085,7 @@ ValueDefault=0 [Sp Func Call Paren] Category=1 -Description="Add or remove space between function name and '(' on function calls" +Description="Add or remove space between function name and '(' on function calls." Enabled=false EditorType=multiple Choices="sp_func_call_paren=ignore|sp_func_call_paren=add|sp_func_call_paren=remove|sp_func_call_paren=force" @@ -1094,7 +1112,7 @@ ValueDefault=0 [Sp Func Class Paren] Category=1 -Description="Add or remove space between a constructor/destructor and the open paren" +Description="Add or remove space between a constructor/destructor and the open paren." Enabled=false EditorType=multiple Choices="sp_func_class_paren=ignore|sp_func_class_paren=add|sp_func_class_paren=remove|sp_func_class_paren=force" @@ -1103,7 +1121,7 @@ ValueDefault=0 [Sp Func Class Paren Empty] Category=1 -Description="Add or remove space between a constructor without parameters or destructor and '()'" +Description="Add or remove space between a constructor without parameters or destructor and '()'." Enabled=false EditorType=multiple Choices="sp_func_class_paren_empty=ignore|sp_func_class_paren_empty=add|sp_func_class_paren_empty=remove|sp_func_class_paren_empty=force" @@ -1112,7 +1130,7 @@ ValueDefault=0 [Sp Return Paren] Category=1 -Description="Add or remove space between 'return' and '('" +Description="Add or remove space between 'return' and '('." Enabled=false EditorType=multiple Choices="sp_return_paren=ignore|sp_return_paren=add|sp_return_paren=remove|sp_return_paren=force" @@ -1121,7 +1139,7 @@ ValueDefault=0 [Sp Attribute Paren] Category=1 -Description="Add or remove space between '__attribute__' and '('" +Description="Add or remove space between '__attribute__' and '('." Enabled=false EditorType=multiple Choices="sp_attribute_paren=ignore|sp_attribute_paren=add|sp_attribute_paren=remove|sp_attribute_paren=force" @@ -1130,7 +1148,7 @@ ValueDefault=0 [Sp Defined Paren] Category=1 -Description="Add or remove space between 'defined' and '(' in '#if defined (FOO)'" +Description="Add or remove space between 'defined' and '(' in '#if defined (FOO)'." Enabled=false EditorType=multiple Choices="sp_defined_paren=ignore|sp_defined_paren=add|sp_defined_paren=remove|sp_defined_paren=force" @@ -1139,7 +1157,7 @@ ValueDefault=0 [Sp Throw Paren] Category=1 -Description="Add or remove space between 'throw' and '(' in 'throw (something)'" +Description="Add or remove space between 'throw' and '(' in 'throw (something)'." Enabled=false EditorType=multiple Choices="sp_throw_paren=ignore|sp_throw_paren=add|sp_throw_paren=remove|sp_throw_paren=force" @@ -1148,7 +1166,7 @@ ValueDefault=0 [Sp After Throw] Category=1 -Description="Add or remove space between 'throw' and anything other than '(' as in '@throw [...];'" +Description="Add or remove space between 'throw' and anything other than '(' as in '@throw [...];'." Enabled=false EditorType=multiple Choices="sp_after_throw=ignore|sp_after_throw=add|sp_after_throw=remove|sp_after_throw=force" @@ -1184,7 +1202,7 @@ ValueDefault=0 [Sp Super Paren] Category=1 -Description="Add or remove space between 'super' and '(' in 'super (something)'. Default=Remove" +Description="Add or remove space between 'super' and '(' in 'super (something)'. Default=Remove." Enabled=false EditorType=multiple Choices="sp_super_paren=ignore|sp_super_paren=add|sp_super_paren=remove|sp_super_paren=force" @@ -1193,7 +1211,7 @@ ValueDefault=2 [Sp This Paren] Category=1 -Description="Add or remove space between 'this' and '(' in 'this (something)'. Default=Remove" +Description="Add or remove space between 'this' and '(' in 'this (something)'. Default=Remove." Enabled=false EditorType=multiple Choices="sp_this_paren=ignore|sp_this_paren=add|sp_this_paren=remove|sp_this_paren=force" @@ -1202,7 +1220,7 @@ ValueDefault=2 [Sp Macro] Category=1 -Description="Add or remove space between macro and value" +Description="Add or remove space between macro and value." Enabled=false EditorType=multiple Choices="sp_macro=ignore|sp_macro=add|sp_macro=remove|sp_macro=force" @@ -1211,7 +1229,7 @@ ValueDefault=0 [Sp Macro Func] Category=1 -Description="Add or remove space between macro function ')' and value" +Description="Add or remove space between macro function ')' and value." Enabled=false EditorType=multiple Choices="sp_macro_func=ignore|sp_macro_func=add|sp_macro_func=remove|sp_macro_func=force" @@ -1220,7 +1238,7 @@ ValueDefault=0 [Sp Else Brace] Category=1 -Description="Add or remove space between 'else' and '{' if on the same line" +Description="Add or remove space between 'else' and '{' if on the same line." Enabled=false EditorType=multiple Choices="sp_else_brace=ignore|sp_else_brace=add|sp_else_brace=remove|sp_else_brace=force" @@ -1229,7 +1247,7 @@ ValueDefault=0 [Sp Brace Else] Category=1 -Description="Add or remove space between '}' and 'else' if on the same line" +Description="Add or remove space between '}' and 'else' if on the same line." Enabled=false EditorType=multiple Choices="sp_brace_else=ignore|sp_brace_else=add|sp_brace_else=remove|sp_brace_else=force" @@ -1238,7 +1256,7 @@ ValueDefault=0 [Sp Brace Typedef] Category=1 -Description="Add or remove space between '}' and the name of a typedef on the same line" +Description="Add or remove space between '}' and the name of a typedef on the same line." Enabled=false EditorType=multiple Choices="sp_brace_typedef=ignore|sp_brace_typedef=add|sp_brace_typedef=remove|sp_brace_typedef=force" @@ -1247,7 +1265,7 @@ ValueDefault=0 [Sp Catch Brace] Category=1 -Description="Add or remove space between 'catch' and '{' if on the same line" +Description="Add or remove space between 'catch' and '{' if on the same line." Enabled=false EditorType=multiple Choices="sp_catch_brace=ignore|sp_catch_brace=add|sp_catch_brace=remove|sp_catch_brace=force" @@ -1256,7 +1274,7 @@ ValueDefault=0 [Sp Brace Catch] Category=1 -Description="Add or remove space between '}' and 'catch' if on the same line" +Description="Add or remove space between '}' and 'catch' if on the same line." Enabled=false EditorType=multiple Choices="sp_brace_catch=ignore|sp_brace_catch=add|sp_brace_catch=remove|sp_brace_catch=force" @@ -1265,7 +1283,7 @@ ValueDefault=0 [Sp Finally Brace] Category=1 -Description="Add or remove space between 'finally' and '{' if on the same line" +Description="Add or remove space between 'finally' and '{' if on the same line." Enabled=false EditorType=multiple Choices="sp_finally_brace=ignore|sp_finally_brace=add|sp_finally_brace=remove|sp_finally_brace=force" @@ -1274,7 +1292,7 @@ ValueDefault=0 [Sp Brace Finally] Category=1 -Description="Add or remove space between '}' and 'finally' if on the same line" +Description="Add or remove space between '}' and 'finally' if on the same line." Enabled=false EditorType=multiple Choices="sp_brace_finally=ignore|sp_brace_finally=add|sp_brace_finally=remove|sp_brace_finally=force" @@ -1283,7 +1301,7 @@ ValueDefault=0 [Sp Try Brace] Category=1 -Description="Add or remove space between 'try' and '{' if on the same line" +Description="Add or remove space between 'try' and '{' if on the same line." Enabled=false EditorType=multiple Choices="sp_try_brace=ignore|sp_try_brace=add|sp_try_brace=remove|sp_try_brace=force" @@ -1292,7 +1310,7 @@ ValueDefault=0 [Sp Getset Brace] Category=1 -Description="Add or remove space between get/set and '{' if on the same line" +Description="Add or remove space between get/set and '{' if on the same line." Enabled=false EditorType=multiple Choices="sp_getset_brace=ignore|sp_getset_brace=add|sp_getset_brace=remove|sp_getset_brace=force" @@ -1301,7 +1319,7 @@ ValueDefault=0 [Sp Word Brace] Category=1 -Description="Add or remove space between a variable and '{' for C++ uniform initialization. Default=Add" +Description="Add or remove space between a variable and '{' for C++ uniform initialization. Default=Add." Enabled=false EditorType=multiple Choices="sp_word_brace=ignore|sp_word_brace=add|sp_word_brace=remove|sp_word_brace=force" @@ -1310,7 +1328,7 @@ ValueDefault=1 [Sp Word Brace Ns] Category=1 -Description="Add or remove space between a variable and '{' for a namespace. Default=Add" +Description="Add or remove space between a variable and '{' for a namespace. Default=Add." Enabled=false EditorType=multiple Choices="sp_word_brace_ns=ignore|sp_word_brace_ns=add|sp_word_brace_ns=remove|sp_word_brace_ns=force" @@ -1319,7 +1337,7 @@ ValueDefault=1 [Sp Before Dc] Category=1 -Description="Add or remove space before the '::' operator" +Description="Add or remove space before the '::' operator." Enabled=false EditorType=multiple Choices="sp_before_dc=ignore|sp_before_dc=add|sp_before_dc=remove|sp_before_dc=force" @@ -1328,7 +1346,7 @@ ValueDefault=0 [Sp After Dc] Category=1 -Description="Add or remove space after the '::' operator" +Description="Add or remove space after the '::' operator." Enabled=false EditorType=multiple Choices="sp_after_dc=ignore|sp_after_dc=add|sp_after_dc=remove|sp_after_dc=force" @@ -1337,7 +1355,7 @@ ValueDefault=0 [Sp D Array Colon] Category=1 -Description="Add or remove around the D named array initializer ':' operator" +Description="Add or remove around the D named array initializer ':' operator." Enabled=false EditorType=multiple Choices="sp_d_array_colon=ignore|sp_d_array_colon=add|sp_d_array_colon=remove|sp_d_array_colon=force" @@ -1346,7 +1364,7 @@ ValueDefault=0 [Sp Not] Category=1 -Description="Add or remove space after the '!' (not) operator. Default=Remove" +Description="Add or remove space after the '!' (not) operator. Default=Remove." Enabled=false EditorType=multiple Choices="sp_not=ignore|sp_not=add|sp_not=remove|sp_not=force" @@ -1355,7 +1373,7 @@ ValueDefault=2 [Sp Inv] Category=1 -Description="Add or remove space after the '~' (invert) operator. Default=Remove" +Description="Add or remove space after the '~' (invert) operator. Default=Remove." Enabled=false EditorType=multiple Choices="sp_inv=ignore|sp_inv=add|sp_inv=remove|sp_inv=force" @@ -1373,7 +1391,7 @@ ValueDefault=2 [Sp Member] Category=1 -Description="Add or remove space around the '.' or '->' operators. Default=Remove" +Description="Add or remove space around the '.' or '->' operators. Default=Remove." Enabled=false EditorType=multiple Choices="sp_member=ignore|sp_member=add|sp_member=remove|sp_member=force" @@ -1391,7 +1409,7 @@ ValueDefault=2 [Sp Sign] Category=1 -Description="Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove" +Description="Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove." Enabled=false EditorType=multiple Choices="sp_sign=ignore|sp_sign=add|sp_sign=remove|sp_sign=force" @@ -1400,7 +1418,7 @@ ValueDefault=2 [Sp Incdec] Category=1 -Description="Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove" +Description="Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove." Enabled=false EditorType=multiple Choices="sp_incdec=ignore|sp_incdec=add|sp_incdec=remove|sp_incdec=force" @@ -1409,7 +1427,7 @@ ValueDefault=2 [Sp Before Nl Cont] Category=1 -Description="Add or remove space before a backslash-newline at the end of a line. Default=Add" +Description="Add or remove space before a backslash-newline at the end of a line. Default=Add." Enabled=false EditorType=multiple Choices="sp_before_nl_cont=ignore|sp_before_nl_cont=add|sp_before_nl_cont=remove|sp_before_nl_cont=force" @@ -1418,7 +1436,7 @@ ValueDefault=1 [Sp After Oc Scope] Category=1 -Description="Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;'" +Description="Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;'." Enabled=false EditorType=multiple Choices="sp_after_oc_scope=ignore|sp_after_oc_scope=add|sp_after_oc_scope=remove|sp_after_oc_scope=force" @@ -1427,7 +1445,7 @@ ValueDefault=0 [Sp After Oc Colon] Category=1 -Description="Add or remove space after the colon in message specs
    '-(int) f:(int) x;' vs '-(int) f: (int) x;'" +Description="Add or remove space after the colon in message specs
    '-(int) f:(int) x;' vs '-(int) f: (int) x;'." Enabled=false EditorType=multiple Choices="sp_after_oc_colon=ignore|sp_after_oc_colon=add|sp_after_oc_colon=remove|sp_after_oc_colon=force" @@ -1436,7 +1454,7 @@ ValueDefault=0 [Sp Before Oc Colon] Category=1 -Description="Add or remove space before the colon in message specs
    '-(int) f: (int) x;' vs '-(int) f : (int) x;'" +Description="Add or remove space before the colon in message specs
    '-(int) f: (int) x;' vs '-(int) f : (int) x;'." Enabled=false EditorType=multiple Choices="sp_before_oc_colon=ignore|sp_before_oc_colon=add|sp_before_oc_colon=remove|sp_before_oc_colon=force" @@ -1445,7 +1463,7 @@ ValueDefault=0 [Sp After Oc Dict Colon] Category=1 -Description="Add or remove space after the colon in immutable dictionary expression
    'NSDictionary *test = @{@"foo" :@"bar"};'" +Description="Add or remove space after the colon in immutable dictionary expression
    'NSDictionary *test = @{@"foo" :@"bar"};'." Enabled=false EditorType=multiple Choices="sp_after_oc_dict_colon=ignore|sp_after_oc_dict_colon=add|sp_after_oc_dict_colon=remove|sp_after_oc_dict_colon=force" @@ -1454,7 +1472,7 @@ ValueDefault=0 [Sp Before Oc Dict Colon] Category=1 -Description="Add or remove space before the colon in immutable dictionary expression
    'NSDictionary *test = @{@"foo" :@"bar"};'" +Description="Add or remove space before the colon in immutable dictionary expression
    'NSDictionary *test = @{@"foo" :@"bar"};'." Enabled=false EditorType=multiple Choices="sp_before_oc_dict_colon=ignore|sp_before_oc_dict_colon=add|sp_before_oc_dict_colon=remove|sp_before_oc_dict_colon=force" @@ -1463,7 +1481,7 @@ ValueDefault=0 [Sp After Send Oc Colon] Category=1 -Description="Add or remove space after the colon in message specs
    '[object setValue:1];' vs '[object setValue: 1];'" +Description="Add or remove space after the colon in message specs
    '[object setValue:1];' vs '[object setValue: 1];'." Enabled=false EditorType=multiple Choices="sp_after_send_oc_colon=ignore|sp_after_send_oc_colon=add|sp_after_send_oc_colon=remove|sp_after_send_oc_colon=force" @@ -1472,7 +1490,7 @@ ValueDefault=0 [Sp Before Send Oc Colon] Category=1 -Description="Add or remove space before the colon in message specs
    '[object setValue:1];' vs '[object setValue :1];'" +Description="Add or remove space before the colon in message specs
    '[object setValue:1];' vs '[object setValue :1];'." Enabled=false EditorType=multiple Choices="sp_before_send_oc_colon=ignore|sp_before_send_oc_colon=add|sp_before_send_oc_colon=remove|sp_before_send_oc_colon=force" @@ -1481,7 +1499,7 @@ ValueDefault=0 [Sp After Oc Type] Category=1 -Description="Add or remove space after the (type) in message specs
    '-(int)f: (int) x;' vs '-(int)f: (int)x;'" +Description="Add or remove space after the (type) in message specs
    '-(int)f: (int) x;' vs '-(int)f: (int)x;'." Enabled=false EditorType=multiple Choices="sp_after_oc_type=ignore|sp_after_oc_type=add|sp_after_oc_type=remove|sp_after_oc_type=force" @@ -1490,7 +1508,7 @@ ValueDefault=0 [Sp After Oc Return Type] Category=1 -Description="Add or remove space after the first (type) in message specs
    '-(int) f:(int)x;' vs '-(int)f:(int)x;'" +Description="Add or remove space after the first (type) in message specs
    '-(int) f:(int)x;' vs '-(int)f:(int)x;'." Enabled=false EditorType=multiple Choices="sp_after_oc_return_type=ignore|sp_after_oc_return_type=add|sp_after_oc_return_type=remove|sp_after_oc_return_type=force" @@ -1499,7 +1517,7 @@ ValueDefault=0 [Sp After Oc At Sel] Category=1 -Description="Add or remove space between '@selector' and '('
    '@selector(msgName)' vs '@selector (msgName)'
    Also applies to @protocol() constructs" +Description="Add or remove space between '@selector' and '('
    '@selector(msgName)' vs '@selector (msgName)'
    Also applies to @protocol() constructs." Enabled=false EditorType=multiple Choices="sp_after_oc_at_sel=ignore|sp_after_oc_at_sel=add|sp_after_oc_at_sel=remove|sp_after_oc_at_sel=force" @@ -1508,7 +1526,7 @@ ValueDefault=0 [Sp After Oc At Sel Parens] Category=1 -Description="Add or remove space between '@selector(x)' and the following word
    '@selector(foo) a:' vs '@selector(foo)a:'" +Description="Add or remove space between '@selector(x)' and the following word
    '@selector(foo) a:' vs '@selector(foo)a:'." Enabled=false EditorType=multiple Choices="sp_after_oc_at_sel_parens=ignore|sp_after_oc_at_sel_parens=add|sp_after_oc_at_sel_parens=remove|sp_after_oc_at_sel_parens=force" @@ -1517,7 +1535,7 @@ ValueDefault=0 [Sp Inside Oc At Sel Parens] Category=1 -Description="Add or remove space inside '@selector' parens
    '@selector(foo)' vs '@selector( foo )'
    Also applies to @protocol() constructs" +Description="Add or remove space inside '@selector' parens
    '@selector(foo)' vs '@selector( foo )'
    Also applies to @protocol() constructs." Enabled=false EditorType=multiple Choices="sp_inside_oc_at_sel_parens=ignore|sp_inside_oc_at_sel_parens=add|sp_inside_oc_at_sel_parens=remove|sp_inside_oc_at_sel_parens=force" @@ -1526,7 +1544,7 @@ ValueDefault=0 [Sp Before Oc Block Caret] Category=1 -Description="Add or remove space before a block pointer caret
    '^int (int arg){...}' vs. ' ^int (int arg){...}'" +Description="Add or remove space before a block pointer caret
    '^int (int arg){...}' vs. ' ^int (int arg){...}'." Enabled=false EditorType=multiple Choices="sp_before_oc_block_caret=ignore|sp_before_oc_block_caret=add|sp_before_oc_block_caret=remove|sp_before_oc_block_caret=force" @@ -1535,7 +1553,7 @@ ValueDefault=0 [Sp After Oc Block Caret] Category=1 -Description="Add or remove space after a block pointer caret
    '^int (int arg){...}' vs. '^ int (int arg){...}'" +Description="Add or remove space after a block pointer caret
    '^int (int arg){...}' vs. '^ int (int arg){...}'." Enabled=false EditorType=multiple Choices="sp_after_oc_block_caret=ignore|sp_after_oc_block_caret=add|sp_after_oc_block_caret=remove|sp_after_oc_block_caret=force" @@ -1544,7 +1562,7 @@ ValueDefault=0 [Sp After Oc Msg Receiver] Category=1 -Description="Add or remove space between the receiver and selector in a message.
    '[receiver selector ...]'" +Description="Add or remove space between the receiver and selector in a message.
    '[receiver selector ...]'." Enabled=false EditorType=multiple Choices="sp_after_oc_msg_receiver=ignore|sp_after_oc_msg_receiver=add|sp_after_oc_msg_receiver=remove|sp_after_oc_msg_receiver=force" @@ -1562,7 +1580,7 @@ ValueDefault=0 [Sp Cond Colon] Category=1 -Description="Add or remove space around the ':' in 'b ? t : f'" +Description="Add or remove space around the ':' in 'b ? t : f'." Enabled=false EditorType=multiple Choices="sp_cond_colon=ignore|sp_cond_colon=add|sp_cond_colon=remove|sp_cond_colon=force" @@ -1589,7 +1607,7 @@ ValueDefault=0 [Sp Cond Question] Category=1 -Description="Add or remove space around the '?' in 'b ? t : f'" +Description="Add or remove space around the '?' in 'b ? t : f'." Enabled=false EditorType=multiple Choices="sp_cond_question=ignore|sp_cond_question=add|sp_cond_question=remove|sp_cond_question=force" @@ -1643,7 +1661,7 @@ ValueDefault=0 [Sp After For Colon] Category=1 -Description="Control the spacing after ':' in 'for (TYPE VAR : EXPR)'" +Description="Control the spacing after ':' in 'for (TYPE VAR : EXPR)'. Only JAVA." Enabled=false EditorType=multiple Choices="sp_after_for_colon=ignore|sp_after_for_colon=add|sp_after_for_colon=remove|sp_after_for_colon=force" @@ -1652,7 +1670,7 @@ ValueDefault=0 [Sp Before For Colon] Category=1 -Description="Control the spacing before ':' in 'for (TYPE VAR : EXPR)'" +Description="Control the spacing before ':' in 'for (TYPE VAR : EXPR)'. Only JAVA." Enabled=false EditorType=multiple Choices="sp_before_for_colon=ignore|sp_before_for_colon=add|sp_before_for_colon=remove|sp_before_for_colon=force" @@ -1661,7 +1679,7 @@ ValueDefault=0 [Sp Extern Paren] Category=1 -Description="Control the spacing in 'extern (C)' (D)" +Description="Control the spacing in 'extern (C)' (D)." Enabled=false EditorType=multiple Choices="sp_extern_paren=ignore|sp_extern_paren=add|sp_extern_paren=remove|sp_extern_paren=force" @@ -1670,7 +1688,7 @@ ValueDefault=0 [Sp Cmt Cpp Start] Category=1 -Description="Control the space after the opening of a C++ comment '// A' vs '//A'" +Description="Control the space after the opening of a C++ comment '// A' vs '//A'." Enabled=false EditorType=multiple Choices="sp_cmt_cpp_start=ignore|sp_cmt_cpp_start=add|sp_cmt_cpp_start=remove|sp_cmt_cpp_start=force" @@ -1695,7 +1713,7 @@ ValueDefault=0 [Sp Endif Cmt] Category=1 -Description="Controls the spaces between #else or #endif and a trailing comment" +Description="Controls the spaces between #else or #endif and a trailing comment." Enabled=false EditorType=multiple Choices="sp_endif_cmt=ignore|sp_endif_cmt=add|sp_endif_cmt=remove|sp_endif_cmt=force" @@ -1704,7 +1722,7 @@ ValueDefault=0 [Sp After New] Category=1 -Description="Controls the spaces after 'new', 'delete' and 'delete[]'" +Description="Controls the spaces after 'new', 'delete' and 'delete[]'." Enabled=false EditorType=multiple Choices="sp_after_new=ignore|sp_after_new=add|sp_after_new=remove|sp_after_new=force" @@ -1713,7 +1731,7 @@ ValueDefault=0 [Sp Between New Paren] Category=1 -Description="Controls the spaces between new and '(' in 'new()'" +Description="Controls the spaces between new and '(' in 'new()'." Enabled=false EditorType=multiple Choices="sp_between_new_paren=ignore|sp_between_new_paren=add|sp_between_new_paren=remove|sp_between_new_paren=force" @@ -1722,7 +1740,7 @@ ValueDefault=0 [Sp After Newop Paren] Category=1 -Description="Controls the spaces between ')' and 'type' in 'new(foo) BAR'" +Description="Controls the spaces between ')' and 'type' in 'new(foo) BAR'." Enabled=false EditorType=multiple Choices="sp_after_newop_paren=ignore|sp_after_newop_paren=add|sp_after_newop_paren=remove|sp_after_newop_paren=force" @@ -1731,7 +1749,7 @@ ValueDefault=0 [Sp Inside Newop Paren] Category=1 -Description="Controls the spaces inside paren of the new operator: 'new(foo) BAR'" +Description="Controls the spaces inside paren of the new operator: 'new(foo) BAR'." Enabled=false EditorType=multiple Choices="sp_inside_newop_paren=ignore|sp_inside_newop_paren=add|sp_inside_newop_paren=remove|sp_inside_newop_paren=force" @@ -1740,7 +1758,7 @@ ValueDefault=0 [Sp Inside Newop Paren Open] Category=1 -Description="Controls the space after open paren of the new operator: 'new(foo) BAR'" +Description="Controls the space after open paren of the new operator: 'new(foo) BAR'.
    Overrides sp_inside_newop_paren." Enabled=false EditorType=multiple Choices="sp_inside_newop_paren_open=ignore|sp_inside_newop_paren_open=add|sp_inside_newop_paren_open=remove|sp_inside_newop_paren_open=force" @@ -1749,7 +1767,7 @@ ValueDefault=0 [Sp Inside Newop Paren Close] Category=1 -Description="Controls the space before close paren of the new operator: 'new(foo) BAR'" +Description="Controls the space before close paren of the new operator: 'new(foo) BAR'.
    Overrides sp_inside_newop_paren." Enabled=false EditorType=multiple Choices="sp_inside_newop_paren_close=ignore|sp_inside_newop_paren_close=add|sp_inside_newop_paren_close=remove|sp_inside_newop_paren_close=force" @@ -1758,7 +1776,7 @@ ValueDefault=0 [Sp Before Tr Emb Cmt] Category=1 -Description="Controls the spaces before a trailing or embedded comment" +Description="Controls the spaces before a trailing or embedded comment." Enabled=false EditorType=multiple Choices="sp_before_tr_emb_cmt=ignore|sp_before_tr_emb_cmt=add|sp_before_tr_emb_cmt=remove|sp_before_tr_emb_cmt=force" @@ -1767,7 +1785,7 @@ ValueDefault=0 [Sp Num Before Tr Emb Cmt] Category=1 -Description="Number of spaces before a trailing or embedded comment" +Description="Number of spaces before a trailing or embedded comment." Enabled=false EditorType=numeric CallName="sp_num_before_tr_emb_cmt=" @@ -1802,7 +1820,7 @@ ValueDefault=0 [Indent Columns] Category=2 -Description="The number of columns to indent per level.
    Usually 2, 3, 4, or 8. Default=8" +Description="The number of columns to indent per level.
    Usually 2, 3, 4, or 8. Default=8." Enabled=false EditorType=numeric CallName="indent_columns=" @@ -1812,7 +1830,7 @@ ValueDefault=8 [Indent Continue] Category=2 -Description="The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents.
    For FreeBSD, this is set to 4. Negative value is absolute and not increased for each ( level" +Description="The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents.
    For FreeBSD, this is set to 4. Negative value is absolute and not increased for each '(' level." Enabled=false EditorType=numeric CallName="indent_continue=" @@ -1849,7 +1867,7 @@ ValueDefault=0 [Indent Align String] Category=2 -Description="Whether to indent strings broken by '\' so that they line up" +Description="Whether to indent strings broken by '\' so that they line up." Enabled=false EditorType=boolean TrueFalse=indent_align_string=true|indent_align_string=false @@ -1857,7 +1875,7 @@ ValueDefault=0 [Indent Xml String] Category=2 -Description="The number of spaces to indent multi-line XML strings.
    Requires indent_align_string=True" +Description="The number of spaces to indent multi-line XML strings.
    Requires indent_align_string=True." Enabled=false EditorType=numeric CallName="indent_xml_string=" @@ -1867,7 +1885,7 @@ ValueDefault=0 [Indent Brace] Category=2 -Description="Spaces to indent '{' from level" +Description="Spaces to indent '{' from level." Enabled=false EditorType=numeric CallName="indent_brace=" @@ -1877,7 +1895,7 @@ ValueDefault=0 [Indent Braces] Category=2 -Description="Whether braces are indented to the body level" +Description="Whether braces are indented to the body level." Enabled=false EditorType=boolean TrueFalse=indent_braces=true|indent_braces=false @@ -1885,7 +1903,7 @@ ValueDefault=0 [Indent Braces No Func] Category=2 -Description="Disabled indenting function braces if indent_braces is True" +Description="Disabled indenting function braces if indent_braces is True." Enabled=false EditorType=boolean TrueFalse=indent_braces_no_func=true|indent_braces_no_func=false @@ -1893,7 +1911,7 @@ ValueDefault=0 [Indent Braces No Class] Category=2 -Description="Disabled indenting class braces if indent_braces is True" +Description="Disabled indenting class braces if indent_braces is True." Enabled=false EditorType=boolean TrueFalse=indent_braces_no_class=true|indent_braces_no_class=false @@ -1901,7 +1919,7 @@ ValueDefault=0 [Indent Braces No Struct] Category=2 -Description="Disabled indenting struct braces if indent_braces is True" +Description="Disabled indenting struct braces if indent_braces is True." Enabled=false EditorType=boolean TrueFalse=indent_braces_no_struct=true|indent_braces_no_struct=false @@ -1933,7 +1951,7 @@ ValueDefault=0 [Indent Namespace] Category=2 -Description="Whether the 'namespace' body is indented" +Description="Whether the 'namespace' body is indented." Enabled=false EditorType=boolean TrueFalse=indent_namespace=true|indent_namespace=false @@ -1949,7 +1967,7 @@ ValueDefault=0 [Indent Namespace Level] Category=2 -Description="The number of spaces to indent a namespace block" +Description="The number of spaces to indent a namespace block." Enabled=false EditorType=numeric CallName="indent_namespace_level=" @@ -1969,7 +1987,7 @@ ValueDefault=0 [Indent Extern] Category=2 -Description="Whether the 'extern "C"' body is indented" +Description="Whether the 'extern "C"' body is indented." Enabled=false EditorType=boolean TrueFalse=indent_extern=true|indent_extern=false @@ -1977,7 +1995,7 @@ ValueDefault=0 [Indent Class] Category=2 -Description="Whether the 'class' body is indented" +Description="Whether the 'class' body is indented." Enabled=false EditorType=boolean TrueFalse=indent_class=true|indent_class=false @@ -1985,7 +2003,7 @@ ValueDefault=0 [Indent Class Colon] Category=2 -Description="Whether to indent the stuff after a leading base class colon" +Description="Whether to indent the stuff after a leading base class colon." Enabled=false EditorType=boolean TrueFalse=indent_class_colon=true|indent_class_colon=false @@ -1993,7 +2011,7 @@ ValueDefault=0 [Indent Class On Colon] Category=2 -Description="Indent based on a class colon instead of the stuff after the colon.
    Requires indent_class_colon=True. Default=False" +Description="Indent based on a class colon instead of the stuff after the colon.
    Requires indent_class_colon=True. Default=False." Enabled=false EditorType=boolean TrueFalse=indent_class_on_colon=true|indent_class_on_colon=false @@ -2001,7 +2019,7 @@ ValueDefault=0 [Indent Constr Colon] Category=2 -Description="Whether to indent the stuff after a leading class initializer colon" +Description="Whether to indent the stuff after a leading class initializer colon." Enabled=false EditorType=boolean TrueFalse=indent_constr_colon=true|indent_constr_colon=false @@ -2009,7 +2027,7 @@ ValueDefault=0 [Indent Ctor Init Leading] Category=2 -Description="Virtual indent from the ':' for member initializers. Default=2" +Description="Virtual indent from the ':' for member initializers. Default=2." Enabled=false EditorType=numeric CallName="indent_ctor_init_leading=" @@ -2019,7 +2037,7 @@ ValueDefault=2 [Indent Ctor Init] Category=2 -Description="Additional indent for constructor initializer list.
    Negative values decrease indent down to the first column. Default=0" +Description="Additional indent for constructor initializer list.
    Negative values decrease indent down to the first column. Default=0." Enabled=false EditorType=numeric CallName="indent_ctor_init=" @@ -2029,7 +2047,7 @@ ValueDefault=0 [Indent Else If] Category=2 -Description="False=treat 'else\nif' as 'else if' for indenting purposes
    True=indent the 'if' one level" +Description="False=treat 'else\nif' as 'else if' for indenting purposes
    True=indent the 'if' one level." Enabled=false EditorType=boolean TrueFalse=indent_else_if=true|indent_else_if=false @@ -2037,7 +2055,7 @@ ValueDefault=0 [Indent Var Def Blk] Category=2 -Description="Amount to indent variable declarations after a open brace. neg=relative, pos=absolute" +Description="Amount to indent variable declarations after a open brace. neg=relative, pos=absolute." Enabled=false EditorType=numeric CallName="indent_var_def_blk=" @@ -2063,7 +2081,7 @@ ValueDefault=0 [Indent Func Def Force Col1] Category=2 -Description="True: force indentation of function definition to start in column 1
    False: use the default behavior" +Description="True: force indentation of function definition to start in column 1
    False: use the default behavior." Enabled=false EditorType=boolean TrueFalse=indent_func_def_force_col1=true|indent_func_def_force_col1=false @@ -2071,7 +2089,7 @@ ValueDefault=0 [Indent Func Call Param] Category=2 -Description="True: indent continued function call parameters one indent level
    False: align parameters under the open paren" +Description="True: indent continued function call parameters one indent level
    False: align parameters under the open paren." Enabled=false EditorType=boolean TrueFalse=indent_func_call_param=true|indent_func_call_param=false @@ -2079,7 +2097,7 @@ ValueDefault=0 [Indent Func Def Param] Category=2 -Description="Same as indent_func_call_param, but for function defs" +Description="Same as indent_func_call_param, but for function defs." Enabled=false EditorType=boolean TrueFalse=indent_func_def_param=true|indent_func_def_param=false @@ -2087,7 +2105,7 @@ ValueDefault=0 [Indent Func Proto Param] Category=2 -Description="Same as indent_func_call_param, but for function protos" +Description="Same as indent_func_call_param, but for function protos." Enabled=false EditorType=boolean TrueFalse=indent_func_proto_param=true|indent_func_proto_param=false @@ -2095,7 +2113,7 @@ ValueDefault=0 [Indent Func Class Param] Category=2 -Description="Same as indent_func_call_param, but for class declarations" +Description="Same as indent_func_call_param, but for class declarations." Enabled=false EditorType=boolean TrueFalse=indent_func_class_param=true|indent_func_class_param=false @@ -2103,7 +2121,7 @@ ValueDefault=0 [Indent Func Ctor Var Param] Category=2 -Description="Same as indent_func_call_param, but for class variable constructors" +Description="Same as indent_func_call_param, but for class variable constructors." Enabled=false EditorType=boolean TrueFalse=indent_func_ctor_var_param=true|indent_func_ctor_var_param=false @@ -2111,7 +2129,7 @@ ValueDefault=0 [Indent Template Param] Category=2 -Description="Same as indent_func_call_param, but for templates" +Description="Same as indent_func_call_param, but for templates." Enabled=false EditorType=boolean TrueFalse=indent_template_param=true|indent_template_param=false @@ -2119,7 +2137,7 @@ ValueDefault=0 [Indent Func Param Double] Category=2 -Description="Double the indent for indent_func_xxx_param options.
    Use both values of the options indent_columns and indent_param" +Description="Double the indent for indent_func_xxx_param options.
    Use both values of the options indent_columns and indent_param." Enabled=false EditorType=boolean TrueFalse=indent_func_param_double=true|indent_func_param_double=false @@ -2127,7 +2145,7 @@ ValueDefault=0 [Indent Func Const] Category=2 -Description="Indentation column for standalone 'const' function decl/proto qualifier" +Description="Indentation column for standalone 'const' function decl/proto qualifier." Enabled=false EditorType=numeric CallName="indent_func_const=" @@ -2137,7 +2155,7 @@ ValueDefault=0 [Indent Func Throw] Category=2 -Description="Indentation column for standalone 'throw' function decl/proto qualifier" +Description="Indentation column for standalone 'throw' function decl/proto qualifier." Enabled=false EditorType=numeric CallName="indent_func_throw=" @@ -2157,7 +2175,7 @@ ValueDefault=0 [Indent Sing Line Comments] Category=2 -Description="Spaces to indent single line ('//') comments on lines before code" +Description="Spaces to indent single line ('//') comments on lines before code." Enabled=false EditorType=numeric CallName="indent_sing_line_comments=" @@ -2167,7 +2185,7 @@ ValueDefault=0 [Indent Relative Single Line Comments] Category=2 -Description="If set, will indent trailing single line ('//') comments relative
    to the code instead of trying to keep the same absolute column" +Description="If set, will indent trailing single line ('//') comments relative
    to the code instead of trying to keep the same absolute column." Enabled=false EditorType=boolean TrueFalse=indent_relative_single_line_comments=true|indent_relative_single_line_comments=false @@ -2185,7 +2203,7 @@ ValueDefault=0 [Indent Switch Pp] Category=2 -Description="Whether to indent preproccesor statements inside of switch statements" +Description="Whether to indent preproccesor statements inside of switch statements." Enabled=false EditorType=boolean TrueFalse=indent_switch_pp=true|indent_switch_pp=false @@ -2213,7 +2231,7 @@ ValueDefault=0 [Indent Col1 Comment] Category=2 -Description="Whether to indent comments found in first column" +Description="Whether to indent comments found in first column." Enabled=false EditorType=boolean TrueFalse=indent_col1_comment=true|indent_col1_comment=false @@ -2241,7 +2259,7 @@ ValueDefault=1 [Indent Access Spec Body] Category=2 -Description="Indent the code after an access specifier by one level.
    If set, this option forces 'indent_access_spec=0'" +Description="Indent the code after an access specifier by one level.
    If set, this option forces 'indent_access_spec=0'." Enabled=false EditorType=boolean TrueFalse=indent_access_spec_body=true|indent_access_spec_body=false @@ -2249,7 +2267,7 @@ ValueDefault=0 [Indent Paren Nl] Category=2 -Description="If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended)" +Description="If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended)." Enabled=false EditorType=boolean TrueFalse=indent_paren_nl=true|indent_paren_nl=false @@ -2265,9 +2283,33 @@ MinVal=0 MaxVal=2 ValueDefault=0 +[Indent Paren After Func Def] +Category=2 +Description="Controls the indent of the open paren of a function definition, if on it's own line.If True, indents the open paren" +Enabled=false +EditorType=boolean +TrueFalse=indent_paren_after_func_def=true|indent_paren_after_func_def=false +ValueDefault=0 + +[Indent Paren After Func Decl] +Category=2 +Description="Controls the indent of the open paren of a function declaration, if on it's own line.If True, indents the open paren" +Enabled=false +EditorType=boolean +TrueFalse=indent_paren_after_func_decl=true|indent_paren_after_func_decl=false +ValueDefault=0 + +[Indent Paren After Func Call] +Category=2 +Description="Controls the indent of the open paren of a function call, if on it's own line.If True, indents the open paren" +Enabled=false +EditorType=boolean +TrueFalse=indent_paren_after_func_call=true|indent_paren_after_func_call=false +ValueDefault=0 + [Indent Comma Paren] Category=2 -Description="Controls the indent of a comma when inside a paren.If True, aligns under the open paren" +Description="Controls the indent of a comma when inside a paren.If True, aligns under the open paren." Enabled=false EditorType=boolean TrueFalse=indent_comma_paren=true|indent_comma_paren=false @@ -2275,7 +2317,7 @@ ValueDefault=0 [Indent Bool Paren] Category=2 -Description="Controls the indent of a BOOL operator when inside a paren.If True, aligns under the open paren" +Description="Controls the indent of a BOOL operator when inside a paren.If True, aligns under the open paren." Enabled=false EditorType=boolean TrueFalse=indent_bool_paren=true|indent_bool_paren=false @@ -2283,7 +2325,7 @@ ValueDefault=0 [Indent First Bool Expr] Category=2 -Description="If 'indent_bool_paren' is True, controls the indent of the first expression. If True, aligns the first expression to the following ones" +Description="If 'indent_bool_paren' is True, controls the indent of the first expression. If True, aligns the first expression to the following ones." Enabled=false EditorType=boolean TrueFalse=indent_first_bool_expr=true|indent_first_bool_expr=false @@ -2291,7 +2333,7 @@ ValueDefault=0 [Indent Square Nl] Category=2 -Description="If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended)" +Description="If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended)." Enabled=false EditorType=boolean TrueFalse=indent_square_nl=true|indent_square_nl=false @@ -2299,7 +2341,7 @@ ValueDefault=0 [Indent Preserve Sql] Category=2 -Description="Don't change the relative indent of ESQL/C 'EXEC SQL' bodies" +Description="Don't change the relative indent of ESQL/C 'EXEC SQL' bodies." Enabled=false EditorType=boolean TrueFalse=indent_preserve_sql=true|indent_preserve_sql=false @@ -2343,7 +2385,7 @@ ValueDefault=0 [Indent Oc Msg Prioritize First Colon] Category=2 -Description="If True, prioritize aligning with initial colon (and stripping spaces from lines, if necessary).
    Default=True" +Description="If True, prioritize aligning with initial colon (and stripping spaces from lines, if necessary).
    Default=True." Enabled=false EditorType=boolean TrueFalse=indent_oc_msg_prioritize_first_colon=true|indent_oc_msg_prioritize_first_colon=false @@ -2409,7 +2451,7 @@ ValueDefault=0 [Indent Token After Brace] Category=2 -Description="If True, a brace followed by another token (not a newline) will indent all contained lines to match the token.Default=True" +Description="If True, a brace followed by another token (not a newline) will indent all contained lines to match the token.Default=True." Enabled=false EditorType=boolean TrueFalse=indent_token_after_brace=true|indent_token_after_brace=false @@ -2417,7 +2459,7 @@ ValueDefault=1 [Indent Cpp Lambda Body] Category=2 -Description="If True, cpp lambda body will be indentedDefault=False" +Description="If True, cpp lambda body will be indentedDefault=False." Enabled=false EditorType=boolean TrueFalse=indent_cpp_lambda_body=true|indent_cpp_lambda_body=false @@ -2425,7 +2467,7 @@ ValueDefault=0 [Indent Using Block] Category=2 -Description="indent (or not) an using block if no braces are used. Only for C#.Default=True" +Description="indent (or not) an using block if no braces are used. Only for C#.Default=True." Enabled=false EditorType=boolean TrueFalse=indent_using_block=true|indent_using_block=false @@ -2441,9 +2483,17 @@ MinVal=0 MaxVal=2 ValueDefault=0 +[Indent Ignore Asm Block] +Category=2 +Description="If true, ignore indent and align for asm blocks as they have their own indentation." +Enabled=false +EditorType=boolean +TrueFalse=indent_ignore_asm_block=true|indent_ignore_asm_block=false +ValueDefault=0 + [Nl Collapse Empty Body] Category=3 -Description="Whether to collapse empty blocks between '{' and '}'" +Description="Whether to collapse empty blocks between '{' and '}'." Enabled=false EditorType=boolean TrueFalse=nl_collapse_empty_body=true|nl_collapse_empty_body=false @@ -2451,7 +2501,7 @@ ValueDefault=0 [Nl Assign Leave One Liners] Category=3 -Description="Don't split one-line braced assignments - 'foo_t f = { 1, 2 };'" +Description="Don't split one-line braced assignments - 'foo_t f = { 1, 2 };'." Enabled=false EditorType=boolean TrueFalse=nl_assign_leave_one_liners=true|nl_assign_leave_one_liners=false @@ -2459,7 +2509,7 @@ ValueDefault=0 [Nl Class Leave One Liners] Category=3 -Description="Don't split one-line braced statements inside a class xx { } body" +Description="Don't split one-line braced statements inside a class xx { } body." Enabled=false EditorType=boolean TrueFalse=nl_class_leave_one_liners=true|nl_class_leave_one_liners=false @@ -2475,7 +2525,7 @@ ValueDefault=0 [Nl Getset Leave One Liners] Category=3 -Description="Don't split one-line get or set functions" +Description="Don't split one-line get or set functions." Enabled=false EditorType=boolean TrueFalse=nl_getset_leave_one_liners=true|nl_getset_leave_one_liners=false @@ -2483,7 +2533,7 @@ ValueDefault=0 [Nl Func Leave One Liners] Category=3 -Description="Don't split one-line function definitions - 'int foo() { return 0; }'" +Description="Don't split one-line function definitions - 'int foo() { return 0; }'." Enabled=false EditorType=boolean TrueFalse=nl_func_leave_one_liners=true|nl_func_leave_one_liners=false @@ -2491,7 +2541,7 @@ ValueDefault=0 [Nl Cpp Lambda Leave One Liners] Category=3 -Description="Don't split one-line C++11 lambdas - '[]() { return 0; }'" +Description="Don't split one-line C++11 lambdas - '[]() { return 0; }'." Enabled=false EditorType=boolean TrueFalse=nl_cpp_lambda_leave_one_liners=true|nl_cpp_lambda_leave_one_liners=false @@ -2499,7 +2549,7 @@ ValueDefault=0 [Nl If Leave One Liners] Category=3 -Description="Don't split one-line if/else statements - 'if(a) b++;'" +Description="Don't split one-line if/else statements - 'if(a) b++;'." Enabled=false EditorType=boolean TrueFalse=nl_if_leave_one_liners=true|nl_if_leave_one_liners=false @@ -2507,7 +2557,7 @@ ValueDefault=0 [Nl While Leave One Liners] Category=3 -Description="Don't split one-line while statements - 'while(a) b++;'" +Description="Don't split one-line while statements - 'while(a) b++;'." Enabled=false EditorType=boolean TrueFalse=nl_while_leave_one_liners=true|nl_while_leave_one_liners=false @@ -2515,7 +2565,7 @@ ValueDefault=0 [Nl Oc Msg Leave One Liner] Category=3 -Description="Don't split one-line OC messages" +Description="Don't split one-line OC messages." Enabled=false EditorType=boolean TrueFalse=nl_oc_msg_leave_one_liner=true|nl_oc_msg_leave_one_liner=false @@ -2523,7 +2573,7 @@ ValueDefault=0 [Nl Oc Block Brace] Category=3 -Description="Add or remove newline between Objective-C block signature and '{'" +Description="Add or remove newline between Objective-C block signature and '{'." Enabled=false EditorType=multiple Choices="nl_oc_block_brace=ignore|nl_oc_block_brace=add|nl_oc_block_brace=remove|nl_oc_block_brace=force" @@ -2532,7 +2582,7 @@ ValueDefault=0 [Nl Start Of File] Category=3 -Description="Add or remove newlines at the start of the file" +Description="Add or remove newlines at the start of the file." Enabled=false EditorType=multiple Choices="nl_start_of_file=ignore|nl_start_of_file=add|nl_start_of_file=remove|nl_start_of_file=force" @@ -2541,7 +2591,7 @@ ValueDefault=0 [Nl Start Of File Min] Category=3 -Description="The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force'" +Description="The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force'." Enabled=false EditorType=numeric CallName="nl_start_of_file_min=" @@ -2551,7 +2601,7 @@ ValueDefault=0 [Nl End Of File] Category=3 -Description="Add or remove newline at the end of the file" +Description="Add or remove newline at the end of the file." Enabled=false EditorType=multiple Choices="nl_end_of_file=ignore|nl_end_of_file=add|nl_end_of_file=remove|nl_end_of_file=force" @@ -2560,7 +2610,7 @@ ValueDefault=0 [Nl End Of File Min] Category=3 -Description="The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force')" +Description="The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force')." Enabled=false EditorType=numeric CallName="nl_end_of_file_min=" @@ -2570,7 +2620,7 @@ ValueDefault=0 [Nl Assign Brace] Category=3 -Description="Add or remove newline between '=' and '{'" +Description="Add or remove newline between '=' and '{'." Enabled=false EditorType=multiple Choices="nl_assign_brace=ignore|nl_assign_brace=add|nl_assign_brace=remove|nl_assign_brace=force" @@ -2579,7 +2629,7 @@ ValueDefault=0 [Nl Assign Square] Category=3 -Description="Add or remove newline between '=' and '[' (D only)" +Description="Add or remove newline between '=' and '[' (D only)." Enabled=false EditorType=multiple Choices="nl_assign_square=ignore|nl_assign_square=add|nl_assign_square=remove|nl_assign_square=force" @@ -2588,7 +2638,7 @@ ValueDefault=0 [Nl After Square Assign] Category=3 -Description="Add or remove newline after '= [' (D only). Will also affect the newline before the ']'" +Description="Add or remove newline after '= [' (D only). Will also affect the newline before the ']'." Enabled=false EditorType=multiple Choices="nl_after_square_assign=ignore|nl_after_square_assign=add|nl_after_square_assign=remove|nl_after_square_assign=force" @@ -2597,7 +2647,7 @@ ValueDefault=0 [Nl Func Var Def Blk] Category=3 -Description="The number of blank lines after a block of variable definitions at the top of a function body
    0 = No change (default)" +Description="The number of blank lines after a block of variable definitions at the top of a function body
    0 = No change (default)." Enabled=false EditorType=numeric CallName="nl_func_var_def_blk=" @@ -2607,7 +2657,7 @@ ValueDefault=0 [Nl Typedef Blk Start] Category=3 -Description="The number of newlines before a block of typedefs
    0 = No change (default)
    the option 'nl_after_access_spec' takes preference over 'nl_typedef_blk_start'" +Description="The number of newlines before a block of typedefs
    0 = No change (default)
    is overridden by the option 'nl_after_access_spec'." Enabled=false EditorType=numeric CallName="nl_typedef_blk_start=" @@ -2617,7 +2667,7 @@ ValueDefault=0 [Nl Typedef Blk End] Category=3 -Description="The number of newlines after a block of typedefs
    0 = No change (default)" +Description="The number of newlines after a block of typedefs
    0 = No change (default)." Enabled=false EditorType=numeric CallName="nl_typedef_blk_end=" @@ -2627,7 +2677,7 @@ ValueDefault=0 [Nl Typedef Blk In] Category=3 -Description="The maximum consecutive newlines within a block of typedefs
    0 = No change (default)" +Description="The maximum consecutive newlines within a block of typedefs
    0 = No change (default)." Enabled=false EditorType=numeric CallName="nl_typedef_blk_in=" @@ -2637,7 +2687,7 @@ ValueDefault=0 [Nl Var Def Blk Start] Category=3 -Description="The number of newlines before a block of variable definitions not at the top of a function body
    0 = No change (default)
    the option 'nl_after_access_spec' takes preference over 'nl_var_def_blk_start'" +Description="The number of newlines before a block of variable definitions not at the top of a function body
    0 = No change (default)
    is overridden by the option 'nl_after_access_spec'." Enabled=false EditorType=numeric CallName="nl_var_def_blk_start=" @@ -2647,7 +2697,7 @@ ValueDefault=0 [Nl Var Def Blk End] Category=3 -Description="The number of newlines after a block of variable definitions not at the top of a function body
    0 = No change (default)" +Description="The number of newlines after a block of variable definitions not at the top of a function body
    0 = No change (default)." Enabled=false EditorType=numeric CallName="nl_var_def_blk_end=" @@ -2657,7 +2707,7 @@ ValueDefault=0 [Nl Var Def Blk In] Category=3 -Description="The maximum consecutive newlines within a block of variable definitions
    0 = No change (default)" +Description="The maximum consecutive newlines within a block of variable definitions
    0 = No change (default)." Enabled=false EditorType=numeric CallName="nl_var_def_blk_in=" @@ -2667,7 +2717,7 @@ ValueDefault=0 [Nl Fcall Brace] Category=3 -Description="Add or remove newline between a function call's ')' and '{', as in:
    list_for_each(item, &list) { }" +Description="Add or remove newline between a function call's ')' and '{', as in:
    list_for_each(item, &list) { }." Enabled=false EditorType=multiple Choices="nl_fcall_brace=ignore|nl_fcall_brace=add|nl_fcall_brace=remove|nl_fcall_brace=force" @@ -2676,7 +2726,7 @@ ValueDefault=0 [Nl Enum Brace] Category=3 -Description="Add or remove newline between 'enum' and '{'" +Description="Add or remove newline between 'enum' and '{'." Enabled=false EditorType=multiple Choices="nl_enum_brace=ignore|nl_enum_brace=add|nl_enum_brace=remove|nl_enum_brace=force" @@ -2685,7 +2735,7 @@ ValueDefault=0 [Nl Enum Class] Category=3 -Description="Add or remove newline between 'enum' and 'class'" +Description="Add or remove newline between 'enum' and 'class'." Enabled=false EditorType=multiple Choices="nl_enum_class=ignore|nl_enum_class=add|nl_enum_class=remove|nl_enum_class=force" @@ -2694,7 +2744,7 @@ ValueDefault=0 [Nl Enum Class Identifier] Category=3 -Description="Add or remove newline between 'enum class' and the identifier" +Description="Add or remove newline between 'enum class' and the identifier." Enabled=false EditorType=multiple Choices="nl_enum_class_identifier=ignore|nl_enum_class_identifier=add|nl_enum_class_identifier=remove|nl_enum_class_identifier=force" @@ -2703,7 +2753,7 @@ ValueDefault=0 [Nl Enum Identifier Colon] Category=3 -Description="Add or remove newline between 'enum class' type and ':'" +Description="Add or remove newline between 'enum class' type and ':'." Enabled=false EditorType=multiple Choices="nl_enum_identifier_colon=ignore|nl_enum_identifier_colon=add|nl_enum_identifier_colon=remove|nl_enum_identifier_colon=force" @@ -2712,7 +2762,7 @@ ValueDefault=0 [Nl Enum Colon Type] Category=3 -Description="Add or remove newline between 'enum class identifier :' and 'type' and/or 'type'" +Description="Add or remove newline between 'enum class identifier :' and 'type' and/or 'type'." Enabled=false EditorType=multiple Choices="nl_enum_colon_type=ignore|nl_enum_colon_type=add|nl_enum_colon_type=remove|nl_enum_colon_type=force" @@ -2721,7 +2771,7 @@ ValueDefault=0 [Nl Struct Brace] Category=3 -Description="Add or remove newline between 'struct and '{'" +Description="Add or remove newline between 'struct and '{'." Enabled=false EditorType=multiple Choices="nl_struct_brace=ignore|nl_struct_brace=add|nl_struct_brace=remove|nl_struct_brace=force" @@ -2730,7 +2780,7 @@ ValueDefault=0 [Nl Union Brace] Category=3 -Description="Add or remove newline between 'union' and '{'" +Description="Add or remove newline between 'union' and '{'." Enabled=false EditorType=multiple Choices="nl_union_brace=ignore|nl_union_brace=add|nl_union_brace=remove|nl_union_brace=force" @@ -2739,7 +2789,7 @@ ValueDefault=0 [Nl If Brace] Category=3 -Description="Add or remove newline between 'if' and '{'" +Description="Add or remove newline between 'if' and '{'." Enabled=false EditorType=multiple Choices="nl_if_brace=ignore|nl_if_brace=add|nl_if_brace=remove|nl_if_brace=force" @@ -2748,7 +2798,7 @@ ValueDefault=0 [Nl Brace Else] Category=3 -Description="Add or remove newline between '}' and 'else'" +Description="Add or remove newline between '}' and 'else'." Enabled=false EditorType=multiple Choices="nl_brace_else=ignore|nl_brace_else=add|nl_brace_else=remove|nl_brace_else=force" @@ -2757,7 +2807,7 @@ ValueDefault=0 [Nl Elseif Brace] Category=3 -Description="Add or remove newline between 'else if' and '{'
    If set to ignore, nl_if_brace is used instead" +Description="Add or remove newline between 'else if' and '{'
    If set to ignore, nl_if_brace is used instead." Enabled=false EditorType=multiple Choices="nl_elseif_brace=ignore|nl_elseif_brace=add|nl_elseif_brace=remove|nl_elseif_brace=force" @@ -2766,7 +2816,7 @@ ValueDefault=0 [Nl Else Brace] Category=3 -Description="Add or remove newline between 'else' and '{'" +Description="Add or remove newline between 'else' and '{'." Enabled=false EditorType=multiple Choices="nl_else_brace=ignore|nl_else_brace=add|nl_else_brace=remove|nl_else_brace=force" @@ -2775,7 +2825,7 @@ ValueDefault=0 [Nl Else If] Category=3 -Description="Add or remove newline between 'else' and 'if'" +Description="Add or remove newline between 'else' and 'if'." Enabled=false EditorType=multiple Choices="nl_else_if=ignore|nl_else_if=add|nl_else_if=remove|nl_else_if=force" @@ -2784,7 +2834,7 @@ ValueDefault=0 [Nl Before If Closing Paren] Category=3 -Description="Add or remove newline before 'if'/'else if' closing parenthesis" +Description="Add or remove newline before 'if'/'else if' closing parenthesis." Enabled=false EditorType=multiple Choices="nl_before_if_closing_paren=ignore|nl_before_if_closing_paren=add|nl_before_if_closing_paren=remove|nl_before_if_closing_paren=force" @@ -2793,7 +2843,7 @@ ValueDefault=0 [Nl Brace Finally] Category=3 -Description="Add or remove newline between '}' and 'finally'" +Description="Add or remove newline between '}' and 'finally'." Enabled=false EditorType=multiple Choices="nl_brace_finally=ignore|nl_brace_finally=add|nl_brace_finally=remove|nl_brace_finally=force" @@ -2802,7 +2852,7 @@ ValueDefault=0 [Nl Finally Brace] Category=3 -Description="Add or remove newline between 'finally' and '{'" +Description="Add or remove newline between 'finally' and '{'." Enabled=false EditorType=multiple Choices="nl_finally_brace=ignore|nl_finally_brace=add|nl_finally_brace=remove|nl_finally_brace=force" @@ -2811,7 +2861,7 @@ ValueDefault=0 [Nl Try Brace] Category=3 -Description="Add or remove newline between 'try' and '{'" +Description="Add or remove newline between 'try' and '{'." Enabled=false EditorType=multiple Choices="nl_try_brace=ignore|nl_try_brace=add|nl_try_brace=remove|nl_try_brace=force" @@ -2820,7 +2870,7 @@ ValueDefault=0 [Nl Getset Brace] Category=3 -Description="Add or remove newline between get/set and '{'" +Description="Add or remove newline between get/set and '{'." Enabled=false EditorType=multiple Choices="nl_getset_brace=ignore|nl_getset_brace=add|nl_getset_brace=remove|nl_getset_brace=force" @@ -2829,7 +2879,7 @@ ValueDefault=0 [Nl For Brace] Category=3 -Description="Add or remove newline between 'for' and '{'" +Description="Add or remove newline between 'for' and '{'." Enabled=false EditorType=multiple Choices="nl_for_brace=ignore|nl_for_brace=add|nl_for_brace=remove|nl_for_brace=force" @@ -2838,7 +2888,7 @@ ValueDefault=0 [Nl Catch Brace] Category=3 -Description="Add or remove newline between 'catch' and '{'" +Description="Add or remove newline between 'catch' and '{'." Enabled=false EditorType=multiple Choices="nl_catch_brace=ignore|nl_catch_brace=add|nl_catch_brace=remove|nl_catch_brace=force" @@ -2847,7 +2897,7 @@ ValueDefault=0 [Nl Brace Catch] Category=3 -Description="Add or remove newline between '}' and 'catch'" +Description="Add or remove newline between '}' and 'catch'." Enabled=false EditorType=multiple Choices="nl_brace_catch=ignore|nl_brace_catch=add|nl_brace_catch=remove|nl_brace_catch=force" @@ -2856,7 +2906,7 @@ ValueDefault=0 [Nl Brace Square] Category=3 -Description="Add or remove newline between '}' and ']'" +Description="Add or remove newline between '}' and ']'." Enabled=false EditorType=multiple Choices="nl_brace_square=ignore|nl_brace_square=add|nl_brace_square=remove|nl_brace_square=force" @@ -2865,7 +2915,7 @@ ValueDefault=0 [Nl Brace Fparen] Category=3 -Description="Add or remove newline between '}' and ')' in a function invocation" +Description="Add or remove newline between '}' and ')' in a function invocation." Enabled=false EditorType=multiple Choices="nl_brace_fparen=ignore|nl_brace_fparen=add|nl_brace_fparen=remove|nl_brace_fparen=force" @@ -2874,7 +2924,7 @@ ValueDefault=0 [Nl While Brace] Category=3 -Description="Add or remove newline between 'while' and '{'" +Description="Add or remove newline between 'while' and '{'." Enabled=false EditorType=multiple Choices="nl_while_brace=ignore|nl_while_brace=add|nl_while_brace=remove|nl_while_brace=force" @@ -2883,7 +2933,7 @@ ValueDefault=0 [Nl Scope Brace] Category=3 -Description="Add or remove newline between 'scope (x)' and '{' (D)" +Description="Add or remove newline between 'scope (x)' and '{' (D)." Enabled=false EditorType=multiple Choices="nl_scope_brace=ignore|nl_scope_brace=add|nl_scope_brace=remove|nl_scope_brace=force" @@ -2892,7 +2942,7 @@ ValueDefault=0 [Nl Unittest Brace] Category=3 -Description="Add or remove newline between 'unittest' and '{' (D)" +Description="Add or remove newline between 'unittest' and '{' (D)." Enabled=false EditorType=multiple Choices="nl_unittest_brace=ignore|nl_unittest_brace=add|nl_unittest_brace=remove|nl_unittest_brace=force" @@ -2901,7 +2951,7 @@ ValueDefault=0 [Nl Version Brace] Category=3 -Description="Add or remove newline between 'version (x)' and '{' (D)" +Description="Add or remove newline between 'version (x)' and '{' (D)." Enabled=false EditorType=multiple Choices="nl_version_brace=ignore|nl_version_brace=add|nl_version_brace=remove|nl_version_brace=force" @@ -2910,7 +2960,7 @@ ValueDefault=0 [Nl Using Brace] Category=3 -Description="Add or remove newline between 'using' and '{'" +Description="Add or remove newline between 'using' and '{'." Enabled=false EditorType=multiple Choices="nl_using_brace=ignore|nl_using_brace=add|nl_using_brace=remove|nl_using_brace=force" @@ -2928,7 +2978,7 @@ ValueDefault=0 [Nl Do Brace] Category=3 -Description="Add or remove newline between 'do' and '{'" +Description="Add or remove newline between 'do' and '{'." Enabled=false EditorType=multiple Choices="nl_do_brace=ignore|nl_do_brace=add|nl_do_brace=remove|nl_do_brace=force" @@ -2937,7 +2987,7 @@ ValueDefault=0 [Nl Brace While] Category=3 -Description="Add or remove newline between '}' and 'while' of 'do' statement" +Description="Add or remove newline between '}' and 'while' of 'do' statement." Enabled=false EditorType=multiple Choices="nl_brace_while=ignore|nl_brace_while=add|nl_brace_while=remove|nl_brace_while=force" @@ -2946,7 +2996,7 @@ ValueDefault=0 [Nl Switch Brace] Category=3 -Description="Add or remove newline between 'switch' and '{'" +Description="Add or remove newline between 'switch' and '{'." Enabled=false EditorType=multiple Choices="nl_switch_brace=ignore|nl_switch_brace=add|nl_switch_brace=remove|nl_switch_brace=force" @@ -2955,7 +3005,7 @@ ValueDefault=0 [Nl Synchronized Brace] Category=3 -Description="Add or remove newline between 'synchronized' and '{'" +Description="Add or remove newline between 'synchronized' and '{'." Enabled=false EditorType=multiple Choices="nl_synchronized_brace=ignore|nl_synchronized_brace=add|nl_synchronized_brace=remove|nl_synchronized_brace=force" @@ -2980,7 +3030,7 @@ ValueDefault=0 [Nl Before Case] Category=3 -Description="Whether to put a newline before 'case' statement, not after the first 'case'" +Description="Whether to put a newline before 'case' statement, not after the first 'case'." Enabled=false EditorType=boolean TrueFalse=nl_before_case=true|nl_before_case=false @@ -2988,7 +3038,7 @@ ValueDefault=0 [Nl Before Throw] Category=3 -Description="Add or remove newline between ')' and 'throw'" +Description="Add or remove newline between ')' and 'throw'." Enabled=false EditorType=multiple Choices="nl_before_throw=ignore|nl_before_throw=add|nl_before_throw=remove|nl_before_throw=force" @@ -2997,7 +3047,7 @@ ValueDefault=0 [Nl After Case] Category=3 -Description="Whether to put a newline after 'case' statement" +Description="Whether to put a newline after 'case' statement." Enabled=false EditorType=boolean TrueFalse=nl_after_case=true|nl_after_case=false @@ -3014,7 +3064,7 @@ ValueDefault=0 [Nl Namespace Brace] Category=3 -Description="Newline between namespace and {" +Description="Newline between namespace and {." Enabled=false EditorType=multiple Choices="nl_namespace_brace=ignore|nl_namespace_brace=add|nl_namespace_brace=remove|nl_namespace_brace=force" @@ -3032,7 +3082,7 @@ ValueDefault=0 [Nl Class Brace] Category=3 -Description="Add or remove newline between 'class' and '{'" +Description="Add or remove newline between 'class' and '{'." Enabled=false EditorType=multiple Choices="nl_class_brace=ignore|nl_class_brace=add|nl_class_brace=remove|nl_class_brace=force" @@ -3059,7 +3109,7 @@ ValueDefault=0 [Nl Enum Own Lines] Category=3 -Description="Add or remove newline before first element, after comma, and after last element in enum" +Description="Add or remove newline before first element, after comma, and after last element in enum." Enabled=false EditorType=multiple Choices="nl_enum_own_lines=ignore|nl_enum_own_lines=add|nl_enum_own_lines=remove|nl_enum_own_lines=force" @@ -3068,7 +3118,7 @@ ValueDefault=0 [Nl Func Type Name] Category=3 -Description="Add or remove newline between return type and function name in a function definition" +Description="Add or remove newline between return type and function name in a function definition." Enabled=false EditorType=multiple Choices="nl_func_type_name=ignore|nl_func_type_name=add|nl_func_type_name=remove|nl_func_type_name=force" @@ -3086,7 +3136,7 @@ ValueDefault=0 [Nl Func Class Scope] Category=3 -Description="Add or remove newline between class specification and '::' in 'void A::f() { }'
    Only appears in separate member implementation (does not appear with in-line implmementation)" +Description="Add or remove newline between class specification and '::' in 'void A::f() { }'
    Only appears in separate member implementation (does not appear with in-line implmementation)." Enabled=false EditorType=multiple Choices="nl_func_class_scope=ignore|nl_func_class_scope=add|nl_func_class_scope=remove|nl_func_class_scope=force" @@ -3095,7 +3145,7 @@ ValueDefault=0 [Nl Func Scope Name] Category=3 -Description="Add or remove newline between function scope and name
    Controls the newline after '::' in 'void A::f() { }'" +Description="Add or remove newline between function scope and name
    Controls the newline after '::' in 'void A::f() { }'." Enabled=false EditorType=multiple Choices="nl_func_scope_name=ignore|nl_func_scope_name=add|nl_func_scope_name=remove|nl_func_scope_name=force" @@ -3104,7 +3154,7 @@ ValueDefault=0 [Nl Func Proto Type Name] Category=3 -Description="Add or remove newline between return type and function name in a prototype" +Description="Add or remove newline between return type and function name in a prototype." Enabled=false EditorType=multiple Choices="nl_func_proto_type_name=ignore|nl_func_proto_type_name=add|nl_func_proto_type_name=remove|nl_func_proto_type_name=force" @@ -3113,7 +3163,7 @@ ValueDefault=0 [Nl Func Paren] Category=3 -Description="Add or remove newline between a function name and the opening '(' in the declaration" +Description="Add or remove newline between a function name and the opening '(' in the declaration." Enabled=false EditorType=multiple Choices="nl_func_paren=ignore|nl_func_paren=add|nl_func_paren=remove|nl_func_paren=force" @@ -3122,7 +3172,7 @@ ValueDefault=0 [Nl Func Paren Empty] Category=3 -Description="Overrides nl_func_paren for functions with no parameters" +Description="Overrides nl_func_paren for functions with no parameters." Enabled=false EditorType=multiple Choices="nl_func_paren_empty=ignore|nl_func_paren_empty=add|nl_func_paren_empty=remove|nl_func_paren_empty=force" @@ -3131,7 +3181,7 @@ ValueDefault=0 [Nl Func Def Paren] Category=3 -Description="Add or remove newline between a function name and the opening '(' in the definition" +Description="Add or remove newline between a function name and the opening '(' in the definition." Enabled=false EditorType=multiple Choices="nl_func_def_paren=ignore|nl_func_def_paren=add|nl_func_def_paren=remove|nl_func_def_paren=force" @@ -3140,16 +3190,34 @@ ValueDefault=0 [Nl Func Def Paren Empty] Category=3 -Description="Overrides nl_func_def_paren for functions with no parameters" +Description="Overrides nl_func_def_paren for functions with no parameters." Enabled=false EditorType=multiple Choices="nl_func_def_paren_empty=ignore|nl_func_def_paren_empty=add|nl_func_def_paren_empty=remove|nl_func_def_paren_empty=force" ChoicesReadable="Ignore Nl Func Def Paren Empty|Add Nl Func Def Paren Empty|Remove Nl Func Def Paren Empty|Force Nl Func Def Paren Empty" ValueDefault=0 +[Nl Func Call Paren] +Category=3 +Description="Add or remove newline between a function name and the opening '(' in the call" +Enabled=false +EditorType=multiple +Choices="nl_func_call_paren=ignore|nl_func_call_paren=add|nl_func_call_paren=remove|nl_func_call_paren=force" +ChoicesReadable="Ignore Nl Func Call Paren|Add Nl Func Call Paren|Remove Nl Func Call Paren|Force Nl Func Call Paren" +ValueDefault=0 + +[Nl Func Call Paren Empty] +Category=3 +Description="Overrides nl_func_call_paren for functions with no parameters." +Enabled=false +EditorType=multiple +Choices="nl_func_call_paren_empty=ignore|nl_func_call_paren_empty=add|nl_func_call_paren_empty=remove|nl_func_call_paren_empty=force" +ChoicesReadable="Ignore Nl Func Call Paren Empty|Add Nl Func Call Paren Empty|Remove Nl Func Call Paren Empty|Force Nl Func Call Paren Empty" +ValueDefault=0 + [Nl Func Decl Start] Category=3 -Description="Add or remove newline after '(' in a function declaration" +Description="Add or remove newline after '(' in a function declaration." Enabled=false EditorType=multiple Choices="nl_func_decl_start=ignore|nl_func_decl_start=add|nl_func_decl_start=remove|nl_func_decl_start=force" @@ -3158,7 +3226,7 @@ ValueDefault=0 [Nl Func Def Start] Category=3 -Description="Add or remove newline after '(' in a function definition" +Description="Add or remove newline after '(' in a function definition." Enabled=false EditorType=multiple Choices="nl_func_def_start=ignore|nl_func_def_start=add|nl_func_def_start=remove|nl_func_def_start=force" @@ -3201,7 +3269,7 @@ ValueDefault=0 [Nl Func Decl Args] Category=3 -Description="Add or remove newline after each ',' in a function declaration" +Description="Add or remove newline after each ',' in a function declaration." Enabled=false EditorType=multiple Choices="nl_func_decl_args=ignore|nl_func_decl_args=add|nl_func_decl_args=remove|nl_func_decl_args=force" @@ -3210,7 +3278,7 @@ ValueDefault=0 [Nl Func Def Args] Category=3 -Description="Add or remove newline after each ',' in a function definition" +Description="Add or remove newline after each ',' in a function definition." Enabled=false EditorType=multiple Choices="nl_func_def_args=ignore|nl_func_def_args=add|nl_func_def_args=remove|nl_func_def_args=force" @@ -3235,7 +3303,7 @@ ValueDefault=0 [Nl Func Decl End] Category=3 -Description="Add or remove newline before the ')' in a function declaration" +Description="Add or remove newline before the ')' in a function declaration." Enabled=false EditorType=multiple Choices="nl_func_decl_end=ignore|nl_func_decl_end=add|nl_func_decl_end=remove|nl_func_decl_end=force" @@ -3244,7 +3312,7 @@ ValueDefault=0 [Nl Func Def End] Category=3 -Description="Add or remove newline before the ')' in a function definition" +Description="Add or remove newline before the ')' in a function definition." Enabled=false EditorType=multiple Choices="nl_func_def_end=ignore|nl_func_def_end=add|nl_func_def_end=remove|nl_func_def_end=force" @@ -3303,6 +3371,15 @@ Choices="nl_func_def_empty=ignore|nl_func_def_empty=add|nl_func_def_empty=remove ChoicesReadable="Ignore Nl Func Def Empty|Add Nl Func Def Empty|Remove Nl Func Def Empty|Force Nl Func Def Empty" ValueDefault=0 +[Nl Func Call Empty] +Category=3 +Description="Add or remove newline between '()' in a function call." +Enabled=false +EditorType=multiple +Choices="nl_func_call_empty=ignore|nl_func_call_empty=add|nl_func_call_empty=remove|nl_func_call_empty=force" +ChoicesReadable="Ignore Nl Func Call Empty|Add Nl Func Call Empty|Remove Nl Func Call Empty|Force Nl Func Call Empty" +ValueDefault=0 + [Nl Func Call Start Multi Line] Category=3 Description="Whether to add newline after '(' in a function call if '(' and ')' are in different lines." @@ -3329,7 +3406,7 @@ ValueDefault=0 [Nl Oc Msg Args] Category=3 -Description="Whether to put each OC message parameter on a separate line
    See nl_oc_msg_leave_one_liner" +Description="Whether to put each OC message parameter on a separate line
    See nl_oc_msg_leave_one_liner." Enabled=false EditorType=boolean TrueFalse=nl_oc_msg_args=true|nl_oc_msg_args=false @@ -3337,7 +3414,7 @@ ValueDefault=0 [Nl Fdef Brace] Category=3 -Description="Add or remove newline between function signature and '{'" +Description="Add or remove newline between function signature and '{'." Enabled=false EditorType=multiple Choices="nl_fdef_brace=ignore|nl_fdef_brace=add|nl_fdef_brace=remove|nl_fdef_brace=force" @@ -3346,7 +3423,7 @@ ValueDefault=0 [Nl Cpp Ldef Brace] Category=3 -Description="Add or remove newline between C++11 lambda signature and '{'" +Description="Add or remove newline between C++11 lambda signature and '{'." Enabled=false EditorType=multiple Choices="nl_cpp_ldef_brace=ignore|nl_cpp_ldef_brace=add|nl_cpp_ldef_brace=remove|nl_cpp_ldef_brace=force" @@ -3364,7 +3441,7 @@ ValueDefault=0 [Nl After Semicolon] Category=3 -Description="Whether to put a newline after semicolons, except in 'for' statements" +Description="Whether to put a newline after semicolons, except in 'for' statements." Enabled=false EditorType=boolean TrueFalse=nl_after_semicolon=true|nl_after_semicolon=false @@ -3381,7 +3458,7 @@ ValueDefault=0 [Nl Type Brace Init Lst] Category=3 -Description="Whether to put a newline after the type in an unnamed temporary direct-list-initialization" +Description="Whether to put a newline after the type in an unnamed temporary direct-list-initialization." Enabled=false EditorType=multiple Choices="nl_type_brace_init_lst=ignore|nl_type_brace_init_lst=add|nl_type_brace_init_lst=remove|nl_type_brace_init_lst=force" @@ -3390,7 +3467,7 @@ ValueDefault=0 [Nl Type Brace Init Lst Open] Category=3 -Description="Whether to put a newline after open brace in an unnamed temporary direct-list-initialization" +Description="Whether to put a newline after open brace in an unnamed temporary direct-list-initialization." Enabled=false EditorType=multiple Choices="nl_type_brace_init_lst_open=ignore|nl_type_brace_init_lst_open=add|nl_type_brace_init_lst_open=remove|nl_type_brace_init_lst_open=force" @@ -3399,7 +3476,7 @@ ValueDefault=0 [Nl Type Brace Init Lst Close] Category=3 -Description="Whether to put a newline before close brace in an unnamed temporary direct-list-initialization" +Description="Whether to put a newline before close brace in an unnamed temporary direct-list-initialization." Enabled=false EditorType=multiple Choices="nl_type_brace_init_lst_close=ignore|nl_type_brace_init_lst_close=add|nl_type_brace_init_lst_close=remove|nl_type_brace_init_lst_close=force" @@ -3448,7 +3525,7 @@ ValueDefault=0 [Nl After Vbrace Close] Category=3 -Description="Whether to put a newline after a virtual brace close.
    Would add a newline before return in: 'if (foo) a++; return;'" +Description="Whether to put a newline after a virtual brace close.
    Would add a newline before return in: 'if (foo) a++; return;'." Enabled=false EditorType=boolean TrueFalse=nl_after_vbrace_close=true|nl_after_vbrace_close=false @@ -3456,7 +3533,7 @@ ValueDefault=0 [Nl Brace Struct Var] Category=3 -Description="Control the newline between the close brace and 'b' in: 'struct { int a; } b;'
    Affects enums, unions and structures. If set to ignore, uses nl_after_brace_close" +Description="Control the newline between the close brace and 'b' in: 'struct { int a; } b;'
    Affects enums, unions and structures. If set to ignore, uses nl_after_brace_close." Enabled=false EditorType=multiple Choices="nl_brace_struct_var=ignore|nl_brace_struct_var=add|nl_brace_struct_var=remove|nl_brace_struct_var=force" @@ -3465,7 +3542,7 @@ ValueDefault=0 [Nl Define Macro] Category=3 -Description="Whether to alter newlines in '#define' macros" +Description="Whether to alter newlines in '#define' macros." Enabled=false EditorType=boolean TrueFalse=nl_define_macro=true|nl_define_macro=false @@ -3489,7 +3566,7 @@ ValueDefault=0 [Nl Before If] Category=3 -Description="Add or remove blank line before 'if'" +Description="Add or remove blank line before 'if'." Enabled=false EditorType=multiple Choices="nl_before_if=ignore|nl_before_if=add|nl_before_if=remove|nl_before_if=force" @@ -3498,7 +3575,7 @@ ValueDefault=0 [Nl After If] Category=3 -Description="Add or remove blank line after 'if' statement.
    Add/Force work only if the next token is not a closing brace" +Description="Add or remove blank line after 'if' statement.
    Add/Force work only if the next token is not a closing brace." Enabled=false EditorType=multiple Choices="nl_after_if=ignore|nl_after_if=add|nl_after_if=remove|nl_after_if=force" @@ -3507,7 +3584,7 @@ ValueDefault=0 [Nl Before For] Category=3 -Description="Add or remove blank line before 'for'" +Description="Add or remove blank line before 'for'." Enabled=false EditorType=multiple Choices="nl_before_for=ignore|nl_before_for=add|nl_before_for=remove|nl_before_for=force" @@ -3516,7 +3593,7 @@ ValueDefault=0 [Nl After For] Category=3 -Description="Add or remove blank line after 'for' statement" +Description="Add or remove blank line after 'for' statement." Enabled=false EditorType=multiple Choices="nl_after_for=ignore|nl_after_for=add|nl_after_for=remove|nl_after_for=force" @@ -3525,7 +3602,7 @@ ValueDefault=0 [Nl Before While] Category=3 -Description="Add or remove blank line before 'while'" +Description="Add or remove blank line before 'while'." Enabled=false EditorType=multiple Choices="nl_before_while=ignore|nl_before_while=add|nl_before_while=remove|nl_before_while=force" @@ -3534,7 +3611,7 @@ ValueDefault=0 [Nl After While] Category=3 -Description="Add or remove blank line after 'while' statement" +Description="Add or remove blank line after 'while' statement." Enabled=false EditorType=multiple Choices="nl_after_while=ignore|nl_after_while=add|nl_after_while=remove|nl_after_while=force" @@ -3543,7 +3620,7 @@ ValueDefault=0 [Nl Before Switch] Category=3 -Description="Add or remove blank line before 'switch'" +Description="Add or remove blank line before 'switch'." Enabled=false EditorType=multiple Choices="nl_before_switch=ignore|nl_before_switch=add|nl_before_switch=remove|nl_before_switch=force" @@ -3552,7 +3629,7 @@ ValueDefault=0 [Nl After Switch] Category=3 -Description="Add or remove blank line after 'switch' statement" +Description="Add or remove blank line after 'switch' statement." Enabled=false EditorType=multiple Choices="nl_after_switch=ignore|nl_after_switch=add|nl_after_switch=remove|nl_after_switch=force" @@ -3561,7 +3638,7 @@ ValueDefault=0 [Nl Before Synchronized] Category=3 -Description="Add or remove blank line before 'synchronized'" +Description="Add or remove blank line before 'synchronized'." Enabled=false EditorType=multiple Choices="nl_before_synchronized=ignore|nl_before_synchronized=add|nl_before_synchronized=remove|nl_before_synchronized=force" @@ -3570,7 +3647,7 @@ ValueDefault=0 [Nl After Synchronized] Category=3 -Description="Add or remove blank line after 'synchronized' statement" +Description="Add or remove blank line after 'synchronized' statement." Enabled=false EditorType=multiple Choices="nl_after_synchronized=ignore|nl_after_synchronized=add|nl_after_synchronized=remove|nl_after_synchronized=force" @@ -3579,7 +3656,7 @@ ValueDefault=0 [Nl Before Do] Category=3 -Description="Add or remove blank line before 'do'" +Description="Add or remove blank line before 'do'." Enabled=false EditorType=multiple Choices="nl_before_do=ignore|nl_before_do=add|nl_before_do=remove|nl_before_do=force" @@ -3588,7 +3665,7 @@ ValueDefault=0 [Nl After Do] Category=3 -Description="Add or remove blank line after 'do/while' statement" +Description="Add or remove blank line after 'do/while' statement." Enabled=false EditorType=multiple Choices="nl_after_do=ignore|nl_after_do=add|nl_after_do=remove|nl_after_do=force" @@ -3597,7 +3674,7 @@ ValueDefault=0 [Nl Ds Struct Enum Cmt] Category=3 -Description="Whether to double-space commented-entries in struct/union/enum" +Description="Whether to double-space commented-entries in struct/union/enum." Enabled=false EditorType=boolean TrueFalse=nl_ds_struct_enum_cmt=true|nl_ds_struct_enum_cmt=false @@ -3605,7 +3682,7 @@ ValueDefault=0 [Nl Ds Struct Enum Close Brace] Category=3 -Description="force nl before } of a struct/union/enum
    (lower priority than 'eat_blanks_before_close_brace')" +Description="force nl before } of a struct/union/enum
    (lower priority than 'eat_blanks_before_close_brace')." Enabled=false EditorType=boolean TrueFalse=nl_ds_struct_enum_close_brace=true|nl_ds_struct_enum_close_brace=false @@ -3613,7 +3690,7 @@ ValueDefault=0 [Nl Before Func Class Def] Category=3 -Description="Add or remove blank line before 'func_class_def'" +Description="Add or remove blank line before 'func_class_def'." Enabled=false EditorType=numeric CallName="nl_before_func_class_def=" @@ -3623,7 +3700,7 @@ ValueDefault=0 [Nl Before Func Class Proto] Category=3 -Description="Add or remove blank line before 'func_class_proto'" +Description="Add or remove blank line before 'func_class_proto'." Enabled=false EditorType=numeric CallName="nl_before_func_class_proto=" @@ -3651,7 +3728,7 @@ ValueDefault=0 [Nl Create If One Liner] Category=3 -Description="Change simple unbraced if statements into a one-liner
    'if(b)\n i++;' => 'if(b) i++;'" +Description="Change simple unbraced if statements into a one-liner
    'if(b)\n i++;' => 'if(b) i++;'." Enabled=false EditorType=boolean TrueFalse=nl_create_if_one_liner=true|nl_create_if_one_liner=false @@ -3659,7 +3736,7 @@ ValueDefault=0 [Nl Create For One Liner] Category=3 -Description="Change simple unbraced for statements into a one-liner
    'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);'" +Description="Change simple unbraced for statements into a one-liner
    'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);'." Enabled=false EditorType=boolean TrueFalse=nl_create_for_one_liner=true|nl_create_for_one_liner=false @@ -3667,7 +3744,7 @@ ValueDefault=0 [Nl Create While One Liner] Category=3 -Description="Change simple unbraced while statements into a one-liner
    'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);'" +Description="Change simple unbraced while statements into a one-liner
    'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);'." Enabled=false EditorType=boolean TrueFalse=nl_create_while_one_liner=true|nl_create_while_one_liner=false @@ -3675,7 +3752,7 @@ ValueDefault=0 [Nl Split If One Liner] Category=3 -Description=" Change a one-liner if statement into simple unbraced if
    'if(b) i++;' => 'if(b)\n i++;'" +Description=" Change a one-liner if statement into simple unbraced if
    'if(b) i++;' => 'if(b)\n i++;'." Enabled=false EditorType=boolean TrueFalse=nl_split_if_one_liner=true|nl_split_if_one_liner=false @@ -3683,7 +3760,7 @@ ValueDefault=0 [Nl Split For One Liner] Category=3 -Description="Change a one-liner for statement into simple unbraced for
    'for (i=0;<5;i++) foo(i);' => 'for (i=0;<5;i++)\n foo(i);'" +Description="Change a one-liner for statement into simple unbraced for
    'for (i=0;<5;i++) foo(i);' => 'for (i=0;<5;i++)\n foo(i);'." Enabled=false EditorType=boolean TrueFalse=nl_split_for_one_liner=true|nl_split_for_one_liner=false @@ -3691,7 +3768,7 @@ ValueDefault=0 [Nl Split While One Liner] Category=3 -Description="Change a one-liner while statement into simple unbraced while
    'while (i<5) foo(i++);' => 'while (i<5)\n foo(i++);'" +Description="Change a one-liner while statement into simple unbraced while
    'while (i<5) foo(i++);' => 'while (i<5)\n foo(i++);'." Enabled=false EditorType=boolean TrueFalse=nl_split_while_one_liner=true|nl_split_while_one_liner=false @@ -3699,7 +3776,7 @@ ValueDefault=0 [Nl Max] Category=4 -Description="The maximum consecutive newlines (3 = 2 blank lines)" +Description="The maximum consecutive newlines (3 = 2 blank lines)." Enabled=false EditorType=numeric CallName="nl_max=" @@ -3709,7 +3786,7 @@ ValueDefault=0 [Nl Max Blank In Func] Category=4 -Description="The maximum consecutive newlines in function" +Description="The maximum consecutive newlines in function." Enabled=false EditorType=numeric CallName="nl_max_blank_in_func=" @@ -3719,7 +3796,7 @@ ValueDefault=0 [Nl After Func Proto] Category=4 -Description="The number of newlines after a function prototype, if followed by another function prototype" +Description="The number of newlines after a function prototype, if followed by another function prototype." Enabled=false EditorType=numeric CallName="nl_after_func_proto=" @@ -3729,7 +3806,7 @@ ValueDefault=0 [Nl After Func Proto Group] Category=4 -Description="The number of newlines after a function prototype, if not followed by another function prototype" +Description="The number of newlines after a function prototype, if not followed by another function prototype." Enabled=false EditorType=numeric CallName="nl_after_func_proto_group=" @@ -3739,7 +3816,7 @@ ValueDefault=0 [Nl After Func Class Proto] Category=4 -Description="The number of newlines after a function class prototype, if followed by another function class prototype" +Description="The number of newlines after a function class prototype, if followed by another function class prototype." Enabled=false EditorType=numeric CallName="nl_after_func_class_proto=" @@ -3749,7 +3826,7 @@ ValueDefault=0 [Nl After Func Class Proto Group] Category=4 -Description="The number of newlines after a function class prototype, if not followed by another function class prototype" +Description="The number of newlines after a function class prototype, if not followed by another function class prototype." Enabled=false EditorType=numeric CallName="nl_after_func_class_proto_group=" @@ -3759,7 +3836,7 @@ ValueDefault=0 [Nl Before Func Body Def] Category=4 -Description="The number of newlines before a multi-line function def body" +Description="The number of newlines before a multi-line function def body." Enabled=false EditorType=numeric CallName="nl_before_func_body_def=" @@ -3769,7 +3846,7 @@ ValueDefault=0 [Nl Before Func Body Proto] Category=4 -Description="The number of newlines before a multi-line function prototype body" +Description="The number of newlines before a multi-line function prototype body." Enabled=false EditorType=numeric CallName="nl_before_func_body_proto=" @@ -3779,7 +3856,7 @@ ValueDefault=0 [Nl After Func Body] Category=4 -Description="The number of newlines after '}' of a multi-line function body" +Description="The number of newlines after '}' of a multi-line function body." Enabled=false EditorType=numeric CallName="nl_after_func_body=" @@ -3789,7 +3866,7 @@ ValueDefault=0 [Nl After Func Body Class] Category=4 -Description="The number of newlines after '}' of a multi-line function body in a class declaration" +Description="The number of newlines after '}' of a multi-line function body in a class declaration." Enabled=false EditorType=numeric CallName="nl_after_func_body_class=" @@ -3799,7 +3876,7 @@ ValueDefault=0 [Nl After Func Body One Liner] Category=4 -Description="The number of newlines after '}' of a single line function body" +Description="The number of newlines after '}' of a single line function body." Enabled=false EditorType=numeric CallName="nl_after_func_body_one_liner=" @@ -3855,7 +3932,7 @@ ValueDefault=0 [Nl After Struct] Category=4 -Description="The number of newlines after '}' or ';' of a struct/enum/union definition" +Description="The number of newlines after '}' or ';' of a struct/enum/union definition." Enabled=false EditorType=numeric CallName="nl_after_struct=" @@ -3865,7 +3942,7 @@ ValueDefault=0 [Nl Before Class] Category=4 -Description="The number of newlines before a class definition" +Description="The number of newlines before a class definition." Enabled=false EditorType=numeric CallName="nl_before_class=" @@ -3875,7 +3952,7 @@ ValueDefault=0 [Nl After Class] Category=4 -Description="The number of newlines after '}' or ';' of a class definition" +Description="The number of newlines after '}' or ';' of a class definition." Enabled=false EditorType=numeric CallName="nl_after_class=" @@ -3895,7 +3972,7 @@ ValueDefault=0 [Nl After Access Spec] Category=4 -Description="The number of newlines after a 'private:', 'public:', 'protected:', 'signals:' or 'slots:' label.
    0 = No change.
    the option 'nl_after_access_spec' takes preference over 'nl_typedef_blk_start' and 'nl_var_def_blk_start'" +Description="The number of newlines after a 'private:', 'public:', 'protected:', 'signals:' or 'slots:' label.
    0 = No change.
    Overrides 'nl_typedef_blk_start' and 'nl_var_def_blk_start'." Enabled=false EditorType=numeric CallName="nl_after_access_spec=" @@ -3945,7 +4022,7 @@ ValueDefault=0 [Nl Property Brace] Category=4 -Description="Add or remove newline between C# property and the '{'" +Description="Add or remove newline between C# property and the '{'." Enabled=false EditorType=multiple Choices="nl_property_brace=ignore|nl_property_brace=add|nl_property_brace=remove|nl_property_brace=force" @@ -3954,7 +4031,7 @@ ValueDefault=0 [Eat Blanks After Open Brace] Category=4 -Description="Whether to remove blank lines after '{'" +Description="Whether to remove blank lines after '{'." Enabled=false EditorType=boolean TrueFalse=eat_blanks_after_open_brace=true|eat_blanks_after_open_brace=false @@ -3962,7 +4039,7 @@ ValueDefault=0 [Eat Blanks Before Close Brace] Category=4 -Description="Whether to remove blank lines before '}'" +Description="Whether to remove blank lines before '}'." Enabled=false EditorType=boolean TrueFalse=eat_blanks_before_close_brace=true|eat_blanks_before_close_brace=false @@ -4014,7 +4091,7 @@ ValueDefault=0 [Pos Arith] Category=5 -Description="The position of arithmetic operators in wrapped expressions" +Description="The position of arithmetic operators in wrapped expressions." Enabled=false EditorType=multiple Choices="pos_arith=ignore|pos_arith=lead|pos_arith=lead_break|pos_arith=lead_force|pos_arith=trail|pos_arith=trail_break|pos_arith=trail_force" @@ -4023,7 +4100,7 @@ ValueDefault=0 [Pos Assign] Category=5 -Description="The position of assignment in wrapped expressions.
    Do not affect '=' followed by '{'" +Description="The position of assignment in wrapped expressions.
    Do not affect '=' followed by '{'." Enabled=false EditorType=multiple Choices="pos_assign=ignore|pos_assign=lead|pos_assign=lead_break|pos_assign=lead_force|pos_assign=trail|pos_assign=trail_break|pos_assign=trail_force" @@ -4032,7 +4109,7 @@ ValueDefault=0 [Pos Bool] Category=5 -Description="The position of boolean operators in wrapped expressions" +Description="The position of boolean operators in wrapped expressions." Enabled=false EditorType=multiple Choices="pos_bool=ignore|pos_bool=lead|pos_bool=lead_break|pos_bool=lead_force|pos_bool=trail|pos_bool=trail_break|pos_bool=trail_force" @@ -4041,7 +4118,7 @@ ValueDefault=0 [Pos Compare] Category=5 -Description="The position of comparison operators in wrapped expressions" +Description="The position of comparison operators in wrapped expressions." Enabled=false EditorType=multiple Choices="pos_compare=ignore|pos_compare=lead|pos_compare=lead_break|pos_compare=lead_force|pos_compare=trail|pos_compare=trail_break|pos_compare=trail_force" @@ -4050,7 +4127,7 @@ ValueDefault=0 [Pos Conditional] Category=5 -Description="The position of conditional (b ? t : f) operators in wrapped expressions" +Description="The position of conditional (b ? t : f) operators in wrapped expressions." Enabled=false EditorType=multiple Choices="pos_conditional=ignore|pos_conditional=lead|pos_conditional=lead_break|pos_conditional=lead_force|pos_conditional=trail|pos_conditional=trail_break|pos_conditional=trail_force" @@ -4059,7 +4136,7 @@ ValueDefault=0 [Pos Comma] Category=5 -Description="The position of the comma in wrapped expressions" +Description="The position of the comma in wrapped expressions." Enabled=false EditorType=multiple Choices="pos_comma=ignore|pos_comma=lead|pos_comma=lead_break|pos_comma=lead_force|pos_comma=trail|pos_comma=trail_break|pos_comma=trail_force" @@ -4068,7 +4145,7 @@ ValueDefault=0 [Pos Enum Comma] Category=5 -Description="The position of the comma in enum entries" +Description="The position of the comma in enum entries." Enabled=false EditorType=multiple Choices="pos_enum_comma=ignore|pos_enum_comma=lead|pos_enum_comma=lead_break|pos_enum_comma=lead_force|pos_enum_comma=trail|pos_enum_comma=trail_break|pos_enum_comma=trail_force" @@ -4123,7 +4200,7 @@ ValueDefault=0 [Ls For Split Full] Category=6 -Description="Whether to fully split long 'for' statements at semi-colons" +Description="Whether to fully split long 'for' statements at semi-colons." Enabled=false EditorType=boolean TrueFalse=ls_for_split_full=true|ls_for_split_full=false @@ -4131,7 +4208,7 @@ ValueDefault=0 [Ls Func Split Full] Category=6 -Description="Whether to fully split long function protos/calls at commas" +Description="Whether to fully split long function protos/calls at commas." Enabled=false EditorType=boolean TrueFalse=ls_func_split_full=true|ls_func_split_full=false @@ -4139,7 +4216,7 @@ ValueDefault=0 [Ls Code Width] Category=6 -Description="Whether to split lines as close to code_width as possible and ignore some groupings" +Description="Whether to split lines as close to code_width as possible and ignore some groupings." Enabled=false EditorType=boolean TrueFalse=ls_code_width=true|ls_code_width=false @@ -4147,7 +4224,7 @@ ValueDefault=0 [Align Keep Tabs] Category=7 -Description="Whether to keep non-indenting tabs" +Description="Whether to keep non-indenting tabs." Enabled=false EditorType=boolean TrueFalse=align_keep_tabs=true|align_keep_tabs=false @@ -4155,7 +4232,7 @@ ValueDefault=0 [Align With Tabs] Category=7 -Description="Whether to use tabs for aligning" +Description="Whether to use tabs for aligning." Enabled=false EditorType=boolean TrueFalse=align_with_tabs=true|align_with_tabs=false @@ -4163,18 +4240,18 @@ ValueDefault=0 [Align On Tabstop] Category=7 -Description="Whether to bump out to the next tab when aligning" +Description="Whether to bump out to the next tab when aligning." Enabled=false EditorType=boolean TrueFalse=align_on_tabstop=true|align_on_tabstop=false ValueDefault=0 -[Align Number Left] +[Align Number Right] Category=7 -Description="Whether to left-align numbers" +Description="Whether to right-align numbers." Enabled=false EditorType=boolean -TrueFalse=align_number_left=true|align_number_left=false +TrueFalse=align_number_right=true|align_number_right=false ValueDefault=0 [Align Keep Extra Space] @@ -4187,12 +4264,42 @@ ValueDefault=0 [Align Func Params] Category=7 -Description="Align variable definitions in prototypes and functions" +Description="Align variable definitions in prototypes and functions." Enabled=false EditorType=boolean TrueFalse=align_func_params=true|align_func_params=false ValueDefault=0 +[Align Func Params Span] +Category=7 +Description="The span for aligning parameter definitions in function on parameter name (0=don't align)." +Enabled=false +EditorType=numeric +CallName="align_func_params_span=" +MinVal=0 +MaxVal=16 +ValueDefault=0 + +[Align Func Params Thresh] +Category=7 +Description="The threshold for aligning function parameter definitions (0=no limit)." +Enabled=false +EditorType=numeric +CallName="align_func_params_thresh=" +MinVal=0 +MaxVal=5000 +ValueDefault=0 + +[Align Func Params Gap] +Category=7 +Description="The gap for aligning function parameter definitions." +Enabled=false +EditorType=numeric +CallName="align_func_params_gap=" +MinVal=0 +MaxVal=16 +ValueDefault=0 + [Align Same Func Call Params] Category=7 Description="Align parameters in single-line functions that have the same name.
    The function names must already be aligned with each other." @@ -4243,7 +4350,7 @@ ValueDefault=0 [Align Var Def Gap] Category=7 -Description="The gap for aligning variable definitions" +Description="The gap for aligning variable definitions." Enabled=false EditorType=numeric CallName="align_var_def_gap=" @@ -4253,7 +4360,7 @@ ValueDefault=0 [Align Var Def Colon] Category=7 -Description="Whether to align the colon in struct bit fields" +Description="Whether to align the colon in struct bit fields." Enabled=false EditorType=boolean TrueFalse=align_var_def_colon=true|align_var_def_colon=false @@ -4261,7 +4368,7 @@ ValueDefault=0 [Align Var Def Colon Gap] Category=7 -Description="align variable defs gap for bit colons" +Description="align variable defs gap for bit colons." Enabled=false EditorType=numeric CallName="align_var_def_colon_gap=" @@ -4271,7 +4378,7 @@ ValueDefault=0 [Align Var Def Attribute] Category=7 -Description="Whether to align any attribute after the variable name" +Description="Whether to align any attribute after the variable name." Enabled=false EditorType=boolean TrueFalse=align_var_def_attribute=true|align_var_def_attribute=false @@ -4279,7 +4386,7 @@ ValueDefault=0 [Align Var Def Inline] Category=7 -Description="Whether to align inline struct/enum/union variable definitions" +Description="Whether to align inline struct/enum/union variable definitions." Enabled=false EditorType=boolean TrueFalse=align_var_def_inline=true|align_var_def_inline=false @@ -4337,7 +4444,7 @@ ValueDefault=0 [Align Var Class Thresh] Category=7 -Description="The threshold for aligning class member definitions (0=no limit)" +Description="The threshold for aligning class member definitions (0=no limit)." Enabled=false EditorType=numeric CallName="align_var_class_thresh=" @@ -4347,7 +4454,7 @@ ValueDefault=0 [Align Var Class Gap] Category=7 -Description="The gap for aligning class member definitions" +Description="The gap for aligning class member definitions." Enabled=false EditorType=numeric CallName="align_var_class_gap=" @@ -4377,7 +4484,7 @@ ValueDefault=0 [Align Var Struct Gap] Category=7 -Description="The gap for aligning struct/union member definitions" +Description="The gap for aligning struct/union member definitions." Enabled=false EditorType=numeric CallName="align_var_struct_gap=" @@ -4397,7 +4504,7 @@ ValueDefault=0 [Align Typedef Gap] Category=7 -Description="The minimum space between the type and the synonym of a typedef" +Description="The minimum space between the type and the synonym of a typedef." Enabled=false EditorType=numeric CallName="align_typedef_gap=" @@ -4407,7 +4514,7 @@ ValueDefault=0 [Align Typedef Span] Category=7 -Description="The span for aligning single-line typedefs (0=don't align)" +Description="The span for aligning single-line typedefs (0=don't align)." Enabled=false EditorType=numeric CallName="align_typedef_span=" @@ -4457,7 +4564,7 @@ ValueDefault=0 [Align Right Cmt Mix] Category=7 -Description="If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment" +Description="If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment." Enabled=false EditorType=boolean TrueFalse=align_right_cmt_mix=true|align_right_cmt_mix=false @@ -4485,7 +4592,7 @@ ValueDefault=0 [Align Func Proto Span] Category=7 -Description="The span for aligning function prototypes (0=don't align)" +Description="The span for aligning function prototypes (0=don't align)." Enabled=false EditorType=numeric CallName="align_func_proto_span=" @@ -4505,7 +4612,7 @@ ValueDefault=0 [Align On Operator] Category=7 -Description="Align function protos on the 'operator' keyword instead of what follows" +Description="Align function protos on the 'operator' keyword instead of what follows." Enabled=false EditorType=boolean TrueFalse=align_on_operator=true|align_on_operator=false @@ -4521,7 +4628,7 @@ ValueDefault=0 [Align Single Line Func] Category=7 -Description="Align single-line functions with function prototypes, uses align_func_proto_span" +Description="Align single-line functions with function prototypes, uses align_func_proto_span." Enabled=false EditorType=boolean TrueFalse=align_single_line_func=true|align_single_line_func=false @@ -4529,7 +4636,7 @@ ValueDefault=0 [Align Single Line Brace] Category=7 -Description="Aligning the open brace of single-line functions.
    Requires align_single_line_func=True, uses align_func_proto_span" +Description="Aligning the open brace of single-line functions.
    Requires align_single_line_func=True, uses align_func_proto_span." Enabled=false EditorType=boolean TrueFalse=align_single_line_brace=true|align_single_line_brace=false @@ -4565,7 +4672,7 @@ ValueDefault=0 [Align Pp Define Together] Category=7 -Description="# Align macro functions and variables together" +Description="# Align macro functions and variables together." Enabled=false EditorType=boolean TrueFalse=align_pp_define_together=true|align_pp_define_together=false @@ -4573,7 +4680,7 @@ ValueDefault=0 [Align Pp Define Gap] Category=7 -Description="The minimum space between label and value of a preprocessor define" +Description="The minimum space between label and value of a preprocessor define." Enabled=false EditorType=numeric CallName="align_pp_define_gap=" @@ -4593,7 +4700,7 @@ ValueDefault=0 [Align Left Shift] Category=7 -Description="Align lines that start with '<<' with previous '<<'. Default=True" +Description="Align lines that start with '<<' with previous '<<'. Default=True." Enabled=false EditorType=boolean TrueFalse=align_left_shift=true|align_left_shift=false @@ -4627,7 +4734,7 @@ ValueDefault=0 [Align Oc Decl Colon] Category=7 -Description="Aligning parameters in an Obj-C '+' or '-' declaration on the ':'" +Description="Aligning parameters in an Obj-C '+' or '-' declaration on the ':'." Enabled=false EditorType=boolean TrueFalse=align_oc_decl_colon=true|align_oc_decl_colon=false @@ -4663,7 +4770,7 @@ ValueDefault=0 [Cmt Indent Multi] Category=8 -Description="If False, disable all multi-line comment changes, including cmt_width. keyword substitution and leading chars.
    Default=True" +Description="If False, disable all multi-line comment changes, including cmt_width. keyword substitution and leading chars.
    Default=True." Enabled=false EditorType=boolean TrueFalse=cmt_indent_multi=true|cmt_indent_multi=false @@ -4671,7 +4778,7 @@ ValueDefault=1 [Cmt C Group] Category=8 -Description="Whether to group c-comments that look like they are in a block" +Description="Whether to group c-comments that look like they are in a block." Enabled=false EditorType=boolean TrueFalse=cmt_c_group=true|cmt_c_group=false @@ -4679,7 +4786,7 @@ ValueDefault=0 [Cmt C Nl Start] Category=8 -Description="Whether to put an empty '/*' on the first line of the combined c-comment" +Description="Whether to put an empty '/*' on the first line of the combined c-comment." Enabled=false EditorType=boolean TrueFalse=cmt_c_nl_start=true|cmt_c_nl_start=false @@ -4687,7 +4794,7 @@ ValueDefault=0 [Cmt C Nl End] Category=8 -Description="Whether to put a newline before the closing '*/' of the combined c-comment" +Description="Whether to put a newline before the closing '*/' of the combined c-comment." Enabled=false EditorType=boolean TrueFalse=cmt_c_nl_end=true|cmt_c_nl_end=false @@ -4695,7 +4802,7 @@ ValueDefault=0 [Cmt Cpp Group] Category=8 -Description="Whether to group cpp-comments that look like they are in a block" +Description="Whether to group cpp-comments that look like they are in a block." Enabled=false EditorType=boolean TrueFalse=cmt_cpp_group=true|cmt_cpp_group=false @@ -4703,7 +4810,7 @@ ValueDefault=0 [Cmt Cpp Nl Start] Category=8 -Description="Whether to put an empty '/*' on the first line of the combined cpp-comment" +Description="Whether to put an empty '/*' on the first line of the combined cpp-comment." Enabled=false EditorType=boolean TrueFalse=cmt_cpp_nl_start=true|cmt_cpp_nl_start=false @@ -4711,7 +4818,7 @@ ValueDefault=0 [Cmt Cpp Nl End] Category=8 -Description="Whether to put a newline before the closing '*/' of the combined cpp-comment" +Description="Whether to put a newline before the closing '*/' of the combined cpp-comment." Enabled=false EditorType=boolean TrueFalse=cmt_cpp_nl_end=true|cmt_cpp_nl_end=false @@ -4719,7 +4826,7 @@ ValueDefault=0 [Cmt Cpp To C] Category=8 -Description="Whether to change cpp-comments into c-comments" +Description="Whether to change cpp-comments into c-comments." Enabled=false EditorType=boolean TrueFalse=cmt_cpp_to_c=true|cmt_cpp_to_c=false @@ -4727,7 +4834,7 @@ ValueDefault=0 [Cmt Star Cont] Category=8 -Description="Whether to put a star on subsequent comment lines" +Description="Whether to put a star on subsequent comment lines." Enabled=false EditorType=boolean TrueFalse=cmt_star_cont=true|cmt_star_cont=false @@ -4735,7 +4842,7 @@ ValueDefault=0 [Cmt Sp Before Star Cont] Category=8 -Description="The number of spaces to insert at the start of subsequent comment lines" +Description="The number of spaces to insert at the start of subsequent comment lines." Enabled=false EditorType=numeric CallName="cmt_sp_before_star_cont=" @@ -4745,7 +4852,7 @@ ValueDefault=0 [Cmt Sp After Star Cont] Category=8 -Description="The number of spaces to insert after the star on subsequent comment lines" +Description="The number of spaces to insert after the star on subsequent comment lines." Enabled=false EditorType=numeric CallName="cmt_sp_after_star_cont=" @@ -4755,7 +4862,7 @@ ValueDefault=0 [Cmt Multi Check Last] Category=8 -Description="For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of
    the comment are the same length. Default=True" +Description="For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of
    the comment are the same length. Default=True." Enabled=false EditorType=boolean TrueFalse=cmt_multi_check_last=true|cmt_multi_check_last=false @@ -4789,7 +4896,7 @@ ValueDefault= [Cmt Insert Func Header] Category=8 -Description="The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment.
    Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff.
    Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... }" +Description="The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment.
    Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff.
    Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... }." Enabled=false CallName=cmt_insert_func_header= EditorType=string @@ -4837,7 +4944,7 @@ ValueDefault=0 [Mod Full Brace Do] Category=9 -Description="Add or remove braces on single-line 'do' statement" +Description="Add or remove braces on single-line 'do' statement." Enabled=false EditorType=multiple Choices="mod_full_brace_do=ignore|mod_full_brace_do=add|mod_full_brace_do=remove|mod_full_brace_do=force" @@ -4846,7 +4953,7 @@ ValueDefault=0 [Mod Full Brace For] Category=9 -Description="Add or remove braces on single-line 'for' statement" +Description="Add or remove braces on single-line 'for' statement." Enabled=false EditorType=multiple Choices="mod_full_brace_for=ignore|mod_full_brace_for=add|mod_full_brace_for=remove|mod_full_brace_for=force" @@ -4855,7 +4962,7 @@ ValueDefault=0 [Mod Full Brace Function] Category=9 -Description="Add or remove braces on single-line function definitions. (Pawn)" +Description="Add or remove braces on single-line function definitions. (Pawn)." Enabled=false EditorType=multiple Choices="mod_full_brace_function=ignore|mod_full_brace_function=add|mod_full_brace_function=remove|mod_full_brace_function=force" @@ -4907,7 +5014,7 @@ ValueDefault=0 [Mod Full Brace While] Category=9 -Description="Add or remove braces on single-line 'while' statement" +Description="Add or remove braces on single-line 'while' statement." Enabled=false EditorType=multiple Choices="mod_full_brace_while=ignore|mod_full_brace_while=add|mod_full_brace_while=remove|mod_full_brace_while=force" @@ -4916,7 +5023,7 @@ ValueDefault=0 [Mod Full Brace Using] Category=9 -Description="Add or remove braces on single-line 'using ()' statement" +Description="Add or remove braces on single-line 'using ()' statement." Enabled=false EditorType=multiple Choices="mod_full_brace_using=ignore|mod_full_brace_using=add|mod_full_brace_using=remove|mod_full_brace_using=force" @@ -4925,7 +5032,7 @@ ValueDefault=0 [Mod Paren On Return] Category=9 -Description="Add or remove unnecessary paren on 'return' statement" +Description="Add or remove unnecessary paren on 'return' statement." Enabled=false EditorType=multiple Choices="mod_paren_on_return=ignore|mod_paren_on_return=add|mod_paren_on_return=remove|mod_paren_on_return=force" @@ -4934,7 +5041,7 @@ ValueDefault=0 [Mod Pawn Semicolon] Category=9 -Description="Whether to change optional semicolons to real semicolons" +Description="Whether to change optional semicolons to real semicolons." Enabled=false EditorType=boolean TrueFalse=mod_pawn_semicolon=true|mod_pawn_semicolon=false @@ -4942,7 +5049,7 @@ ValueDefault=0 [Mod Full Paren If Bool] Category=9 -Description="Add parens on 'while' and 'if' statement around bools" +Description="Add parens on 'while' and 'if' statement around bools." Enabled=false EditorType=boolean TrueFalse=mod_full_paren_if_bool=true|mod_full_paren_if_bool=false @@ -4950,7 +5057,7 @@ ValueDefault=0 [Mod Remove Extra Semicolon] Category=9 -Description="Whether to remove superfluous semicolons" +Description="Whether to remove superfluous semicolons." Enabled=false EditorType=boolean TrueFalse=mod_remove_extra_semicolon=true|mod_remove_extra_semicolon=false @@ -5018,7 +5125,7 @@ ValueDefault=0 [Mod Sort Import] Category=9 -Description="If True, will sort consecutive single-line 'import' statements [Java, D]" +Description="If True, will sort consecutive single-line 'import' statements [Java, D]." Enabled=false EditorType=boolean TrueFalse=mod_sort_import=true|mod_sort_import=false @@ -5026,7 +5133,7 @@ ValueDefault=0 [Mod Sort Using] Category=9 -Description="If True, will sort consecutive single-line 'using' statements [C#]" +Description="If True, will sort consecutive single-line 'using' statements [C#]." Enabled=false EditorType=boolean TrueFalse=mod_sort_using=true|mod_sort_using=false @@ -5067,7 +5174,7 @@ ValueDefault=0 [Mod Sort Oc Properties] Category=9 -Description="If True, it will organize the properties (Obj-C)" +Description="If True, it will organize the properties (Obj-C)." Enabled=false EditorType=boolean TrueFalse=mod_sort_oc_properties=true|mod_sort_oc_properties=false @@ -5075,7 +5182,7 @@ ValueDefault=0 [Mod Sort Oc Property Class Weight] Category=9 -Description="Determines weight of class property modifier (Obj-C)" +Description="Determines weight of class property modifier (Obj-C)." Enabled=false EditorType=numeric CallName="mod_sort_oc_property_class_weight=" @@ -5085,7 +5192,7 @@ ValueDefault=0 [Mod Sort Oc Property Thread Safe Weight] Category=9 -Description="Determines weight of atomic, nonatomic (Obj-C)" +Description="Determines weight of atomic, nonatomic (Obj-C)." Enabled=false EditorType=numeric CallName="mod_sort_oc_property_thread_safe_weight=" @@ -5095,7 +5202,7 @@ ValueDefault=0 [Mod Sort Oc Property Readwrite Weight] Category=9 -Description="Determines weight of readwrite (Obj-C)" +Description="Determines weight of readwrite (Obj-C)." Enabled=false EditorType=numeric CallName="mod_sort_oc_property_readwrite_weight=" @@ -5105,7 +5212,7 @@ ValueDefault=0 [Mod Sort Oc Property Reference Weight] Category=9 -Description="Determines weight of reference type (retain, copy, assign, weak, strong) (Obj-C)" +Description="Determines weight of reference type (retain, copy, assign, weak, strong) (Obj-C)." Enabled=false EditorType=numeric CallName="mod_sort_oc_property_reference_weight=" @@ -5115,7 +5222,7 @@ ValueDefault=0 [Mod Sort Oc Property Getter Weight] Category=9 -Description="Determines weight of getter type (getter=) (Obj-C)" +Description="Determines weight of getter type (getter=) (Obj-C)." Enabled=false EditorType=numeric CallName="mod_sort_oc_property_getter_weight=" @@ -5125,7 +5232,7 @@ ValueDefault=0 [Mod Sort Oc Property Setter Weight] Category=9 -Description="Determines weight of setter type (setter=) (Obj-C)" +Description="Determines weight of setter type (setter=) (Obj-C)." Enabled=false EditorType=numeric CallName="mod_sort_oc_property_setter_weight=" @@ -5135,7 +5242,7 @@ ValueDefault=0 [Mod Sort Oc Property Nullability Weight] Category=9 -Description="Determines weight of nullability type (nullable, nonnull, null_unspecified, null_resettable) (Obj-C)" +Description="Determines weight of nullability type (nullable, nonnull, null_unspecified, null_resettable) (Obj-C)." Enabled=false EditorType=numeric CallName="mod_sort_oc_property_nullability_weight=" @@ -5145,7 +5252,7 @@ ValueDefault=0 [Pp Indent] Category=10 -Description="Control indent of preprocessors inside #if blocks at brace level 0 (file-level)" +Description="Control indent of preprocessors inside #if blocks at brace level 0 (file-level)." Enabled=false EditorType=multiple Choices="pp_indent=ignore|pp_indent=add|pp_indent=remove|pp_indent=force" @@ -5154,7 +5261,7 @@ ValueDefault=0 [Pp Indent At Level] Category=10 -Description="Whether to indent #if/#else/#endif at the brace level (True) or from column 1 (False)" +Description="Whether to indent #if/#else/#endif at the brace level (True) or from column 1 (False)." Enabled=false EditorType=boolean TrueFalse=pp_indent_at_level=true|pp_indent_at_level=false @@ -5162,7 +5269,7 @@ ValueDefault=0 [Pp Indent Count] Category=10 -Description="Specifies the number of columns to indent preprocessors per level at brace level 0 (file-level).
    If pp_indent_at_level=False, specifies the number of columns to indent preprocessors per level at brace level > 0 (function-level).
    Default=1" +Description="Specifies the number of columns to indent preprocessors per level at brace level 0 (file-level).
    If pp_indent_at_level=False, specifies the number of columns to indent preprocessors per level at brace level > 0 (function-level).
    Default=1." Enabled=false EditorType=numeric CallName="pp_indent_count=" @@ -5172,7 +5279,7 @@ ValueDefault=1 [Pp Space] Category=10 -Description="Add or remove space after # based on pp_level of #if blocks" +Description="Add or remove space after # based on pp_level of #if blocks." Enabled=false EditorType=multiple Choices="pp_space=ignore|pp_space=add|pp_space=remove|pp_space=force" @@ -5181,7 +5288,7 @@ ValueDefault=0 [Pp Space Count] Category=10 -Description="Sets the number of spaces added with pp_space" +Description="Sets the number of spaces added with pp_space." Enabled=false EditorType=numeric CallName="pp_space_count=" @@ -5191,7 +5298,7 @@ ValueDefault=0 [Pp Indent Region] Category=10 -Description="The indent for #region and #endregion in C# and '#pragma region' in C/C++" +Description="The indent for #region and #endregion in C# and '#pragma region' in C/C++." Enabled=false EditorType=numeric CallName="pp_indent_region=" @@ -5201,7 +5308,7 @@ ValueDefault=0 [Pp Region Indent Code] Category=10 -Description="Whether to indent the code between #region and #endregion" +Description="Whether to indent the code between #region and #endregion." Enabled=false EditorType=boolean TrueFalse=pp_region_indent_code=true|pp_region_indent_code=false @@ -5227,7 +5334,7 @@ ValueDefault=0 [Pp Define At Level] Category=10 -Description="Whether to indent '#define' at the brace level (True) or from column 1 (false)" +Description="Whether to indent '#define' at the brace level (True) or from column 1 (false)." Enabled=false EditorType=boolean TrueFalse=pp_define_at_level=true|pp_define_at_level=false @@ -5243,7 +5350,7 @@ ValueDefault=0 [Pp Indent Case] Category=10 -Description="Whether to indent case statements between #if, #else, and #endif.
    Only applies to the indent of the preprocesser that the case statements directly inside of" +Description="Whether to indent case statements between #if, #else, and #endif.
    Only applies to the indent of the preprocesser that the case statements directly inside of." Enabled=false EditorType=boolean TrueFalse=pp_indent_case=true|pp_indent_case=false @@ -5251,7 +5358,7 @@ ValueDefault=1 [Pp Indent Func Def] Category=10 -Description="Whether to indent whole function definitions between #if, #else, and #endif.
    Only applies to the indent of the preprocesser that the function definition is directly inside of" +Description="Whether to indent whole function definitions between #if, #else, and #endif.
    Only applies to the indent of the preprocesser that the function definition is directly inside of." Enabled=false EditorType=boolean TrueFalse=pp_indent_func_def=true|pp_indent_func_def=false @@ -5259,7 +5366,7 @@ ValueDefault=1 [Pp Indent Extern] Category=10 -Description="Whether to indent extern C blocks between #if, #else, and #endif.
    Only applies to the indent of the preprocesser that the extern block is directly inside of" +Description="Whether to indent extern C blocks between #if, #else, and #endif.
    Only applies to the indent of the preprocesser that the extern block is directly inside of." Enabled=false EditorType=boolean TrueFalse=pp_indent_extern=true|pp_indent_extern=false @@ -5267,7 +5374,7 @@ ValueDefault=1 [Pp Indent Brace] Category=10 -Description="Whether to indent braces directly inside #if, #else, and #endif.
    Only applies to the indent of the preprocesser that the braces are directly inside of" +Description="Whether to indent braces directly inside #if, #else, and #endif.
    Only applies to the indent of the preprocesser that the braces are directly inside of." Enabled=false EditorType=boolean TrueFalse=pp_indent_brace=true|pp_indent_brace=false @@ -5299,7 +5406,7 @@ ValueDefault= [Use Indent Func Call Param] Category=12 -Description="True: indent_func_call_param will be used (default)
    False: indent_func_call_param will NOT be used" +Description="True: indent_func_call_param will be used (default)
    False: indent_func_call_param will NOT be used." Enabled=false EditorType=boolean TrueFalse=use_indent_func_call_param=true|use_indent_func_call_param=false @@ -5307,7 +5414,7 @@ ValueDefault=1 [Use Indent Continue Only Once] Category=12 -Description="The value of the indentation for a continuation line is calculate differently if the line is:
    a declaration :your case with QString fileName ...
    an assignment :your case with pSettings = new QSettings( ...
    At the second case the option value might be used twice:
    at the assignment
    at the function call (if present)
    To prevent the double use of the option value, use this option with the value 'True'.
    True: indent_continue will be used only once
    False: indent_continue will be used every time (default)" +Description="The value of the indentation for a continuation line is calculate differently if the line is:
    a declaration :your case with QString fileName ...
    an assignment :your case with pSettings = new QSettings( ...
    At the second case the option value might be used twice:
    at the assignment
    at the function call (if present)
    To prevent the double use of the option value, use this option with the value 'True'.
    True: indent_continue will be used only once
    False: indent_continue will be used every time (default)." Enabled=false EditorType=boolean TrueFalse=use_indent_continue_only_once=true|use_indent_continue_only_once=false @@ -5315,7 +5422,7 @@ ValueDefault=0 [Use Options Overriding For Qt Macros] Category=12 -Description="SIGNAL/SLOT Qt macros have special formatting options. See options_for_QT.cpp for details.
    Default=True" +Description="SIGNAL/SLOT Qt macros have special formatting options. See options_for_QT.cpp for details.
    Default=True." Enabled=false EditorType=boolean TrueFalse=use_options_overriding_for_qt_macros=true|use_options_overriding_for_qt_macros=false From 0f3114dba06f14a8f5a1faf110c2ae51bc56badf Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Wed, 1 Nov 2017 04:40:10 +0100 Subject: [PATCH 089/136] make c_str const --- src/unc_text.cpp | 246 ++++++++++++++++++++++++++++++++--------- src/unc_text.h | 21 ++-- src/uncrustify_types.h | 4 +- 3 files changed, 201 insertions(+), 70 deletions(-) diff --git a/src/unc_text.cpp b/src/unc_text.cpp index c90694601e..e4d3708700 100644 --- a/src/unc_text.cpp +++ b/src/unc_text.cpp @@ -8,28 +8,100 @@ #include "unc_text.h" #include "unc_ctype.h" #include "unicode.h" // encode_utf8() +#include #include + using namespace std; +static constexpr const int_fast8_t UTF8_BLOCKS = 6; // 6 -> max utf8 blocks per char + + static size_t fix_len_idx(size_t size, size_t idx, size_t len); //! converts \n and \r chars are into NL and CR UTF8 symbols before encode_utf8 is called -static void toLogTextUtf8(int m_char, vector &container); +static void toLogTextUtf8(int c, unc_text::log_type &container); + +/** + * calculates the size a 'log_type' container needs to have in order to take + * in values of a 'unc_text::value_type' up to idx + * (without \0, with symbols for the converted \n and \r chars) + * + * throws if char is greater than 0x7fffffff + */ +static int getLogTextUtf8Len(unc_text::value_type &c0, size_t end); + +static int getLogTextUtf8Len(unc_text::value_type &c0, size_t start, size_t end); + + +static int getLogTextUtf8Len(unc_text::value_type &c0, size_t start, size_t end) +{ + size_t c1_idx = 0; + + for (size_t i = start; i < end; ++i) + { + auto ch = c0[i]; + if (ch == '\n') + { + ch = 0x2424; // NL symbol + } + else if (ch == '\r') + { + ch = 0x240d; // CR symbol + } + + if (ch < 0x80) // 1-byte sequence + { + c1_idx += 1; + } + else if (ch < 0x0800) // 2-byte sequence + { + c1_idx += 2; + } + else if (ch < 0x10000) // 3-byte sequence + { + c1_idx += 3; + } + else if (ch < 0x200000) // 4-byte sequence + { + c1_idx += 4; + } + else if (ch < 0x4000000) // 5-byte sequence + { + c1_idx += 5; + } + else if (ch <= 0x7fffffff) // 6-byte sequence + { + c1_idx += 6; + } + else + { + throw out_of_range(string(__func__) + ":" + to_string(__LINE__) + + " - ch value too big, can't convert to utf8"); + } + } + return(c1_idx); +} // getLogTextUTF8Len + + +static int getLogTextUtf8Len(unc_text::value_type &c0, size_t end) +{ + return(getLogTextUtf8Len(c0, 0, end)); +} -static void toLogTextUtf8(int m_char, vector &container) +static void toLogTextUtf8(int c, unc_text::log_type &container) { - if (m_char == '\n') + if (c == '\n') { - m_char = 0x2424; // NL symbol + c = 0x2424; // NL symbol } - else if (m_char == '\r') + else if (c == '\r') { - m_char = 0x240d; // CR symbol + c = 0x240d; // CR symbol } - encode_utf8(m_char, container); + encode_utf8(c, container); } @@ -46,8 +118,8 @@ static size_t fix_len_idx(size_t size, size_t idx, size_t len) unc_text::unc_text() - : m_logok(false) { + m_logtext = log_type{ '\0' }; } @@ -143,13 +215,6 @@ unc_text &unc_text::operator +=(const char *ascii_text) } -unc_text::value_type &unc_text::get() -{ - m_logok = false; - return(m_chars); -} - - const unc_text::value_type &unc_text::get() const { return(m_chars); @@ -162,12 +227,6 @@ int unc_text::operator[](size_t idx) const } -int &unc_text::at(size_t idx) -{ - return(m_chars.at(idx)); -} - - const int &unc_text::at(size_t idx) const { return(m_chars.at(idx)); @@ -180,13 +239,6 @@ const int &unc_text::back() const } -int &unc_text::back() -{ - // TODO: returning a temporary via a reference this has to be checked and probably changed - return(m_chars.back()); -} - - void unc_text::push_back(int ch) { append(ch); @@ -219,11 +271,6 @@ void unc_text::pop_front() void unc_text::update_logtext() { - if (m_logok) - { - return; - } - // make a pessimistic guess at the size m_logtext.clear(); m_logtext.reserve(m_chars.size() * 3); @@ -232,7 +279,6 @@ void unc_text::update_logtext() toLogTextUtf8(m_char, m_logtext); } m_logtext.push_back(0); - m_logok = true; } @@ -296,37 +342,39 @@ bool unc_text::equals(const unc_text &ref) const } -const char *unc_text::c_str() +const char *unc_text::c_str() const { - update_logtext(); return(reinterpret_cast(&m_logtext[0])); } void unc_text::set(int ch) { + m_logtext.clear(); + toLogTextUtf8(ch, m_logtext); + m_logtext.push_back('\0'); + + m_chars.clear(); m_chars.push_back(ch); - m_logok = false; } void unc_text::set(const unc_text &ref) { - m_chars = ref.m_chars; - m_logok = false; + m_chars = ref.m_chars; + m_logtext = ref.m_logtext; } void unc_text::set(const unc_text &ref, size_t idx, size_t len) { - m_logok = false; - const auto ref_size = ref.size(); if (len == ref_size) { m_chars = ref.m_chars; + update_logtext(); return; } @@ -339,6 +387,9 @@ void unc_text::set(const unc_text &ref, size_t idx, size_t len) { m_chars[di] = ref.m_chars[idx]; } + + + update_logtext(); } @@ -351,7 +402,9 @@ void unc_text::set(const string &ascii_text) { m_chars[idx] = ascii_text[idx]; } - m_logok = false; + + + update_logtext(); } @@ -364,7 +417,9 @@ void unc_text::set(const char *ascii_text) { m_chars[idx] = *ascii_text++; } - m_logok = false; + + + update_logtext(); } @@ -380,7 +435,8 @@ void unc_text::set(const value_type &data, size_t idx, size_t len) m_chars[di] = data[idx]; } - m_logok = false; + + update_logtext(); } @@ -391,43 +447,111 @@ void unc_text::resize(size_t new_size) return; } + const auto log_new_size = getLogTextUtf8Len(m_chars, new_size); + m_logtext.resize(log_new_size + 1); // one extra for \0 + m_logtext[log_new_size] = '\0'; + + m_chars.resize(new_size); - m_logok = false; } void unc_text::clear() { + m_logtext.clear(); + m_logtext.push_back('\0'); + + m_chars.clear(); - m_logok = false; } void unc_text::insert(size_t idx, int ch) { - m_chars.insert(m_chars.begin() + idx, ch); - m_logok = false; + if (idx >= m_chars.size()) + { + throw out_of_range(string(__func__) + ":" + to_string(__LINE__) + + " - idx >= m_chars.size()"); + } + + log_type utf8converted; + utf8converted.reserve(UTF8_BLOCKS); + toLogTextUtf8(ch, utf8converted); + + const auto utf8_idx = getLogTextUtf8Len(m_chars, idx); + m_logtext.pop_back(); // remove '\0' + m_logtext.insert(std::next(std::begin(m_logtext), utf8_idx), + std::begin(utf8converted), std::end(utf8converted)); + m_logtext.push_back('\0'); + + + m_chars.insert(std::next(std::begin(m_chars), idx), ch); } void unc_text::insert(size_t idx, const unc_text &ref) { - m_chars.insert(m_chars.begin() + idx, ref.m_chars.begin(), ref.m_chars.end()); - m_logok = false; + if (ref.size() == 0) + { + return; + } + if (idx >= m_chars.size()) + { + throw out_of_range(string(__func__) + ":" + to_string(__LINE__) + + " - idx >= m_chars.size()"); + } + + const auto utf8_idx = getLogTextUtf8Len(m_chars, idx); + // (A+B) remove \0 from both containers, add back a single at the end + m_logtext.pop_back(); // A + m_logtext.insert(std::next(std::begin(m_logtext), utf8_idx), + std::begin(ref.m_logtext), + std::prev(std::end(ref.m_logtext))); // B + m_logtext.push_back('\0'); + + + m_chars.insert(std::next(std::begin(m_chars), idx), + std::begin(ref.m_chars), std::end(ref.m_chars)); } void unc_text::append(int ch) { + m_logtext.pop_back(); + if (ch < 0x80 && ch != '\n' && ch != '\r') + { + m_logtext.push_back(ch); + } + else + { + log_type utf8converted; + utf8converted.reserve(UTF8_BLOCKS); + toLogTextUtf8(ch, utf8converted); + + m_logtext.insert(std::end(m_logtext), + std::begin(utf8converted), std::end(utf8converted)); + } + m_logtext.push_back('\0'); + + m_chars.push_back(ch); - m_logok = false; } void unc_text::append(const unc_text &ref) { + if (ref.size() == 0) + { + return; + } + + m_logtext.pop_back(); + m_logtext.insert(std::end(m_logtext), + std::begin(ref.m_logtext), std::end(ref.m_logtext)); + m_logtext.push_back('\0'); + + m_chars.insert(m_chars.end(), ref.m_chars.begin(), ref.m_chars.end()); - m_logok = false; } @@ -555,6 +679,20 @@ void unc_text::erase(size_t idx, size_t len) { return; } + if (idx + len >= m_chars.size()) + { + throw out_of_range(string(__func__) + ":" + to_string(__LINE__) + + " - idx + len >= m_chars.size()"); + } + + const auto pos_s = getLogTextUtf8Len(m_chars, idx); + const auto pos_e = pos_s + getLogTextUtf8Len(m_chars, idx, idx + len); + + m_logtext.pop_back(); + m_logtext.erase(std::next(std::begin(m_logtext), pos_s), + std::next(std::begin(m_logtext), pos_e)); + m_logtext.push_back('\0'); + m_chars.erase(m_chars.begin() + idx, m_chars.begin() + idx + len); } @@ -562,11 +700,11 @@ void unc_text::erase(size_t idx, size_t len) int unc_text::replace(const char *oldtext, const unc_text &newtext) { - const size_t olen = strlen(oldtext); + const auto olen = static_cast(strlen(oldtext)); const size_t newtext_size = newtext.size(); - int fidx = find(oldtext); int rcnt = 0; + int fidx = find(oldtext); while (fidx >= 0) { diff --git a/src/unc_text.h b/src/unc_text.h index 92e5a5a276..c70dce5cb2 100644 --- a/src/unc_text.h +++ b/src/unc_text.h @@ -23,9 +23,10 @@ class unc_text { public: - typedef std::deque value_type; // double encoded list of int values + typedef std::deque value_type; // double encoded list of int values + typedef std::vector log_type; + -public: unc_text(); unc_text(const unc_text &ref); @@ -113,7 +114,7 @@ class unc_text //! Returns the UTF-8 string for logging - const char *c_str(); + const char *c_str() const; /** @@ -134,8 +135,6 @@ class unc_text //! grab the data as a series of ints for outputting to a file - value_type & get(); - const value_type &get() const; @@ -143,15 +142,11 @@ class unc_text // throws an exception if out of bounds - int &at(size_t idx); - const int &at(size_t idx) const; - const int &back() const; - //! returns the last element of the character list - int &back(); + const int &back() const; void push_back(int ch); @@ -189,10 +184,8 @@ class unc_text protected: void update_logtext(); - - value_type m_chars; //! this contains the non-encoded 31-bit chars - std::vector m_logtext; //! logging text, utf8 encoded - updated in c_str() - bool m_logok; + value_type m_chars; //! this contains the non-encoded 31-bit chars + log_type m_logtext; //! logging text, utf8 encoded - updated in c_str() }; diff --git a/src/uncrustify_types.h b/src/uncrustify_types.h index 1e71bb1511..1b266ce363 100644 --- a/src/uncrustify_types.h +++ b/src/uncrustify_types.h @@ -290,14 +290,14 @@ struct chunk_t //! provides the number of characters of string - size_t len() + size_t len() const { return(str.size()); } //! provides the content of a string a zero terminated character pointer - const char *text() + const char *text() const { return(str.c_str()); } From 5f53e0ec296be6932f7f87dd7b2fcde1ff25403b Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Wed, 8 Nov 2017 15:50:51 +0100 Subject: [PATCH 090/136] fix memcmp heap-buffer-overflow next->str.c_str() can hold values that are shorter than 6 or 9, unlike memcmp, strncmp checks for '\0' --- src/tokenize_cleanup.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tokenize_cleanup.cpp b/src/tokenize_cleanup.cpp index 0049e259e4..9c678c30e2 100644 --- a/src/tokenize_cleanup.cpp +++ b/src/tokenize_cleanup.cpp @@ -774,8 +774,8 @@ void tokenize_cleanup(void) // Detect "pragma region" and "pragma endregion" if (pc->type == CT_PP_PRAGMA && next->type == CT_PREPROC_BODY) { - if ( (memcmp(next->str.c_str(), "region", 6) == 0) - || (memcmp(next->str.c_str(), "endregion", 9) == 0)) + if ( (strncmp(next->str.c_str(), "region", 6) == 0) + || (strncmp(next->str.c_str(), "endregion", 9) == 0)) // TODO: probably better use strncmp { set_chunk_type(pc, (*next->str.c_str() == 'r') ? CT_PP_REGION : CT_PP_ENDREGION); From 660a2f38366470d22ae887c0c48a24c11d051781 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Wed, 8 Nov 2017 16:25:18 +0100 Subject: [PATCH 091/136] fix NOMINMAX mingw32 internally already defines NOMINMAX so a check for that has to be made --- src/windows_compat.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/windows_compat.h b/src/windows_compat.h index 9b8bb8b35d..0265b0d34a 100644 --- a/src/windows_compat.h +++ b/src/windows_compat.h @@ -9,7 +9,9 @@ #ifndef WINDOWS_COMPAT_H_INCLUDED #define WINDOWS_COMPAT_H_INCLUDED +#ifndef NOMINMAX #define NOMINMAX +#endif #include "windows.h" #define HAVE_SYS_STAT_H From 5d873824b9d3085dd5e1d4782bbb97a36475c785 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Thu, 2 Nov 2017 23:08:58 +0100 Subject: [PATCH 092/136] const ListManager --- src/ListManager.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ListManager.h b/src/ListManager.h index b91d047cb0..7916f2eb6c 100644 --- a/src/ListManager.h +++ b/src/ListManager.h @@ -45,7 +45,7 @@ template class ListManager * * @return pointer to first element or nullptr if list is empty */ - T *GetHead() + T *GetHead() const { return(first); } @@ -56,7 +56,7 @@ template class ListManager * * @return pointer to last element or nullptr if list is empty */ - T *GetTail() + T *GetTail() const { return(last); } @@ -69,7 +69,7 @@ template class ListManager * * @return pointer to next element or nullptr if no next element exists */ - T *GetNext(T *ref) + T *GetNext(const T *ref) { return((ref != NULL) ? ref->next : NULL); } @@ -82,7 +82,7 @@ template class ListManager * * @return pointer to previous element or nullptr if no previous element exists */ - T *GetPrev(T *ref) + T *GetPrev(const T *ref) { return((ref != NULL) ? ref->prev : NULL); } From 7b0377116a305d2464b9aaeffd77e5e4f17f2f65 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Fri, 3 Nov 2017 00:17:08 +0100 Subject: [PATCH 093/136] const chunk_list simple --- src/chunk_list.cpp | 25 +++++++++--------------- src/chunk_list.h | 48 +++++++++++++++++++++++----------------------- 2 files changed, 33 insertions(+), 40 deletions(-) diff --git a/src/chunk_list.cpp b/src/chunk_list.cpp index 3af8af7ef1..56c87c33c0 100644 --- a/src/chunk_list.cpp +++ b/src/chunk_list.cpp @@ -47,7 +47,7 @@ typedef bool (*check_t)(chunk_t *pc); * for a function pointer of type * chunk_t *function(chunk_t *cur, nav_t scope) */ -typedef chunk_t * (*search_t)(chunk_t *cur, scope_e scope); +typedef chunk_t * (*search_t)(const chunk_t *cur, scope_e scope); /** @@ -77,7 +77,7 @@ typedef chunk_t * (*search_t)(chunk_t *cur, scope_e scope); static chunk_t *chunk_search(chunk_t *cur, const check_t check_fct, const scope_e scope = scope_e::ALL, const direction_e dir = direction_e::FORWARD, const bool cond = true); -static void chunk_log(chunk_t *pc, const char *text); +static void chunk_log(const chunk_t *pc, const char *text); /* @@ -314,7 +314,7 @@ static chunk_t *chunk_search(chunk_t *cur, const check_t check_fct, const scope_ * into a common function However this should be done with the preprocessor * to avoid addition check conditions that would be evaluated in the * while loop of the calling function */ -chunk_t *chunk_get_next(chunk_t *cur, scope_e scope) +chunk_t *chunk_get_next(const chunk_t *cur, scope_e scope) { if (cur == nullptr) { @@ -343,7 +343,7 @@ chunk_t *chunk_get_next(chunk_t *cur, scope_e scope) } -chunk_t *chunk_get_prev(chunk_t *cur, scope_e scope) +chunk_t *chunk_get_prev(const chunk_t *cur, scope_e scope) { if (cur == nullptr) { @@ -391,7 +391,7 @@ chunk_t *chunk_dup(const chunk_t *pc_in) } -static void chunk_log_msg(chunk_t *chunk, const log_sev_t log, const char *str) +static void chunk_log_msg(const chunk_t *chunk, const log_sev_t log, const char *str) { LOG_FMT(log, "%s %zu:%zu '%s' [%s]", str, chunk->orig_line, chunk->orig_col, chunk->text(), @@ -399,7 +399,7 @@ static void chunk_log_msg(chunk_t *chunk, const log_sev_t log, const char *str) } -static void chunk_log(chunk_t *pc, const char *text) +static void chunk_log(const chunk_t *pc, const char *text) { if ( pc != nullptr && (cpd.unc_stage != unc_stage_e::TOKENIZE) @@ -604,24 +604,17 @@ chunk_t *chunk_first_on_line(chunk_t *pc) } -bool chunk_is_last_on_line(chunk_t &pc) //TODO: pc should be const here +bool chunk_is_last_on_line(const chunk_t &pc) { // check if pc is the very last chunk of the file - const auto *end = chunk_get_tail(); - - if (&pc == end) + if (&pc == chunk_get_tail()) { return(true); } // if the next chunk is a newline then pc is the last chunk on its line const auto *next = chunk_get_next(&pc); - if (next != nullptr && next->type == CT_NEWLINE) - { - return(true); - } - - return(false); + return((next != nullptr && next->type == CT_NEWLINE) ? true : false); } diff --git a/src/chunk_list.h b/src/chunk_list.h index a4c5c3a75c..921b110e7c 100644 --- a/src/chunk_list.h +++ b/src/chunk_list.h @@ -120,7 +120,7 @@ chunk_t *chunk_get_tail(void); * * @return pointer to next chunk or nullptr if no chunk was found */ -chunk_t *chunk_get_next(chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_next(const chunk_t *cur, scope_e scope = scope_e::ALL); /** @@ -131,7 +131,7 @@ chunk_t *chunk_get_next(chunk_t *cur, scope_e scope = scope_e::ALL); * * @return pointer to previous chunk or nullptr if no chunk was found */ -chunk_t *chunk_get_prev(chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_prev(const chunk_t *cur, scope_e scope = scope_e::ALL); /** @@ -166,7 +166,7 @@ chunk_t *chunk_first_on_line(chunk_t *pc); //! check if a given chunk is the last on its line -bool chunk_is_last_on_line(chunk_t &pc); +bool chunk_is_last_on_line(const chunk_t &pc); /** @@ -415,7 +415,7 @@ chunk_t *chunk_search_next_cat(chunk_t *pc, const c_token_t cat); * The compiler should know how to optimize the code itself. * To clarify do a profiling run with and without inline */ -static_inline bool is_expected_type_and_level(chunk_t *pc, c_token_t type, int level) +static_inline bool is_expected_type_and_level(const chunk_t *pc, c_token_t type, int level) { // we don't care about the level (if it is negative) or it is as expected // and the type is as expected @@ -424,7 +424,7 @@ static_inline bool is_expected_type_and_level(chunk_t *pc, c_token_t type, int l } -static_inline bool is_expected_string_and_level(chunk_t *pc, const char *str, int level, size_t len) +static_inline bool is_expected_string_and_level(const chunk_t *pc, const char *str, int level, size_t len) { // we don't care about the level (if it is negative) or it is as expected return( (level < 0 || pc->level == static_cast(level)) @@ -495,7 +495,7 @@ static_inline bool chunk_is_comment(chunk_t *pc) } -static_inline bool chunk_is_single_line_comment(chunk_t *pc) +static_inline bool chunk_is_single_line_comment(const chunk_t *pc) { return( pc != NULL && (pc->type == CT_COMMENT || pc->type == CT_COMMENT_CPP)); @@ -509,7 +509,7 @@ static_inline bool chunk_is_newline(chunk_t *pc) } -static_inline bool chunk_is_semicolon(chunk_t *pc) +static_inline bool chunk_is_semicolon(const chunk_t *pc) { return( pc != NULL && (pc->type == CT_SEMICOLON || pc->type == CT_VSEMICOLON)); @@ -523,7 +523,7 @@ static_inline bool chunk_is_semicolon(chunk_t *pc) * * @todo rename function: blank is a space not an empty string */ -static_inline bool chunk_is_blank(chunk_t *pc) +static_inline bool chunk_is_blank(const chunk_t *pc) { return(pc != NULL && (pc->len() == 0)); } @@ -545,7 +545,7 @@ static_inline bool chunk_is_balanced_square(chunk_t *pc) } -static_inline bool chunk_is_preproc(chunk_t *pc) +static_inline bool chunk_is_preproc(const chunk_t *pc) { return(pc != NULL && (pc->flags & PCF_IN_PREPROC)); } @@ -592,7 +592,7 @@ static_inline bool chunk_is_Doxygen_comment(chunk_t *pc) } -static_inline bool chunk_is_type(chunk_t *pc) +static_inline bool chunk_is_type(const chunk_t *pc) { return( pc != NULL && ( pc->type == CT_TYPE @@ -606,13 +606,13 @@ static_inline bool chunk_is_type(chunk_t *pc) } -static_inline bool chunk_is_token(chunk_t *pc, c_token_t c_token) +static_inline bool chunk_is_token(const chunk_t *pc, c_token_t c_token) { return(pc != NULL && pc->type == c_token); } -static_inline bool chunk_is_str(chunk_t *pc, const char *str, size_t len) +static_inline bool chunk_is_str(const chunk_t *pc, const char *str, size_t len) { return( pc != NULL // valid pc pointer && (pc->len() == len) // token size equals size parameter @@ -625,7 +625,7 @@ static_inline bool chunk_is_str(chunk_t *pc, const char *str, size_t len) } -static_inline bool chunk_is_str_case(chunk_t *pc, const char *str, size_t len) +static_inline bool chunk_is_str_case(const chunk_t *pc, const char *str, size_t len) { return( pc != NULL && (pc->len() == len) @@ -633,7 +633,7 @@ static_inline bool chunk_is_str_case(chunk_t *pc, const char *str, size_t len) } -static_inline bool chunk_is_word(chunk_t *pc) +static_inline bool chunk_is_word(const chunk_t *pc) { return( pc != NULL && (pc->len() >= 1) @@ -641,7 +641,7 @@ static_inline bool chunk_is_word(chunk_t *pc) } -static_inline bool chunk_is_star(chunk_t *pc) +static_inline bool chunk_is_star(const chunk_t *pc) { return( pc != NULL && (pc->len() == 1) @@ -650,7 +650,7 @@ static_inline bool chunk_is_star(chunk_t *pc) } -static_inline bool chunk_is_addr(chunk_t *pc) +static_inline bool chunk_is_addr(const chunk_t *pc) { if ( pc != NULL && ( pc->type == CT_BYREF @@ -674,7 +674,7 @@ static_inline bool chunk_is_addr(chunk_t *pc) } -static_inline bool chunk_is_msref(chunk_t *pc) // ms compilers for C++/CLI and WinRT use '^' instead of '*' for marking up reference types vs pointer types +static_inline bool chunk_is_msref(const chunk_t *pc) // ms compilers for C++/CLI and WinRT use '^' instead of '*' for marking up reference types vs pointer types { return( (cpd.lang_flags & LANG_CPP) && ( pc != NULL @@ -684,7 +684,7 @@ static_inline bool chunk_is_msref(chunk_t *pc) // ms compilers for C++/CLI and W } -static_inline bool chunk_is_ptr_operator(chunk_t *pc) +static_inline bool chunk_is_ptr_operator(const chunk_t *pc) { return( chunk_is_star(pc) || chunk_is_addr(pc) @@ -696,14 +696,14 @@ static_inline bool chunk_is_ptr_operator(chunk_t *pc) bool chunk_is_newline_between(chunk_t *start, chunk_t *end); -static_inline bool chunk_is_closing_brace(chunk_t *pc) +static_inline bool chunk_is_closing_brace(const chunk_t *pc) { return( pc != NULL && (pc->type == CT_BRACE_CLOSE || pc->type == CT_VBRACE_CLOSE)); } -static_inline bool chunk_is_opening_brace(chunk_t *pc) +static_inline bool chunk_is_opening_brace(const chunk_t *pc) { return( pc != NULL && (pc->type == CT_BRACE_OPEN || pc->type == CT_VBRACE_OPEN)); @@ -717,7 +717,7 @@ static_inline bool chunk_is_vbrace(chunk_t *pc) } -static_inline bool chunk_is_paren_open(chunk_t *pc) +static_inline bool chunk_is_paren_open(const chunk_t *pc) { return( pc != NULL && ( pc->type == CT_PAREN_OPEN @@ -727,7 +727,7 @@ static_inline bool chunk_is_paren_open(chunk_t *pc) } -static_inline bool chunk_is_paren_close(chunk_t *pc) +static_inline bool chunk_is_paren_close(const chunk_t *pc) { return( pc != NULL && ( pc->type == CT_PAREN_CLOSE @@ -741,7 +741,7 @@ static_inline bool chunk_is_paren_close(chunk_t *pc) * Returns true if either chunk is null or both have the same preproc flags. * If this is true, you can remove a newline/nl_cont between the two. */ -static_inline bool chunk_same_preproc(chunk_t *pc1, chunk_t *pc2) +static_inline bool chunk_same_preproc(const chunk_t *pc1, chunk_t *pc2) { return( pc1 == NULL || pc2 == NULL @@ -754,7 +754,7 @@ static_inline bool chunk_same_preproc(chunk_t *pc1, chunk_t *pc2) * The prev and next chunks must have the same PCF_IN_PREPROC flag AND * the newline can't be after a C++ comment. */ -static_inline bool chunk_safe_to_del_nl(chunk_t *nl) +static_inline bool chunk_safe_to_del_nl(const chunk_t *nl) { chunk_t *tmp = chunk_get_prev(nl); From 88323ced8bec06a3fd34771b5e0f55c11967f647 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Fri, 3 Nov 2017 01:47:41 +0100 Subject: [PATCH 094/136] const chunk_search --- src/chunk_list.cpp | 47 ++++++++++++++++++++++++---------------------- src/chunk_list.h | 26 ++++++++++++------------- 2 files changed, 38 insertions(+), 35 deletions(-) diff --git a/src/chunk_list.cpp b/src/chunk_list.cpp index 56c87c33c0..da2965f463 100644 --- a/src/chunk_list.cpp +++ b/src/chunk_list.cpp @@ -74,7 +74,7 @@ typedef chunk_t * (*search_t)(const chunk_t *cur, scope_e scope); * @retval nullptr no requested chunk was found or invalid parameters provided * @retval chunk_t pointer to the found chunk */ -static chunk_t *chunk_search(chunk_t *cur, const check_t check_fct, const scope_e scope = scope_e::ALL, const direction_e dir = direction_e::FORWARD, const bool cond = true); +static chunk_t *chunk_search(const chunk_t *cur, const check_t check_fct, const scope_e scope = scope_e::ALL, const direction_e dir = direction_e::FORWARD, const bool cond = true); static void chunk_log(const chunk_t *pc, const char *text); @@ -292,21 +292,24 @@ static chunk_t *chunk_search_str(chunk_t *cur, const char *str, size_t len, scop } -static chunk_t *chunk_search(chunk_t *cur, const check_t check_fct, const scope_e scope, - const direction_e dir, const bool cond) +static chunk_t *chunk_search(const chunk_t *cur, const check_t check_fct, + const scope_e scope, const direction_e dir, + const bool cond) { /* * Depending on the parameter dir the search function searches * in forward or backward direction */ search_t search_function = select_search_fct(dir); - chunk_t *pc = cur; - do // loop over the chunk list + // loop over the chunk list + chunk_t *pc = search_function(cur, scope); + + while ( pc != nullptr // end of the list was not reached yet + && (check_fct(pc) != cond)) // and the demanded chunk was not found { - pc = search_function(pc, scope); // in either direction while - } while ( pc != nullptr // the end of the list was not reached yet - && (check_fct(pc) != cond)); // and the demanded chunk was not found either - return(pc); // the latest chunk is the searched one + pc = search_function(pc, scope); + } + return(pc); // the latest chunk is the searched one } @@ -463,31 +466,31 @@ void chunk_move_after(chunk_t *pc_in, chunk_t *ref) } -chunk_t *chunk_get_next_nl(chunk_t *cur, scope_e scope) +chunk_t *chunk_get_next_nl(const chunk_t *cur, scope_e scope) { return(chunk_search(cur, chunk_is_newline, scope, direction_e::FORWARD, true)); } -chunk_t *chunk_get_prev_nl(chunk_t *cur, scope_e scope) +chunk_t *chunk_get_prev_nl(const chunk_t *cur, scope_e scope) { return(chunk_search(cur, chunk_is_newline, scope, direction_e::BACKWARD, true)); } -chunk_t *chunk_get_next_nnl(chunk_t *cur, scope_e scope) +chunk_t *chunk_get_next_nnl(const chunk_t *cur, scope_e scope) { return(chunk_search(cur, chunk_is_newline, scope, direction_e::FORWARD, false)); } -chunk_t *chunk_get_prev_nnl(chunk_t *cur, scope_e scope) +chunk_t *chunk_get_prev_nnl(const chunk_t *cur, scope_e scope) { return(chunk_search(cur, chunk_is_newline, scope, direction_e::BACKWARD, false)); } -chunk_t *chunk_get_next_ncnl(chunk_t *cur, scope_e scope) +chunk_t *chunk_get_next_ncnl(const chunk_t *cur, scope_e scope) { return(chunk_search(cur, chunk_is_comment_or_newline, scope, direction_e::FORWARD, false)); } @@ -511,37 +514,37 @@ chunk_t *chunk_get_prev_ncnlnpnd(chunk_t *cur, scope_e scope) } -chunk_t *chunk_get_next_nblank(chunk_t *cur, scope_e scope) +chunk_t *chunk_get_next_nblank(const chunk_t *cur, scope_e scope) { return(chunk_search(cur, chunk_is_comment_newline_or_blank, scope, direction_e::FORWARD, false)); } -chunk_t *chunk_get_prev_nblank(chunk_t *cur, scope_e scope) +chunk_t *chunk_get_prev_nblank(const chunk_t *cur, scope_e scope) { return(chunk_search(cur, chunk_is_comment_newline_or_blank, scope, direction_e::BACKWARD, false)); } -chunk_t *chunk_get_next_nc(chunk_t *cur, scope_e scope) +chunk_t *chunk_get_next_nc(const chunk_t *cur, scope_e scope) { return(chunk_search(cur, chunk_is_comment, scope, direction_e::FORWARD, false)); } -chunk_t *chunk_get_next_nisq(chunk_t *cur, scope_e scope) +chunk_t *chunk_get_next_nisq(const chunk_t *cur, scope_e scope) { return(chunk_search(cur, chunk_is_balanced_square, scope, direction_e::FORWARD, false)); } -chunk_t *chunk_get_prev_ncnl(chunk_t *cur, scope_e scope) +chunk_t *chunk_get_prev_ncnl(const chunk_t *cur, scope_e scope) { return(chunk_search(cur, chunk_is_comment_or_newline, scope, direction_e::BACKWARD, false)); } -chunk_t *chunk_get_prev_nc(chunk_t *cur, scope_e scope) +chunk_t *chunk_get_prev_nc(const chunk_t *cur, scope_e scope) { return(chunk_search(cur, chunk_is_comment, scope, direction_e::BACKWARD, false)); } @@ -693,13 +696,13 @@ void chunk_swap_lines(chunk_t *pc1, chunk_t *pc2) } // chunk_swap_lines -chunk_t *chunk_get_next_nvb(chunk_t *cur, const scope_e scope) +chunk_t *chunk_get_next_nvb(const chunk_t *cur, const scope_e scope) { return(chunk_search(cur, chunk_is_vbrace, scope, direction_e::FORWARD, false)); } -chunk_t *chunk_get_prev_nvb(chunk_t *cur, const scope_e scope) +chunk_t *chunk_get_prev_nvb(const chunk_t *cur, const scope_e scope) { return(chunk_search(cur, chunk_is_vbrace, scope, direction_e::BACKWARD, false)); } diff --git a/src/chunk_list.h b/src/chunk_list.h index 921b110e7c..1e7b3c1426 100644 --- a/src/chunk_list.h +++ b/src/chunk_list.h @@ -175,7 +175,7 @@ bool chunk_is_last_on_line(const chunk_t &pc); * @param cur chunk to use as start point * @param scope code region to search in */ -chunk_t *chunk_get_next_nl(chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_next_nl(const chunk_t *cur, scope_e scope = scope_e::ALL); /** @@ -184,7 +184,7 @@ chunk_t *chunk_get_next_nl(chunk_t *cur, scope_e scope = scope_e::ALL); * @param cur chunk to use as start point * @param scope code region to search in */ -chunk_t *chunk_get_next_nc(chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_next_nc(const chunk_t *cur, scope_e scope = scope_e::ALL); /** @@ -193,7 +193,7 @@ chunk_t *chunk_get_next_nc(chunk_t *cur, scope_e scope = scope_e::ALL); * @param cur chunk to use as start point * @param scope code region to search in */ -chunk_t *chunk_get_next_nnl(chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_next_nnl(const chunk_t *cur, scope_e scope = scope_e::ALL); /** @@ -202,7 +202,7 @@ chunk_t *chunk_get_next_nnl(chunk_t *cur, scope_e scope = scope_e::ALL); * @param cur chunk to use as start point * @param scope code region to search in */ -chunk_t *chunk_get_next_ncnl(chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_next_ncnl(const chunk_t *cur, scope_e scope = scope_e::ALL); /** @@ -224,7 +224,7 @@ chunk_t *chunk_get_next_ncnlnp(chunk_t *cur, scope_e scope = scope_e::ALL); * * @return nullptr or the next chunk not in or part of square brackets */ -chunk_t *chunk_get_next_nisq(chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_next_nisq(const chunk_t *cur, scope_e scope = scope_e::ALL); /** @@ -233,7 +233,7 @@ chunk_t *chunk_get_next_nisq(chunk_t *cur, scope_e scope = scope_e::ALL); * @param cur chunk to use as start point * @param scope code region to search in */ -chunk_t *chunk_get_next_nblank(chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_next_nblank(const chunk_t *cur, scope_e scope = scope_e::ALL); /** @@ -242,7 +242,7 @@ chunk_t *chunk_get_next_nblank(chunk_t *cur, scope_e scope = scope_e::ALL); * @param cur chunk to use as start point * @param scope code region to search in */ -chunk_t *chunk_get_prev_nblank(chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_prev_nblank(const chunk_t *cur, scope_e scope = scope_e::ALL); /** @@ -251,7 +251,7 @@ chunk_t *chunk_get_prev_nblank(chunk_t *cur, scope_e scope = scope_e::ALL); * @param cur chunk to use as start point * @param scope code region to search in */ -chunk_t *chunk_get_prev_nl(chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_prev_nl(const chunk_t *cur, scope_e scope = scope_e::ALL); /** @@ -260,7 +260,7 @@ chunk_t *chunk_get_prev_nl(chunk_t *cur, scope_e scope = scope_e::ALL); * @param cur chunk to use as start point * @param scope code region to search in */ -chunk_t *chunk_get_prev_nc(chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_prev_nc(const chunk_t *cur, scope_e scope = scope_e::ALL); /** @@ -269,7 +269,7 @@ chunk_t *chunk_get_prev_nc(chunk_t *cur, scope_e scope = scope_e::ALL); * @param cur chunk to use as start point * @param scope code region to search in */ -chunk_t *chunk_get_prev_nnl(chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_prev_nnl(const chunk_t *cur, scope_e scope = scope_e::ALL); /** @@ -278,7 +278,7 @@ chunk_t *chunk_get_prev_nnl(chunk_t *cur, scope_e scope = scope_e::ALL); * @param cur chunk to use as start point * @param scope code region to search in */ -chunk_t *chunk_get_prev_ncnl(chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_prev_ncnl(const chunk_t *cur, scope_e scope = scope_e::ALL); /** @@ -367,7 +367,7 @@ chunk_t *chunk_get_prev_str(chunk_t *cur, const char *str, size_t len, int level * * @return pointer to found chunk or nullptr if no chunk was found */ -chunk_t *chunk_get_next_nvb(chunk_t *cur, const scope_e scope = scope_e::ALL); +chunk_t *chunk_get_next_nvb(const chunk_t *cur, const scope_e scope = scope_e::ALL); /** @@ -378,7 +378,7 @@ chunk_t *chunk_get_next_nvb(chunk_t *cur, const scope_e scope = scope_e::ALL); * * @return pointer to found chunk or nullptr if no chunk was found */ -chunk_t *chunk_get_prev_nvb(chunk_t *cur, const scope_e scope = scope_e::ALL); +chunk_t *chunk_get_prev_nvb(const chunk_t *cur, const scope_e scope = scope_e::ALL); /** From 928b60c99a5d6911e3e3c058173b8332b7586f6b Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Fri, 3 Nov 2017 01:54:39 +0100 Subject: [PATCH 095/136] const chunk_search_type --- src/chunk_list.cpp | 23 +++++++++++++---------- src/chunk_list.h | 4 ++-- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/chunk_list.cpp b/src/chunk_list.cpp index da2965f463..c8e2516b88 100644 --- a/src/chunk_list.cpp +++ b/src/chunk_list.cpp @@ -101,7 +101,7 @@ static void chunk_log(const chunk_t *pc, const char *text); * @retval nullptr no chunk found or invalid parameters provided * @retval chunk_t pointer to the found chunk */ -static chunk_t *chunk_search_type(chunk_t *cur, const c_token_t type, const scope_e scope = scope_e::ALL, const direction_e dir = direction_e::FORWARD); +static chunk_t *chunk_search_type(const chunk_t *cur, const c_token_t type, const scope_e scope = scope_e::ALL, const direction_e dir = direction_e::FORWARD); /** @@ -211,19 +211,19 @@ static search_t select_search_fct(const direction_e dir) } -chunk_t *chunk_search_prev_cat(chunk_t *pc, const c_token_t cat) +chunk_t *chunk_search_prev_cat(const chunk_t *pc, const c_token_t cat) { return(chunk_search_type(pc, cat, scope_e::ALL, direction_e::BACKWARD)); } -chunk_t *chunk_search_next_cat(chunk_t *pc, const c_token_t cat) +chunk_t *chunk_search_next_cat(const chunk_t *pc, const c_token_t cat) { return(chunk_search_type(pc, cat, scope_e::ALL, direction_e::FORWARD)); } -static chunk_t *chunk_search_type(chunk_t *cur, const c_token_t type, +static chunk_t *chunk_search_type(const chunk_t *cur, const c_token_t type, const scope_e scope, const direction_e dir) { /* @@ -231,14 +231,17 @@ static chunk_t *chunk_search_type(chunk_t *cur, const c_token_t type, * in forward or backward direction */ search_t search_function = select_search_fct(dir); - chunk_t *pc = cur; - do // loop over the chunk list + // loop over the chunk list + chunk_t *pc = search_function(cur, scope); + + while ( pc != nullptr // the end of the list was not reached + && pc->type != type) // and the demanded chunk was not found { - pc = search_function(pc, scope); // in either direction while - } while ( pc != nullptr // the end of the list was not reached yet - && pc->type != type); // and the demanded chunk was not found either - return(pc); // the latest chunk is the searched one + pc = search_function(pc, scope); + } + + return(pc); // the latest chunk is the searched one or nullptr } diff --git a/src/chunk_list.h b/src/chunk_list.h index 1e7b3c1426..05abd93cbd 100644 --- a/src/chunk_list.h +++ b/src/chunk_list.h @@ -390,7 +390,7 @@ chunk_t *chunk_get_prev_nvb(const chunk_t *cur, const scope_e scope = scope_e::A * @retval nullptr no object found, or invalid parameters provided * @retval chunk_t pointer to the found object */ -chunk_t *chunk_search_prev_cat(chunk_t *pc, const c_token_t cat); +chunk_t *chunk_search_prev_cat(const chunk_t *pc, const c_token_t cat); /** @@ -402,7 +402,7 @@ chunk_t *chunk_search_prev_cat(chunk_t *pc, const c_token_t cat); * @retval nullptr no object found, or invalid parameters provided * @retval chunk_t pointer to the found object */ -chunk_t *chunk_search_next_cat(chunk_t *pc, const c_token_t cat); +chunk_t *chunk_search_next_cat(const chunk_t *pc, const c_token_t cat); /* * TODO: better move the function implementations to the source file. From 6e22ab4d4ab722a6f24a82b58899e4d4f787b44c Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Fri, 3 Nov 2017 02:07:38 +0100 Subject: [PATCH 096/136] const chunk_get_ncnlnp --- src/chunk_list.cpp | 17 +++++++---------- src/chunk_list.h | 4 ++-- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/chunk_list.cpp b/src/chunk_list.cpp index c8e2516b88..08463cca75 100644 --- a/src/chunk_list.cpp +++ b/src/chunk_list.cpp @@ -137,7 +137,7 @@ static chunk_t *chunk_search_typelevel(chunk_t *cur, c_token_t type, scope_e sco * @retval nullptr no chunk found or invalid parameters provided * @retval chunk_t pointer to the found chunk */ -static chunk_t *chunk_get_ncnlnp(chunk_t *cur, const scope_e scope = scope_e::ALL, const direction_e dir = direction_e::FORWARD); +static chunk_t *chunk_get_ncnlnp(const chunk_t *cur, const scope_e scope = scope_e::ALL, const direction_e dir = direction_e::FORWARD); static chunk_t *chunk_get_ncnlnpnd(chunk_t *cur, const scope_e scope = scope_e::ALL, const direction_e dir = direction_e::FORWARD); @@ -499,13 +499,13 @@ chunk_t *chunk_get_next_ncnl(const chunk_t *cur, scope_e scope) } -chunk_t *chunk_get_next_ncnlnp(chunk_t *cur, scope_e scope) +chunk_t *chunk_get_next_ncnlnp(const chunk_t *cur, scope_e scope) { return(chunk_get_ncnlnp(cur, scope, direction_e::FORWARD)); } -chunk_t *chunk_get_prev_ncnlnp(chunk_t *cur, scope_e scope) +chunk_t *chunk_get_prev_ncnlnp(const chunk_t *cur, scope_e scope) { return(chunk_get_ncnlnp(cur, scope, direction_e::BACKWARD)); } @@ -781,14 +781,11 @@ void set_chunk_real(chunk_t *pc, c_token_t token, log_sev_t what) } -static chunk_t *chunk_get_ncnlnp(chunk_t *cur, const scope_e scope, const direction_e dir) +static chunk_t *chunk_get_ncnlnp(const chunk_t *cur, const scope_e scope, const direction_e dir) { - chunk_t *pc = cur; - - pc = (chunk_is_preproc(pc) == true) ? - chunk_search(pc, chunk_is_comment_or_newline_in_preproc, scope, dir, false) : - chunk_search(pc, chunk_is_comment_newline_or_preproc, scope, dir, false); - return(pc); + return(chunk_is_preproc(cur) == true + ? chunk_search(cur, chunk_is_comment_or_newline_in_preproc, scope, dir, false) + : chunk_search(cur, chunk_is_comment_newline_or_preproc, scope, dir, false)); } diff --git a/src/chunk_list.h b/src/chunk_list.h index 05abd93cbd..9d2c86d0d7 100644 --- a/src/chunk_list.h +++ b/src/chunk_list.h @@ -211,7 +211,7 @@ chunk_t *chunk_get_next_ncnl(const chunk_t *cur, scope_e scope = scope_e::ALL); * @param cur chunk to use as start point * @param scope code region to search in */ -chunk_t *chunk_get_next_ncnlnp(chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_next_ncnlnp(const chunk_t *cur, scope_e scope = scope_e::ALL); /** @@ -287,7 +287,7 @@ chunk_t *chunk_get_prev_ncnl(const chunk_t *cur, scope_e scope = scope_e::ALL); * @param cur chunk to use as start point * @param scope code region to search in */ -chunk_t *chunk_get_prev_ncnlnp(chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_prev_ncnlnp(const chunk_t *cur, scope_e scope = scope_e::ALL); /** From 95bae3bf1e54b50ff091950aab5a7c5d94fb1e88 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Fri, 3 Nov 2017 02:18:06 +0100 Subject: [PATCH 097/136] const chunk_search_typelevel --- src/chunk_list.cpp | 24 ++++++++++++++---------- src/chunk_list.h | 4 ++-- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/chunk_list.cpp b/src/chunk_list.cpp index 08463cca75..af98fcfa69 100644 --- a/src/chunk_list.cpp +++ b/src/chunk_list.cpp @@ -121,7 +121,7 @@ static chunk_t *chunk_search_type(const chunk_t *cur, const c_token_t type, cons * @retval nullptr no chunk found or invalid parameters provided * @retval chunk_t pointer to the found chunk */ -static chunk_t *chunk_search_typelevel(chunk_t *cur, c_token_t type, scope_e scope = scope_e::ALL, direction_e dir = direction_e::FORWARD, int level = -1); +static chunk_t *chunk_search_typelevel(const chunk_t *cur, c_token_t type, scope_e scope = scope_e::ALL, direction_e dir = direction_e::FORWARD, int level = -1); /** @@ -245,18 +245,23 @@ static chunk_t *chunk_search_type(const chunk_t *cur, const c_token_t type, } -static chunk_t *chunk_search_typelevel(chunk_t *cur, c_token_t type, scope_e scope, direction_e dir, int level) +static chunk_t *chunk_search_typelevel(const chunk_t *cur, c_token_t type, + scope_e scope, direction_e dir, int level) { /* * Depending on the parameter dir the search function searches * in forward or backward direction */ search_t search_function = select_search_fct(dir); - chunk_t *pc = cur; - do // loop over the chunk list + + // loop over the chunk list + chunk_t *pc = search_function(cur, scope); + + while ( pc != nullptr // the end of the list was not reached + && !is_expected_type_and_level(pc, type, level)) { - pc = search_function(pc, scope); // in either direction while + pc = search_function(pc, scope); #if DEBUG if (pc != nullptr) { @@ -272,9 +277,8 @@ static chunk_t *chunk_search_typelevel(chunk_t *cur, c_token_t type, scope_e sco } } #endif - } while ( pc != nullptr // the end of the list was not reached yet - && (is_expected_type_and_level(pc, type, level) == false)); - return(pc); // the latest chunk is the searched one + } + return(pc); // the latest chunk is the searched one or nullptr } @@ -553,7 +557,7 @@ chunk_t *chunk_get_prev_nc(const chunk_t *cur, scope_e scope) } -chunk_t *chunk_get_next_type(chunk_t *cur, c_token_t type, int level, scope_e scope) +chunk_t *chunk_get_next_type(const chunk_t *cur, c_token_t type, int level, scope_e scope) { return(chunk_search_typelevel(cur, type, scope, direction_e::FORWARD, level)); } @@ -565,7 +569,7 @@ chunk_t *chunk_get_next_str(chunk_t *cur, const char *str, size_t len, int level } -chunk_t *chunk_get_prev_type(chunk_t *cur, c_token_t type, int level, scope_e scope) +chunk_t *chunk_get_prev_type(const chunk_t *cur, c_token_t type, int level, scope_e scope) { return(chunk_search_typelevel(cur, type, scope, direction_e::BACKWARD, level)); } diff --git a/src/chunk_list.h b/src/chunk_list.h index 9d2c86d0d7..33c79a4c9a 100644 --- a/src/chunk_list.h +++ b/src/chunk_list.h @@ -309,7 +309,7 @@ chunk_t *chunk_get_prev_ncnlnpnd(chunk_t *cur, scope_e scope = scope_e::ALL); * * @return nullptr or the match */ -chunk_t *chunk_get_next_type(chunk_t *cur, c_token_t type, int level, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_next_type(const chunk_t *cur, c_token_t type, int level, scope_e scope = scope_e::ALL); /** @@ -322,7 +322,7 @@ chunk_t *chunk_get_next_type(chunk_t *cur, c_token_t type, int level, scope_e sc * * @return nullptr or the match */ -chunk_t *chunk_get_prev_type(chunk_t *cur, c_token_t type, int level, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_prev_type(const chunk_t *cur, c_token_t type, int level, scope_e scope = scope_e::ALL); /** From 3ca7e72d3bf4ad926a2b19a9e098cbefd77fd954 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Fri, 3 Nov 2017 02:26:22 +0100 Subject: [PATCH 098/136] const chunk_search_str --- src/chunk_list.cpp | 22 ++++++++++++---------- src/chunk_list.h | 4 ++-- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/chunk_list.cpp b/src/chunk_list.cpp index af98fcfa69..b2ab33f59f 100644 --- a/src/chunk_list.cpp +++ b/src/chunk_list.cpp @@ -160,7 +160,7 @@ static chunk_t *chunk_get_ncnlnpnd(chunk_t *cur, const scope_e scope = scope_e:: * @retval NULL no chunk found or invalid parameters provided * @retval chunk_t pointer to the found chunk */ -static chunk_t *chunk_search_str(chunk_t *cur, const char *str, size_t len, scope_e scope, direction_e dir, int level); +static chunk_t *chunk_search_str(const chunk_t *cur, const char *str, size_t len, scope_e scope, direction_e dir, int level); /** @@ -282,20 +282,22 @@ static chunk_t *chunk_search_typelevel(const chunk_t *cur, c_token_t type, } -static chunk_t *chunk_search_str(chunk_t *cur, const char *str, size_t len, scope_e scope, direction_e dir, int level) +static chunk_t *chunk_search_str(const chunk_t *cur, const char *str, size_t len, scope_e scope, direction_e dir, int level) { /* * Depending on the parameter dir the search function searches * in forward or backward direction */ search_t search_function = select_search_fct(dir); - chunk_t *pc = cur; - do // loop over the chunk list + // loop over the chunk list + chunk_t *pc = search_function(cur, scope); + + while ( pc != nullptr // the end of the list was not reached yet + && (is_expected_string_and_level(pc, str, level, len) == false)) { - pc = search_function(pc, scope); // in either direction while - } while ( pc != nullptr // the end of the list was not reached yet - && (is_expected_string_and_level(pc, str, level, len) == false)); - return(pc); // the latest chunk is the searched one + pc = search_function(pc, scope); + } + return(pc); // the latest chunk is the searched one or nullptr } @@ -563,7 +565,7 @@ chunk_t *chunk_get_next_type(const chunk_t *cur, c_token_t type, int level, scop } -chunk_t *chunk_get_next_str(chunk_t *cur, const char *str, size_t len, int level, scope_e scope) +chunk_t *chunk_get_next_str(const chunk_t *cur, const char *str, size_t len, int level, scope_e scope) { return(chunk_search_str(cur, str, len, scope, direction_e::FORWARD, level)); } @@ -575,7 +577,7 @@ chunk_t *chunk_get_prev_type(const chunk_t *cur, c_token_t type, int level, scop } -chunk_t *chunk_get_prev_str(chunk_t *cur, const char *str, size_t len, int level, scope_e scope) +chunk_t *chunk_get_prev_str(const chunk_t *cur, const char *str, size_t len, int level, scope_e scope) { return(chunk_search_str(cur, str, len, scope, direction_e::BACKWARD, level)); } diff --git a/src/chunk_list.h b/src/chunk_list.h index 33c79a4c9a..70ada3aafb 100644 --- a/src/chunk_list.h +++ b/src/chunk_list.h @@ -339,7 +339,7 @@ chunk_t *chunk_get_prev_type(const chunk_t *cur, c_token_t type, int level, scop * @retval nullptr no chunk found or invalid parameters provided * @retval chunk_t pointer to the found chunk */ -chunk_t *chunk_get_next_str(chunk_t *cur, const char *str, size_t len, int level, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_next_str(const chunk_t *cur, const char *str, size_t len, int level, scope_e scope = scope_e::ALL); /** @@ -356,7 +356,7 @@ chunk_t *chunk_get_next_str(chunk_t *cur, const char *str, size_t len, int level * @retval nullptr no chunk found or invalid parameters provided * @retval chunk_t pointer to the found chunk */ -chunk_t *chunk_get_prev_str(chunk_t *cur, const char *str, size_t len, int level, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_prev_str(const chunk_t *cur, const char *str, size_t len, int level, scope_e scope = scope_e::ALL); /** From e74dee43a0130b5e8b22b8d2dbf45a97fa426800 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Fri, 3 Nov 2017 02:48:22 +0100 Subject: [PATCH 099/136] const check_t fcns --- src/chunk_list.cpp | 2 +- src/chunk_list.h | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/chunk_list.cpp b/src/chunk_list.cpp index b2ab33f59f..a021a23237 100644 --- a/src/chunk_list.cpp +++ b/src/chunk_list.cpp @@ -37,7 +37,7 @@ enum class direction_e : unsigned int * for a function pointer of type * bool function(chunk_t *pc) */ -typedef bool (*check_t)(chunk_t *pc); +typedef bool (*check_t)(const chunk_t *pc); /** diff --git a/src/chunk_list.h b/src/chunk_list.h index 70ada3aafb..24a9ec6a8c 100644 --- a/src/chunk_list.h +++ b/src/chunk_list.h @@ -486,7 +486,7 @@ static_inline chunk_t *chunk_skip_to_match_rev(chunk_t *cur, scope_e scope = sco * - C comment * - C++ comment */ -static_inline bool chunk_is_comment(chunk_t *pc) +static_inline bool chunk_is_comment(const chunk_t *pc) { return( pc != NULL && ( pc->type == CT_COMMENT @@ -502,7 +502,7 @@ static_inline bool chunk_is_single_line_comment(const chunk_t *pc) } -static_inline bool chunk_is_newline(chunk_t *pc) +static_inline bool chunk_is_newline(const chunk_t *pc) { return( pc != NULL && (pc->type == CT_NEWLINE || pc->type == CT_NL_CONT)); @@ -530,13 +530,13 @@ static_inline bool chunk_is_blank(const chunk_t *pc) //! checks if a chunk is valid and either a comment or newline -static_inline bool chunk_is_comment_or_newline(chunk_t *pc) +static_inline bool chunk_is_comment_or_newline(const chunk_t *pc) { return(chunk_is_comment(pc) || chunk_is_newline(pc)); } -static_inline bool chunk_is_balanced_square(chunk_t *pc) +static_inline bool chunk_is_balanced_square(const chunk_t *pc) { return( pc != NULL && ( pc->type == CT_SQUARE_OPEN @@ -551,7 +551,7 @@ static_inline bool chunk_is_preproc(const chunk_t *pc) } -static_inline bool chunk_is_comment_or_newline_in_preproc(chunk_t *pc) +static_inline bool chunk_is_comment_or_newline_in_preproc(const chunk_t *pc) { return( pc != NULL && chunk_is_preproc(pc) @@ -559,7 +559,7 @@ static_inline bool chunk_is_comment_or_newline_in_preproc(chunk_t *pc) } -static_inline bool chunk_is_comment_newline_or_preproc(chunk_t *pc) +static_inline bool chunk_is_comment_newline_or_preproc(const chunk_t *pc) { return( chunk_is_comment(pc) || chunk_is_newline(pc) @@ -567,7 +567,7 @@ static_inline bool chunk_is_comment_newline_or_preproc(chunk_t *pc) } -static_inline bool chunk_is_comment_newline_or_blank(chunk_t *pc) +static_inline bool chunk_is_comment_newline_or_blank(const chunk_t *pc) { return(chunk_is_comment_or_newline(pc) || chunk_is_blank(pc)); } @@ -710,7 +710,7 @@ static_inline bool chunk_is_opening_brace(const chunk_t *pc) } -static_inline bool chunk_is_vbrace(chunk_t *pc) +static_inline bool chunk_is_vbrace(const chunk_t *pc) { return( pc != NULL && (pc->type == CT_VBRACE_CLOSE || pc->type == CT_VBRACE_OPEN)); From e940d89ebe259a7b0dfaebb06dc13aa8dcff0fb4 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Fri, 3 Nov 2017 05:05:05 +0100 Subject: [PATCH 100/136] const chunk_is_Doxygen_comment --- src/chunk_list.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chunk_list.h b/src/chunk_list.h index 24a9ec6a8c..a0c02b9b02 100644 --- a/src/chunk_list.h +++ b/src/chunk_list.h @@ -573,7 +573,7 @@ static_inline bool chunk_is_comment_newline_or_blank(const chunk_t *pc) } -static_inline bool chunk_is_Doxygen_comment(chunk_t *pc) +static_inline bool chunk_is_Doxygen_comment(const chunk_t *pc) { if (!chunk_is_comment(pc)) { From 1a224de706670db4cba6b5c2aacc497a30d09597 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Fri, 3 Nov 2017 02:56:20 +0100 Subject: [PATCH 101/136] const chunk_get_ncnlnpnd --- src/chunk_list.cpp | 23 +++++++++++++---------- src/chunk_list.h | 2 +- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/chunk_list.cpp b/src/chunk_list.cpp index a021a23237..a3ae6ef51c 100644 --- a/src/chunk_list.cpp +++ b/src/chunk_list.cpp @@ -140,7 +140,7 @@ static chunk_t *chunk_search_typelevel(const chunk_t *cur, c_token_t type, scope static chunk_t *chunk_get_ncnlnp(const chunk_t *cur, const scope_e scope = scope_e::ALL, const direction_e dir = direction_e::FORWARD); -static chunk_t *chunk_get_ncnlnpnd(chunk_t *cur, const scope_e scope = scope_e::ALL, const direction_e dir = direction_e::FORWARD); +static chunk_t *chunk_get_ncnlnpnd(const chunk_t *cur, const scope_e scope = scope_e::ALL, const direction_e dir = direction_e::FORWARD); /** @@ -517,7 +517,7 @@ chunk_t *chunk_get_prev_ncnlnp(const chunk_t *cur, scope_e scope) } -chunk_t *chunk_get_prev_ncnlnpnd(chunk_t *cur, scope_e scope) +chunk_t *chunk_get_prev_ncnlnpnd(const chunk_t *cur, scope_e scope) { return(chunk_get_ncnlnpnd(cur, scope, direction_e::BACKWARD)); } @@ -795,18 +795,21 @@ static chunk_t *chunk_get_ncnlnp(const chunk_t *cur, const scope_e scope, const } -static chunk_t *chunk_get_ncnlnpnd(chunk_t *cur, const scope_e scope, const direction_e dir) +static chunk_t *chunk_get_ncnlnpnd(const chunk_t *cur, const scope_e scope, + const direction_e dir) { search_t search_function = select_search_fct(dir); - chunk_t *pc = cur; - do // loop over the chunk list + // loop over the chunk list + chunk_t *pc = search_function(cur, scope); + + while ( pc != nullptr // the end of the list was not reached yet + && !chunk_is_comment_or_newline(pc) + && !chunk_is_preproc(pc) + && (pc->type == CT_DC_MEMBER)) { - pc = search_function(pc, scope); // in either direction while - } while ( pc != nullptr // the end of the list was not reached yet - && !chunk_is_comment_or_newline(pc) - && !chunk_is_preproc(pc) - && (pc->type == CT_DC_MEMBER)); + pc = search_function(pc, scope); + } return(pc); } diff --git a/src/chunk_list.h b/src/chunk_list.h index a0c02b9b02..2c24d8b5b5 100644 --- a/src/chunk_list.h +++ b/src/chunk_list.h @@ -296,7 +296,7 @@ chunk_t *chunk_get_prev_ncnlnp(const chunk_t *cur, scope_e scope = scope_e::ALL) * @param cur chunk to use as start point * @param scope code region to search in */ -chunk_t *chunk_get_prev_ncnlnpnd(chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_prev_ncnlnpnd(const chunk_t *cur, scope_e scope = scope_e::ALL); /** From 96df76f1b06821670c960028bd2c0d42e913a5b2 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Fri, 3 Nov 2017 03:03:50 +0100 Subject: [PATCH 102/136] const chunk_is_newline_between --- src/chunk_list.cpp | 9 +++++++-- src/chunk_list.h | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/chunk_list.cpp b/src/chunk_list.cpp index a3ae6ef51c..e1fe2a0643 100644 --- a/src/chunk_list.cpp +++ b/src/chunk_list.cpp @@ -583,9 +583,14 @@ chunk_t *chunk_get_prev_str(const chunk_t *cur, const char *str, size_t len, int } -bool chunk_is_newline_between(chunk_t *start, chunk_t *end) +bool chunk_is_newline_between(const chunk_t *start, const chunk_t *end) { - for (chunk_t *pc = start; pc != end; pc = chunk_get_next(pc)) + if (chunk_is_newline(start)) + { + return(true); + } + + for (chunk_t *pc = chunk_get_next(start); pc != end; pc = chunk_get_next(pc)) { if (chunk_is_newline(pc)) { diff --git a/src/chunk_list.h b/src/chunk_list.h index 2c24d8b5b5..f1e77fd88a 100644 --- a/src/chunk_list.h +++ b/src/chunk_list.h @@ -693,7 +693,7 @@ static_inline bool chunk_is_ptr_operator(const chunk_t *pc) //! Check to see if there is a newline between the two chunks -bool chunk_is_newline_between(chunk_t *start, chunk_t *end); +bool chunk_is_newline_between(const chunk_t *start, const chunk_t *end); static_inline bool chunk_is_closing_brace(const chunk_t *pc) From 035e07c88aaabd712bb26ca18eeb043cf7552561 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Fri, 3 Nov 2017 03:27:35 +0100 Subject: [PATCH 103/136] const chunk_first_on_line --- src/chunk_list.cpp | 17 ++++++++++++----- src/chunk_list.h | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/chunk_list.cpp b/src/chunk_list.cpp index e1fe2a0643..602c9c605b 100644 --- a/src/chunk_list.cpp +++ b/src/chunk_list.cpp @@ -608,16 +608,23 @@ void chunk_swap(chunk_t *pc1, chunk_t *pc2) // TODO: the following function shall be made similar to the search functions -chunk_t *chunk_first_on_line(chunk_t *pc) +chunk_t *chunk_first_on_line(const chunk_t *start) { - chunk_t *first = pc; + chunk_t *prev = chunk_get_prev(start); - while ((pc = chunk_get_prev(pc)) != nullptr && !chunk_is_newline(pc)) + if (prev == nullptr || chunk_is_newline(prev)) { - first = pc; + return(const_cast(start)); // can be nullptr } - return(first); + chunk_t *out = prev; + while (prev != nullptr && !chunk_is_newline(prev)) + { + out = prev; + prev = chunk_get_prev(out); + } + + return(out); } diff --git a/src/chunk_list.h b/src/chunk_list.h index f1e77fd88a..19d1e97ea3 100644 --- a/src/chunk_list.h +++ b/src/chunk_list.h @@ -162,7 +162,7 @@ void chunk_swap_lines(chunk_t *pc1, chunk_t *pc2); * * @param pc chunk to start with */ -chunk_t *chunk_first_on_line(chunk_t *pc); +chunk_t *chunk_first_on_line(const chunk_t *pc); //! check if a given chunk is the last on its line From dbd3e672609319d1b71308cca32b3c808173baa3 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Fri, 3 Nov 2017 04:48:55 +0100 Subject: [PATCH 104/136] const chunk_skip_to_match --- src/chunk_list.h | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/chunk_list.h b/src/chunk_list.h index 19d1e97ea3..5209d71f5c 100644 --- a/src/chunk_list.h +++ b/src/chunk_list.h @@ -443,7 +443,7 @@ static_inline bool is_expected_string_and_level(const chunk_t *pc, const char *s */ static_inline chunk_t *chunk_skip_to_match(chunk_t *cur, scope_e scope = scope_e::ALL) { - if ( cur + if ( cur != nullptr && ( cur->type == CT_PAREN_OPEN || cur->type == CT_SPAREN_OPEN || cur->type == CT_FPAREN_OPEN @@ -453,15 +453,17 @@ static_inline chunk_t *chunk_skip_to_match(chunk_t *cur, scope_e scope = scope_e || cur->type == CT_ANGLE_OPEN || cur->type == CT_SQUARE_OPEN)) { - return(chunk_get_next_type(cur, (c_token_t)(cur->type + 1), cur->level, scope)); + //TODO remove dirty enum value hack + return(chunk_get_next_type(cur, static_cast(cur->type + 1), + cur->level, scope)); } - return(cur); + return(const_cast(cur)); } static_inline chunk_t *chunk_skip_to_match_rev(chunk_t *cur, scope_e scope = scope_e::ALL) { - if ( cur + if ( cur != nullptr && ( cur->type == CT_PAREN_CLOSE || cur->type == CT_SPAREN_CLOSE || cur->type == CT_FPAREN_CLOSE @@ -471,9 +473,11 @@ static_inline chunk_t *chunk_skip_to_match_rev(chunk_t *cur, scope_e scope = sco || cur->type == CT_ANGLE_CLOSE || cur->type == CT_SQUARE_CLOSE)) { - return(chunk_get_prev_type(cur, (c_token_t)(cur->type - 1), cur->level, scope)); + //TODO remove dirty enum value hack + return(chunk_get_prev_type(cur, static_cast(cur->type - 1), + cur->level, scope)); } - return(cur); + return(const_cast(cur)); } From 48f8fe38d877c44ed993d292c2d179fd6b0e13c8 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Fri, 3 Nov 2017 15:22:20 +0100 Subject: [PATCH 105/136] const chunk_is_forin --- src/chunk_list.h | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/src/chunk_list.h b/src/chunk_list.h index 5209d71f5c..dd79764bba 100644 --- a/src/chunk_list.h +++ b/src/chunk_list.h @@ -776,29 +776,28 @@ static_inline bool chunk_safe_to_del_nl(const chunk_t *nl) * * @return true - the chunk is the opening parentheses of a for in loop */ -static_inline bool chunk_is_forin(chunk_t *pc) +static_inline bool chunk_is_forin(const chunk_t *pc) { - if ( (cpd.lang_flags & LANG_OC) - && pc - && pc->type == CT_SPAREN_OPEN) + chunk_t *prev = chunk_get_prev_ncnl(pc); + + if ( !(cpd.lang_flags & LANG_OC) + || prev == nullptr + || pc == nullptr + || prev->type != CT_FOR + || pc->type != CT_SPAREN_OPEN) { - chunk_t *prev = chunk_get_prev_ncnl(pc); - if (prev->type == CT_FOR) - { - chunk_t *next = pc; - while ( next - && next->type != CT_SPAREN_CLOSE - && next->type != CT_IN) - { - next = chunk_get_next_ncnl(next); - } - if (next->type == CT_IN) - { - return(true); - } - } + return(false); } - return(false); + + // search CT_IN token between the two 'for' parenthesis + chunk_t *next = chunk_get_next_ncnl(pc); + for ( ; ( next != nullptr + && next->type != CT_IN + && next->type != CT_SPAREN_CLOSE) + ; next = chunk_get_next_ncnl(next)) + { + } + return((next != nullptr && next->type == CT_IN) ? true : false); } From dc279359cb2d4939bf2f9129652cbee5678daacc Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Thu, 9 Nov 2017 19:51:54 +0100 Subject: [PATCH 106/136] add missing const to chunk_skip_to_match --- src/chunk_list.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chunk_list.h b/src/chunk_list.h index dd79764bba..05a470259d 100644 --- a/src/chunk_list.h +++ b/src/chunk_list.h @@ -441,7 +441,7 @@ static_inline bool is_expected_string_and_level(const chunk_t *pc, const char *s * * @return nullptr or the matching paren/brace/square */ -static_inline chunk_t *chunk_skip_to_match(chunk_t *cur, scope_e scope = scope_e::ALL) +static_inline chunk_t *chunk_skip_to_match(const chunk_t *cur, scope_e scope = scope_e::ALL) { if ( cur != nullptr && ( cur->type == CT_PAREN_OPEN @@ -461,7 +461,7 @@ static_inline chunk_t *chunk_skip_to_match(chunk_t *cur, scope_e scope = scope_e } -static_inline chunk_t *chunk_skip_to_match_rev(chunk_t *cur, scope_e scope = scope_e::ALL) +static_inline chunk_t *chunk_skip_to_match_rev(const chunk_t *cur, scope_e scope = scope_e::ALL) { if ( cur != nullptr && ( cur->type == CT_PAREN_CLOSE From b3b5d73aa1f631d3cdc77f015cec41276bb52ea1 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Thu, 9 Nov 2017 20:12:19 +0100 Subject: [PATCH 107/136] change cpd.filename type to std::string fixes coverity 143053 --- src/brace_cleanup.cpp | 16 +++++++++------- src/combine.cpp | 4 ++-- src/indent.cpp | 2 +- src/options.cpp | 19 ++++++++++--------- src/output.cpp | 2 +- src/tokenize.cpp | 7 ++++--- src/tokenize_cleanup.cpp | 4 ++-- src/unc_tools.cpp | 4 ++-- src/uncrustify.cpp | 17 +++++++++-------- src/uncrustify_types.h | 2 +- 10 files changed, 41 insertions(+), 36 deletions(-) diff --git a/src/brace_cleanup.cpp b/src/brace_cleanup.cpp index 10c2f506ac..060864e3cf 100644 --- a/src/brace_cleanup.cpp +++ b/src/brace_cleanup.cpp @@ -265,7 +265,7 @@ static void push_fmr_pse(parse_frame_t *frm, chunk_t *pc, else { LOG_FMT(LWARN, "%s:%d Error: Frame stack overflow, Unable to properly process this file.\n", - cpd.filename, cpd.line_number); + cpd.filename.c_str(), cpd.line_number); cpd.error_count++; } } @@ -432,8 +432,8 @@ static void parse_cleanup(parse_frame_t *frm, chunk_t *pc) && (frm->pse[frm->pse_tos].type != CT_PP_DEFINE)) { LOG_FMT(LWARN, "%s(%d): %s, orig_line is %zu, Error: Unexpected '%s' for '%s', which was on line %zu\n", - __func__, __LINE__, cpd.filename, pc->orig_line, pc->text(), - get_token_name(frm->pse[frm->pse_tos].pc->type), + __func__, __LINE__, cpd.filename.c_str(), pc->orig_line, + pc->text(), get_token_name(frm->pse[frm->pse_tos].pc->type), frm->pse[frm->pse_tos].pc->orig_line); print_stack(LBCSPOP, "=Error ", frm, pc); cpd.error_count++; @@ -504,7 +504,8 @@ static void parse_cleanup(parse_frame_t *frm, chunk_t *pc) else { LOG_FMT(LWARN, "%s: %s(%d): %zu: Error: Expected a semicolon for WHILE_OF_DO, but got '%s'\n", - cpd.filename, __func__, __LINE__, pc->orig_line, get_token_name(pc->type)); + cpd.filename.c_str(), __func__, __LINE__, pc->orig_line, + get_token_name(pc->type)); cpd.error_count++; } handle_complex_close(frm, pc); @@ -831,7 +832,8 @@ static bool check_complex_statements(parse_frame_t *frm, chunk_t *pc) } LOG_FMT(LWARN, "%s(%d): %s, orig_line is %zu, Error: Expected 'while', got '%s'\n", - __func__, __LINE__, cpd.filename, pc->orig_line, pc->text()); + __func__, __LINE__, cpd.filename.c_str(), pc->orig_line, + pc->text()); frm->pse_tos--; print_stack(LBCSPOP, "-Error ", frm, pc); cpd.error_count++; @@ -882,7 +884,7 @@ static bool check_complex_statements(parse_frame_t *frm, chunk_t *pc) || (frm->pse[frm->pse_tos].stage == brace_stage_e::WOD_PAREN))) { LOG_FMT(LWARN, "%s(%d): %s, orig_line is %zu, Error: Expected '(', got '%s' for '%s'\n", - __func__, __LINE__, cpd.filename, pc->orig_line, pc->text(), + __func__, __LINE__, cpd.filename.c_str(), pc->orig_line, pc->text(), get_token_name(frm->pse[frm->pse_tos].type)); // Throw out the complex statement @@ -990,7 +992,7 @@ static bool handle_complex_close(parse_frame_t *frm, chunk_t *pc) { // PROBLEM LOG_FMT(LWARN, "%s(%d): %s:%zu Error: TOS.type='%s' TOS.stage=%u\n", - __func__, __LINE__, cpd.filename, pc->orig_line, + __func__, __LINE__, cpd.filename.c_str(), pc->orig_line, get_token_name(frm->pse[frm->pse_tos].type), (unsigned int)frm->pse[frm->pse_tos].stage); cpd.error_count++; diff --git a/src/combine.cpp b/src/combine.cpp index 588473b3f8..ac826184c6 100644 --- a/src/combine.cpp +++ b/src/combine.cpp @@ -3260,7 +3260,7 @@ void combine_labels(void) else { LOG_FMT(LWARN, "%s:%zu unexpected colon in col %zu n-parent=%s c-parent=%s l=%zu bl=%zu\n", - cpd.filename, next->orig_line, next->orig_col, + cpd.filename.c_str(), next->orig_line, next->orig_col, get_token_name(next->parent_type), get_token_name(cur->parent_type), next->level, next->brace_level); @@ -4584,7 +4584,7 @@ static void mark_cpp_constructor(chunk_t *pc) if (!chunk_is_str(paren_open, "(", 1)) { LOG_FMT(LWARN, "%s:%zu Expected '(', got: [%s]\n", - cpd.filename, paren_open->orig_line, + cpd.filename.c_str(), paren_open->orig_line, paren_open->text()); return; } diff --git a/src/indent.cpp b/src/indent.cpp index 63045bd66a..080303030f 100644 --- a/src/indent.cpp +++ b/src/indent.cpp @@ -2607,7 +2607,7 @@ void indent_text(void) for (size_t idx_temp = 1; idx_temp <= frm.pse_tos; idx_temp++) { LOG_FMT(LWARN, "%s:%zu Unmatched %s\n", - cpd.filename, frm.pse[idx_temp].open_line, + cpd.filename.c_str(), frm.pse[idx_temp].open_line, get_token_name(frm.pse[idx_temp].type)); cpd.error_count++; } diff --git a/src/options.cpp b/src/options.cpp index 178c3f5a08..6f58cd195a 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -1788,7 +1788,7 @@ static void convert_value(const option_map_value *entry, const char *val, op_val if (strcasecmp(val, "AUTO") != 0) { fprintf(stderr, "convert_value: %s:%d Expected 'Auto', 'LF', 'CRLF', or 'CR' for %s, got '%s'\n", - cpd.filename, cpd.line_number, entry->name, val); + cpd.filename.c_str(), cpd.line_number, entry->name, val); log_flush(true); cpd.error_count++; } @@ -1837,7 +1837,7 @@ static void convert_value(const option_map_value *entry, const char *val, op_val { fprintf(stderr, "convert_value: %s:%d Expected 'Ignore', 'Join', 'Lead', 'Lead_Brake', " "'Lead_Force', 'Trail', 'Trail_Break', 'Trail_Force' for %s, got '%s'\n", - cpd.filename, cpd.line_number, entry->name, val); + cpd.filename.c_str(), cpd.line_number, entry->name, val); log_flush(true); cpd.error_count++; } @@ -1855,7 +1855,7 @@ static void convert_value(const option_map_value *entry, const char *val, op_val if (entry->type == AT_UNUM && (*val == '-')) { fprintf(stderr, "%s:%d\n for the option '%s' is a negative value not possible: %s", - cpd.filename, cpd.line_number, entry->name, val); + cpd.filename.c_str(), cpd.line_number, entry->name, val); log_flush(true); exit(EX_CONFIG); } @@ -1882,7 +1882,7 @@ static void convert_value(const option_map_value *entry, const char *val, op_val if (tmp == nullptr) { fprintf(stderr, "%s:%d\n for the assignment: unknown option '%s':", - cpd.filename, cpd.line_number, val); + cpd.filename.c_str(), cpd.line_number, val); log_flush(true); exit(EX_CONFIG); } @@ -1915,13 +1915,13 @@ static void convert_value(const option_map_value *entry, const char *val, op_val return; } fprintf(stderr, "%s:%d\n for the assignment: option '%s' could not have negative value %ld", - cpd.filename, cpd.line_number, entry->name, tmp_val); + cpd.filename.c_str(), cpd.line_number, entry->name, tmp_val); log_flush(true); exit(EX_CONFIG); } fprintf(stderr, "%s:%d\n for the assignment: expected type for %s is %s, got %s\n", - cpd.filename, cpd.line_number, + cpd.filename.c_str(), cpd.line_number, entry->name, get_argtype_name(entry->type), get_argtype_name(tmp->type)); log_flush(true); exit(EX_CONFIG); @@ -1960,7 +1960,7 @@ static void convert_value(const option_map_value *entry, const char *val, op_val } fprintf(stderr, "convert_value: %s:%d Expected 'True' or 'False' for %s, got '%s'\n", - cpd.filename, cpd.line_number, entry->name, val); + cpd.filename.c_str(), cpd.line_number, entry->name, val); log_flush(true); cpd.error_count++; dest->b = false; @@ -2000,7 +2000,8 @@ static void convert_value(const option_map_value *entry, const char *val, op_val } fprintf(stderr, "%s(%d): %s:%d Expected 'True' or 'False' or 'Ignore' for %s, got '%s'\n", - __func__, __LINE__, cpd.filename, cpd.line_number, entry->name, val); + __func__, __LINE__, cpd.filename.c_str(), cpd.line_number, + entry->name, val); log_flush(true); cpd.error_count++; dest->tfi = TFI_FALSE; @@ -2035,7 +2036,7 @@ static void convert_value(const option_map_value *entry, const char *val, op_val return; } fprintf(stderr, "convert_value: %s:%d Expected 'Add', 'Remove', 'Force', or 'Ignore' for %s, got '%s'\n", - cpd.filename, cpd.line_number, entry->name, val); + cpd.filename.c_str(), cpd.line_number, entry->name, val); log_flush(true); cpd.error_count++; dest->a = AV_IGNORE; diff --git a/src/output.cpp b/src/output.cpp index 6772b12416..2e10b893e3 100644 --- a/src/output.cpp +++ b/src/output.cpp @@ -1614,7 +1614,7 @@ static void output_comment_multi(chunk_t *pc) static bool kw_fcn_filename(chunk_t *cmt, unc_text &out_txt) { UNUSED(cmt); - out_txt.append(path_basename(cpd.filename)); + out_txt.append(path_basename(cpd.filename.c_str())); return(true); } diff --git a/src/tokenize.cpp b/src/tokenize.cpp index 7a7c11ca7e..02b20a531e 100644 --- a/src/tokenize.cpp +++ b/src/tokenize.cpp @@ -1117,7 +1117,8 @@ static bool parse_cs_string(tok_ctx &ctx, chunk_t &pc) * a tab char can't be replaced with \\t because escapes don't * work in here-strings. best we can do is warn. */ - LOG_FMT(warnlevel, "%s:%zu Detected non-replaceable tab char in literal string\n", cpd.filename, pc.orig_line); + LOG_FMT(warnlevel, "%s:%zu Detected non-replaceable tab char in literal string\n", + cpd.filename.c_str(), pc.orig_line); if (warnlevel < LWARN) { cpd.error_count++; @@ -1921,7 +1922,7 @@ static bool parse_next(tok_ctx &ctx, chunk_t &pc) pc.str.append(ctx.get()); LOG_FMT(LWARN, "%s:%zu Garbage in col %d: %x\n", - cpd.filename, pc.orig_line, (int)ctx.c.col, pc.str[0]); + cpd.filename.c_str(), pc.orig_line, (int)ctx.c.col, pc.str[0]); cpd.error_count++; return(true); } // parse_next @@ -1944,7 +1945,7 @@ void tokenize(const deque &data, chunk_t *ref) if (!parse_next(ctx, chunk)) { LOG_FMT(LERR, "%s:%zu Bailed before the end?\n", - cpd.filename, ctx.c.row); + cpd.filename.c_str(), ctx.c.row); cpd.error_count++; break; } diff --git a/src/tokenize_cleanup.cpp b/src/tokenize_cleanup.cpp index 9c678c30e2..a70e225554 100644 --- a/src/tokenize_cleanup.cpp +++ b/src/tokenize_cleanup.cpp @@ -153,7 +153,7 @@ void tokenize_cleanup(void) && !chunk_get_next_ncnl(pc, scope_e::PREPROC)) { LOG_FMT(LNOTE, "%s(%d): %s:%zu Detected a macro that ends with a semicolon. Possible failures if used.\n", - __func__, __LINE__, cpd.filename, pc->orig_line); + __func__, __LINE__, cpd.filename.c_str(), pc->orig_line); } } @@ -184,7 +184,7 @@ void tokenize_cleanup(void) if (next->type != CT_ASSIGN) { LOG_FMT(LERR, "%s(%d): %s:%zu: version: Unexpected token %s\n", - __func__, __LINE__, cpd.filename, pc->orig_line, get_token_name(next->type)); + __func__, __LINE__, cpd.filename.c_str(), pc->orig_line, get_token_name(next->type)); cpd.error_count++; } set_chunk_type(pc, CT_WORD); diff --git a/src/unc_tools.cpp b/src/unc_tools.cpp index de6cdeed50..c08dceec7d 100644 --- a/src/unc_tools.cpp +++ b/src/unc_tools.cpp @@ -162,7 +162,7 @@ void dump_out(unsigned int type) if (cpd.dumped_file == nullptr) { - sprintf(dumpFileName, "%s.%u", cpd.filename, type); + sprintf(dumpFileName, "%s.%u", cpd.filename.c_str(), type); } else { @@ -233,7 +233,7 @@ void dump_in(unsigned int type) if (cpd.dumped_file == nullptr) { - sprintf(dumpFileName, "%s.%u", cpd.filename, type); + sprintf(dumpFileName, "%s.%u", cpd.filename.c_str(), type); } else { diff --git a/src/uncrustify.cpp b/src/uncrustify.cpp index 8f07bcabb2..48ec87105e 100644 --- a/src/uncrustify.cpp +++ b/src/uncrustify.cpp @@ -573,8 +573,8 @@ int main(int argc, char *argv[]) */ if (!cfg_file.empty()) { - cpd.filename = cfg_file.c_str(); - if (load_option_file(cpd.filename) < 0) + cpd.filename = cfg_file; + if (load_option_file(cpd.filename.c_str()) < 0) { usage_exit("Unable to load the config file", argv[0], EX_IOERR); } @@ -1025,7 +1025,7 @@ static int load_mem_file_config(const char *filename, file_mem &fm) char buf[1024]; snprintf(buf, sizeof(buf), "%.*s%s", - path_dirname_len(cpd.filename), cpd.filename, filename); + path_dirname_len(cpd.filename.c_str()), cpd.filename.c_str(), filename); retval = load_mem_file(buf, fm); if (retval < 0) @@ -1186,8 +1186,8 @@ static bool bout_content_matches(const file_mem &fm, bool report_status) if (report_status) { fprintf(stderr, "FAIL: %s (File size changed from %u to %u)\n", - cpd.filename, - static_cast(fm.raw.size()), static_cast(cpd.bout->size())); + cpd.filename.c_str(), static_cast(fm.raw.size()), + static_cast(cpd.bout->size())); log_flush(true); } is_same = false; @@ -1201,7 +1201,7 @@ static bool bout_content_matches(const file_mem &fm, bool report_status) if (report_status) { fprintf(stderr, "FAIL: %s (Difference at byte %u)\n", - cpd.filename, idx); + cpd.filename.c_str(), idx); log_flush(true); } is_same = false; @@ -1211,7 +1211,8 @@ static bool bout_content_matches(const file_mem &fm, bool report_status) } if (is_same && report_status) { - fprintf(stdout, "PASS: %s (%u bytes)\n", cpd.filename, static_cast(fm.raw.size())); + fprintf(stdout, "PASS: %s (%u bytes)\n", + cpd.filename.c_str(), static_cast(fm.raw.size())); } return(is_same); @@ -1723,7 +1724,7 @@ void uncrustify_file(const file_mem &fm, FILE *pfout, if (data[idx] == 0) { LOG_FMT(LERR, "An embedded 0 was found in '%s' %zu:%zu.\n", - cpd.filename, count_line, count_column); + cpd.filename.c_str(), count_line, count_column); LOG_FMT(LERR, "The file may be encoded in an unsupported Unicode format.\n"); LOG_FMT(LERR, "Aborting.\n"); cpd.error_count++; diff --git a/src/uncrustify_types.h b/src/uncrustify_types.h index 1b266ce363..2eb16af9a3 100644 --- a/src/uncrustify_types.h +++ b/src/uncrustify_types.h @@ -424,7 +424,7 @@ struct cp_data_t bool if_changed; UINT32 error_count; //! counts how many errors occurred so far - const char *filename; + std::string filename; file_mem file_hdr; // for cmt_insert_file_header file_mem file_ftr; // for cmt_insert_file_footer From b175d76626c68be19ea0f1045f83e66fedd80bdb Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Thu, 9 Nov 2017 20:14:33 +0100 Subject: [PATCH 108/136] remove dead code fixes 178911 --- src/combine.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/combine.cpp b/src/combine.cpp index ac826184c6..fbcbc0c901 100644 --- a/src/combine.cpp +++ b/src/combine.cpp @@ -2699,11 +2699,6 @@ static void fix_enum_struct_union(chunk_t *pc) set_chunk_parent(next, pc->type); // next up is either a colon, open brace, or open parenthesis (pawn) - if (!next) - { - return; - } - if ((cpd.lang_flags & LANG_PAWN) && next->type == CT_PAREN_OPEN) { next = set_paren_parent(next, CT_ENUM); From 451520e546f2fbbaec88c79f52d776612565c89d Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Thu, 9 Nov 2017 20:23:36 +0100 Subject: [PATCH 109/136] remove dead code fixes coverity 178902 --- src/combine.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/combine.cpp b/src/combine.cpp index fbcbc0c901..400eb0b92b 100644 --- a/src/combine.cpp +++ b/src/combine.cpp @@ -3755,10 +3755,6 @@ static bool can_be_full_param(chunk_t *start, chunk_t *end) { return(false); } - if (tmp2 == nullptr) - { - return(false); - } if (chunk_is_str(tmp1, "(", 1)) { tmp3 = chunk_skip_to_match(tmp1, scope_e::PREPROC); From 27a426b740d98a2e05d4de10a54abd03ccc9b41d Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Thu, 9 Nov 2017 20:25:10 +0100 Subject: [PATCH 110/136] remove dead code fixes coverity 178901 --- src/combine.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/combine.cpp b/src/combine.cpp index 400eb0b92b..04ec2561e1 100644 --- a/src/combine.cpp +++ b/src/combine.cpp @@ -574,10 +574,6 @@ static chunk_t *flag_parens(chunk_t *po, UINT64 flags, c_token_t opentype, pc != nullptr && pc != paren_close; pc = chunk_get_next(pc, scope_e::PREPROC)) { - if (pc == nullptr) - { - return(nullptr); - } chunk_flags_set(pc, flags); if (parent_all) { From 1823ab94e3232b5090a8bbc6bc16bd4a294ef46a Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Thu, 9 Nov 2017 20:30:38 +0100 Subject: [PATCH 111/136] fix nullptr dereference fixes coverity 76018 --- src/combine.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/combine.cpp b/src/combine.cpp index 04ec2561e1..066197f97f 100644 --- a/src/combine.cpp +++ b/src/combine.cpp @@ -3800,7 +3800,8 @@ static bool can_be_full_param(chunk_t *start, chunk_t *end) || (word_cnt == 1 && type_count == 1)); LOG_FMT(LFPARAM, " <== [%s] %s!\n", - get_token_name(pc->type), ret ? "Yup" : "Unlikely"); + (pc == nullptr ? "nullptr" : get_token_name(pc->type)), + ret ? "Yup" : "Unlikely"); return(ret); } // can_be_full_param From 5eaf60224d3e8383849631e66f352fd6c8d0a232 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Thu, 9 Nov 2017 21:03:29 +0100 Subject: [PATCH 112/136] fix nullptr dereference fixes coverity 160946 --- src/combine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/combine.cpp b/src/combine.cpp index 066197f97f..bacdd570dd 100644 --- a/src/combine.cpp +++ b/src/combine.cpp @@ -6157,7 +6157,7 @@ static void handle_oc_property_decl(chunk_t *os) } while ( next && next->type != CT_COMMA && next->type != CT_PAREN_CLOSE); - next = next->prev; + next = chunk_get_prev(next); if (next == nullptr) { break; From c5eeb3a62a0966a5c88b2e350ac6b65412550bc0 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Thu, 9 Nov 2017 21:19:19 +0100 Subject: [PATCH 113/136] fix nullptr dereference fixes coverity 178902 --- src/newlines.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/newlines.cpp b/src/newlines.cpp index 454e9db652..0a90957922 100644 --- a/src/newlines.cpp +++ b/src/newlines.cpp @@ -2222,6 +2222,7 @@ static void newline_func_def_or_call(chunk_t *start) { tmp = start; } + if (prev != nullptr && prev->type == CT_DC_MEMBER) { if (cpd.settings[UO_nl_func_scope_name].a != AV_IGNORE) @@ -2230,7 +2231,8 @@ static void newline_func_def_or_call(chunk_t *start) } } - if (chunk_get_next_ncnl(prev)->type != CT_FUNC_CLASS_DEF) + const chunk_t *tmp_next = chunk_get_next_ncnl(prev); + if (tmp_next != nullptr && tmp_next->type != CT_FUNC_CLASS_DEF) { argval_t a = (tmp->parent_type == CT_FUNC_PROTO) ? cpd.settings[UO_nl_func_proto_type_name].a : @@ -2241,13 +2243,14 @@ static void newline_func_def_or_call(chunk_t *start) a = cpd.settings[UO_nl_func_type_name_class].a; } - if (a != AV_IGNORE) + if (a != AV_IGNORE && prev != nullptr) { LOG_FMT(LNFD, "%s(%d): prev %zu:%zu '%s' [%s/%s]\n", __func__, __LINE__, prev->orig_line, prev->orig_col, - prev->text(), get_token_name(prev->type), get_token_name(prev->parent_type)); + prev->text(), get_token_name(prev->type), + get_token_name(prev->parent_type)); - if (prev != nullptr && prev->type == CT_DESTRUCTOR) + if (prev->type == CT_DESTRUCTOR) { prev = chunk_get_prev_ncnl(prev); } From db3528ca778fc5048cec68c05aa63a6355c4c7a1 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Thu, 9 Nov 2017 21:22:17 +0100 Subject: [PATCH 114/136] fix nullptr dereference fixes coverity 178903 --- src/combine.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/combine.cpp b/src/combine.cpp index bacdd570dd..2e4fa2a82d 100644 --- a/src/combine.cpp +++ b/src/combine.cpp @@ -3809,6 +3809,10 @@ static bool can_be_full_param(chunk_t *start, chunk_t *end) static void mark_function(chunk_t *pc) { LOG_FUNC_ENTRY(); + if (pc == nullptr) + { + return; + } LOG_FMT(LFCN, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s'\n", __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text()); From c5c254f326cac015e36629e6e9dfc133a20f55e6 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Thu, 9 Nov 2017 21:25:53 +0100 Subject: [PATCH 115/136] fix nullptr dereference fixes coverity 178905 --- src/braces.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/braces.cpp b/src/braces.cpp index 636fa58b80..a23a667153 100644 --- a/src/braces.cpp +++ b/src/braces.cpp @@ -559,8 +559,13 @@ static void examine_brace(chunk_t *bopen) { next = chunk_get_next_ncnl(next); } - LOG_FMT(LBRDEL, " next is '%s'\n", get_token_name(next->type)); + + if (next != nullptr) + { + LOG_FMT(LBRDEL, " next is '%s'\n", get_token_name(next->type)); + } if ( if_count > 0 + && next != nullptr && (next->type == CT_ELSE || next->type == CT_ELSEIF)) { LOG_FMT(LBRDEL, " bailed on because 'else' is next and %zu ifs\n", if_count); From 3fd221a72d31cb241beca34af72c23ad91ccb3f9 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Thu, 9 Nov 2017 21:29:50 +0100 Subject: [PATCH 116/136] temporarily remove dead code fixes coverity 178906 --- src/combine.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/combine.cpp b/src/combine.cpp index 2e4fa2a82d..d1e4c0a0fe 100644 --- a/src/combine.cpp +++ b/src/combine.cpp @@ -5227,10 +5227,10 @@ static void handle_d_template(chunk_t *pc) set_chunk_type(tmp, CT_TYPE); } } - if (tmp->type != CT_BRACE_CLOSE) - { - // TODO: log an error, expected '}' - } +// if (!chunk_is_token(tmp, CT_BRACE_CLOSE)) +// { +// // TODO: log an error, expected '}' +// } set_chunk_parent(tmp, CT_TEMPLATE); } // handle_d_template From 59feb60be57c991edc2e713f17f6458adbf61b7e Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Thu, 9 Nov 2017 21:32:13 +0100 Subject: [PATCH 117/136] remove dead code fixes coverity 178907 --- src/combine.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/combine.cpp b/src/combine.cpp index d1e4c0a0fe..60053c31ce 100644 --- a/src/combine.cpp +++ b/src/combine.cpp @@ -646,10 +646,6 @@ static void flag_asm(chunk_t *pc) tmp != nullptr && tmp != end; tmp = chunk_get_next_ncnl(tmp, scope_e::PREPROC)) { - if (tmp == nullptr) - { - return; - } if (tmp->type == CT_COLON) { set_chunk_type(tmp, CT_ASM_COLON); From a68e9901878c65f601cb89a18682b701e0a60b47 Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Fri, 10 Nov 2017 19:09:42 +0100 Subject: [PATCH 118/136] Reorder the cases --- src/options.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/options.cpp b/src/options.cpp index 178c3f5a08..e7c0747c00 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -2563,9 +2563,6 @@ string argtype_to_string(argtype_e argtype) case AT_NUM: return("number"); - case AT_UNUM: - return("unsigned number"); - case AT_LINE: return("auto/lf/crlf/cr"); @@ -2575,6 +2572,9 @@ string argtype_to_string(argtype_e argtype) case AT_STRING: return("string"); + case AT_UNUM: + return("unsigned number"); + case AT_TFI: return("false/true/ignore"); @@ -2599,9 +2599,6 @@ const char *get_argtype_name(argtype_e argtype) case AT_NUM: return("AT_NUM"); - case AT_UNUM: - return("AT_UNUM"); - case AT_LINE: return("AT_LINE"); @@ -2611,6 +2608,9 @@ const char *get_argtype_name(argtype_e argtype) case AT_STRING: return("AT_STRING"); + case AT_UNUM: + return("AT_UNUM"); + case AT_TFI: return("AT_TFI"); From 353e5c3e6371ca486c18f1027e59a7851f070c9a Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Sat, 11 Nov 2017 00:01:09 +0100 Subject: [PATCH 119/136] Revert const chunk_list PRs reverts PR #1425 and #1430 While it seemed like making the params in in the chunk_list functions const would be a good idea, it can actually lead to catastrophic bugs. See how this simple example circumvents the constness: struct chunk_t { chunk_t* next; chunk_t* prev; static chunk_t* getNext(const chunk_t* e){ return e->next;} static chunk_t* getPrev(const chunk_t* e){ return e->prev;} static chunk_t* broken(const chunk_t* e) { chunk_t* m = getPrev(e); m = getNext(m); m->prev = nullptr; m->next = nullptr; return m->prev; } }; Note: here m = e Debugging this in a real function can easily turn into a nightmare. Reverted commits (ordered): dc279359cb2d4939bf2f9129652cbee5678daacc 48f8fe38d877c44ed993d292c2d179fd6b0e13c8 dbd3e672609319d1b71308cca32b3c808173baa3 035e07c88aaabd712bb26ca18eeb043cf7552561 96df76f1b06821670c960028bd2c0d42e913a5b2 1a224de706670db4cba6b5c2aacc497a30d09597 e940d89ebe259a7b0dfaebb06dc13aa8dcff0fb4 e74dee43a0130b5e8b22b8d2dbf45a97fa426800 3ca7e72d3bf4ad926a2b19a9e098cbefd77fd954 95bae3bf1e54b50ff091950aab5a7c5d94fb1e88 6e22ab4d4ab722a6f24a82b58899e4d4f787b44c 928b60c99a5d6911e3e3c058173b8332b7586f6b 88323ced8bec06a3fd34771b5e0f55c11967f647 7b0377116a305d2464b9aaeffd77e5e4f17f2f65 5d873824b9d3085dd5e1d4782bbb97a36475c785 --- src/ListManager.h | 8 +- src/chunk_list.cpp | 209 +++++++++++++++++++++------------------------ src/chunk_list.h | 173 ++++++++++++++++++------------------- 3 files changed, 185 insertions(+), 205 deletions(-) diff --git a/src/ListManager.h b/src/ListManager.h index 7916f2eb6c..b91d047cb0 100644 --- a/src/ListManager.h +++ b/src/ListManager.h @@ -45,7 +45,7 @@ template class ListManager * * @return pointer to first element or nullptr if list is empty */ - T *GetHead() const + T *GetHead() { return(first); } @@ -56,7 +56,7 @@ template class ListManager * * @return pointer to last element or nullptr if list is empty */ - T *GetTail() const + T *GetTail() { return(last); } @@ -69,7 +69,7 @@ template class ListManager * * @return pointer to next element or nullptr if no next element exists */ - T *GetNext(const T *ref) + T *GetNext(T *ref) { return((ref != NULL) ? ref->next : NULL); } @@ -82,7 +82,7 @@ template class ListManager * * @return pointer to previous element or nullptr if no previous element exists */ - T *GetPrev(const T *ref) + T *GetPrev(T *ref) { return((ref != NULL) ? ref->prev : NULL); } diff --git a/src/chunk_list.cpp b/src/chunk_list.cpp index 602c9c605b..3af8af7ef1 100644 --- a/src/chunk_list.cpp +++ b/src/chunk_list.cpp @@ -37,7 +37,7 @@ enum class direction_e : unsigned int * for a function pointer of type * bool function(chunk_t *pc) */ -typedef bool (*check_t)(const chunk_t *pc); +typedef bool (*check_t)(chunk_t *pc); /** @@ -47,7 +47,7 @@ typedef bool (*check_t)(const chunk_t *pc); * for a function pointer of type * chunk_t *function(chunk_t *cur, nav_t scope) */ -typedef chunk_t * (*search_t)(const chunk_t *cur, scope_e scope); +typedef chunk_t * (*search_t)(chunk_t *cur, scope_e scope); /** @@ -74,10 +74,10 @@ typedef chunk_t * (*search_t)(const chunk_t *cur, scope_e scope); * @retval nullptr no requested chunk was found or invalid parameters provided * @retval chunk_t pointer to the found chunk */ -static chunk_t *chunk_search(const chunk_t *cur, const check_t check_fct, const scope_e scope = scope_e::ALL, const direction_e dir = direction_e::FORWARD, const bool cond = true); +static chunk_t *chunk_search(chunk_t *cur, const check_t check_fct, const scope_e scope = scope_e::ALL, const direction_e dir = direction_e::FORWARD, const bool cond = true); -static void chunk_log(const chunk_t *pc, const char *text); +static void chunk_log(chunk_t *pc, const char *text); /* @@ -101,7 +101,7 @@ static void chunk_log(const chunk_t *pc, const char *text); * @retval nullptr no chunk found or invalid parameters provided * @retval chunk_t pointer to the found chunk */ -static chunk_t *chunk_search_type(const chunk_t *cur, const c_token_t type, const scope_e scope = scope_e::ALL, const direction_e dir = direction_e::FORWARD); +static chunk_t *chunk_search_type(chunk_t *cur, const c_token_t type, const scope_e scope = scope_e::ALL, const direction_e dir = direction_e::FORWARD); /** @@ -121,7 +121,7 @@ static chunk_t *chunk_search_type(const chunk_t *cur, const c_token_t type, cons * @retval nullptr no chunk found or invalid parameters provided * @retval chunk_t pointer to the found chunk */ -static chunk_t *chunk_search_typelevel(const chunk_t *cur, c_token_t type, scope_e scope = scope_e::ALL, direction_e dir = direction_e::FORWARD, int level = -1); +static chunk_t *chunk_search_typelevel(chunk_t *cur, c_token_t type, scope_e scope = scope_e::ALL, direction_e dir = direction_e::FORWARD, int level = -1); /** @@ -137,10 +137,10 @@ static chunk_t *chunk_search_typelevel(const chunk_t *cur, c_token_t type, scope * @retval nullptr no chunk found or invalid parameters provided * @retval chunk_t pointer to the found chunk */ -static chunk_t *chunk_get_ncnlnp(const chunk_t *cur, const scope_e scope = scope_e::ALL, const direction_e dir = direction_e::FORWARD); +static chunk_t *chunk_get_ncnlnp(chunk_t *cur, const scope_e scope = scope_e::ALL, const direction_e dir = direction_e::FORWARD); -static chunk_t *chunk_get_ncnlnpnd(const chunk_t *cur, const scope_e scope = scope_e::ALL, const direction_e dir = direction_e::FORWARD); +static chunk_t *chunk_get_ncnlnpnd(chunk_t *cur, const scope_e scope = scope_e::ALL, const direction_e dir = direction_e::FORWARD); /** @@ -160,7 +160,7 @@ static chunk_t *chunk_get_ncnlnpnd(const chunk_t *cur, const scope_e scope = sco * @retval NULL no chunk found or invalid parameters provided * @retval chunk_t pointer to the found chunk */ -static chunk_t *chunk_search_str(const chunk_t *cur, const char *str, size_t len, scope_e scope, direction_e dir, int level); +static chunk_t *chunk_search_str(chunk_t *cur, const char *str, size_t len, scope_e scope, direction_e dir, int level); /** @@ -211,19 +211,19 @@ static search_t select_search_fct(const direction_e dir) } -chunk_t *chunk_search_prev_cat(const chunk_t *pc, const c_token_t cat) +chunk_t *chunk_search_prev_cat(chunk_t *pc, const c_token_t cat) { return(chunk_search_type(pc, cat, scope_e::ALL, direction_e::BACKWARD)); } -chunk_t *chunk_search_next_cat(const chunk_t *pc, const c_token_t cat) +chunk_t *chunk_search_next_cat(chunk_t *pc, const c_token_t cat) { return(chunk_search_type(pc, cat, scope_e::ALL, direction_e::FORWARD)); } -static chunk_t *chunk_search_type(const chunk_t *cur, const c_token_t type, +static chunk_t *chunk_search_type(chunk_t *cur, const c_token_t type, const scope_e scope, const direction_e dir) { /* @@ -231,37 +231,29 @@ static chunk_t *chunk_search_type(const chunk_t *cur, const c_token_t type, * in forward or backward direction */ search_t search_function = select_search_fct(dir); + chunk_t *pc = cur; - // loop over the chunk list - chunk_t *pc = search_function(cur, scope); - - while ( pc != nullptr // the end of the list was not reached - && pc->type != type) // and the demanded chunk was not found + do // loop over the chunk list { - pc = search_function(pc, scope); - } - - return(pc); // the latest chunk is the searched one or nullptr + pc = search_function(pc, scope); // in either direction while + } while ( pc != nullptr // the end of the list was not reached yet + && pc->type != type); // and the demanded chunk was not found either + return(pc); // the latest chunk is the searched one } -static chunk_t *chunk_search_typelevel(const chunk_t *cur, c_token_t type, - scope_e scope, direction_e dir, int level) +static chunk_t *chunk_search_typelevel(chunk_t *cur, c_token_t type, scope_e scope, direction_e dir, int level) { /* * Depending on the parameter dir the search function searches * in forward or backward direction */ search_t search_function = select_search_fct(dir); + chunk_t *pc = cur; - - // loop over the chunk list - chunk_t *pc = search_function(cur, scope); - - while ( pc != nullptr // the end of the list was not reached - && !is_expected_type_and_level(pc, type, level)) + do // loop over the chunk list { - pc = search_function(pc, scope); + pc = search_function(pc, scope); // in either direction while #if DEBUG if (pc != nullptr) { @@ -277,48 +269,44 @@ static chunk_t *chunk_search_typelevel(const chunk_t *cur, c_token_t type, } } #endif - } - return(pc); // the latest chunk is the searched one or nullptr + } while ( pc != nullptr // the end of the list was not reached yet + && (is_expected_type_and_level(pc, type, level) == false)); + return(pc); // the latest chunk is the searched one } -static chunk_t *chunk_search_str(const chunk_t *cur, const char *str, size_t len, scope_e scope, direction_e dir, int level) +static chunk_t *chunk_search_str(chunk_t *cur, const char *str, size_t len, scope_e scope, direction_e dir, int level) { /* * Depending on the parameter dir the search function searches * in forward or backward direction */ search_t search_function = select_search_fct(dir); + chunk_t *pc = cur; - // loop over the chunk list - chunk_t *pc = search_function(cur, scope); - - while ( pc != nullptr // the end of the list was not reached yet - && (is_expected_string_and_level(pc, str, level, len) == false)) + do // loop over the chunk list { - pc = search_function(pc, scope); - } - return(pc); // the latest chunk is the searched one or nullptr + pc = search_function(pc, scope); // in either direction while + } while ( pc != nullptr // the end of the list was not reached yet + && (is_expected_string_and_level(pc, str, level, len) == false)); + return(pc); // the latest chunk is the searched one } -static chunk_t *chunk_search(const chunk_t *cur, const check_t check_fct, - const scope_e scope, const direction_e dir, - const bool cond) +static chunk_t *chunk_search(chunk_t *cur, const check_t check_fct, const scope_e scope, + const direction_e dir, const bool cond) { /* * Depending on the parameter dir the search function searches * in forward or backward direction */ search_t search_function = select_search_fct(dir); + chunk_t *pc = cur; - // loop over the chunk list - chunk_t *pc = search_function(cur, scope); - - while ( pc != nullptr // end of the list was not reached yet - && (check_fct(pc) != cond)) // and the demanded chunk was not found + do // loop over the chunk list { - pc = search_function(pc, scope); - } - return(pc); // the latest chunk is the searched one + pc = search_function(pc, scope); // in either direction while + } while ( pc != nullptr // the end of the list was not reached yet + && (check_fct(pc) != cond)); // and the demanded chunk was not found either + return(pc); // the latest chunk is the searched one } @@ -326,7 +314,7 @@ static chunk_t *chunk_search(const chunk_t *cur, const check_t check_fct, * into a common function However this should be done with the preprocessor * to avoid addition check conditions that would be evaluated in the * while loop of the calling function */ -chunk_t *chunk_get_next(const chunk_t *cur, scope_e scope) +chunk_t *chunk_get_next(chunk_t *cur, scope_e scope) { if (cur == nullptr) { @@ -355,7 +343,7 @@ chunk_t *chunk_get_next(const chunk_t *cur, scope_e scope) } -chunk_t *chunk_get_prev(const chunk_t *cur, scope_e scope) +chunk_t *chunk_get_prev(chunk_t *cur, scope_e scope) { if (cur == nullptr) { @@ -403,7 +391,7 @@ chunk_t *chunk_dup(const chunk_t *pc_in) } -static void chunk_log_msg(const chunk_t *chunk, const log_sev_t log, const char *str) +static void chunk_log_msg(chunk_t *chunk, const log_sev_t log, const char *str) { LOG_FMT(log, "%s %zu:%zu '%s' [%s]", str, chunk->orig_line, chunk->orig_col, chunk->text(), @@ -411,7 +399,7 @@ static void chunk_log_msg(const chunk_t *chunk, const log_sev_t log, const char } -static void chunk_log(const chunk_t *pc, const char *text) +static void chunk_log(chunk_t *pc, const char *text) { if ( pc != nullptr && (cpd.unc_stage != unc_stage_e::TOKENIZE) @@ -475,122 +463,117 @@ void chunk_move_after(chunk_t *pc_in, chunk_t *ref) } -chunk_t *chunk_get_next_nl(const chunk_t *cur, scope_e scope) +chunk_t *chunk_get_next_nl(chunk_t *cur, scope_e scope) { return(chunk_search(cur, chunk_is_newline, scope, direction_e::FORWARD, true)); } -chunk_t *chunk_get_prev_nl(const chunk_t *cur, scope_e scope) +chunk_t *chunk_get_prev_nl(chunk_t *cur, scope_e scope) { return(chunk_search(cur, chunk_is_newline, scope, direction_e::BACKWARD, true)); } -chunk_t *chunk_get_next_nnl(const chunk_t *cur, scope_e scope) +chunk_t *chunk_get_next_nnl(chunk_t *cur, scope_e scope) { return(chunk_search(cur, chunk_is_newline, scope, direction_e::FORWARD, false)); } -chunk_t *chunk_get_prev_nnl(const chunk_t *cur, scope_e scope) +chunk_t *chunk_get_prev_nnl(chunk_t *cur, scope_e scope) { return(chunk_search(cur, chunk_is_newline, scope, direction_e::BACKWARD, false)); } -chunk_t *chunk_get_next_ncnl(const chunk_t *cur, scope_e scope) +chunk_t *chunk_get_next_ncnl(chunk_t *cur, scope_e scope) { return(chunk_search(cur, chunk_is_comment_or_newline, scope, direction_e::FORWARD, false)); } -chunk_t *chunk_get_next_ncnlnp(const chunk_t *cur, scope_e scope) +chunk_t *chunk_get_next_ncnlnp(chunk_t *cur, scope_e scope) { return(chunk_get_ncnlnp(cur, scope, direction_e::FORWARD)); } -chunk_t *chunk_get_prev_ncnlnp(const chunk_t *cur, scope_e scope) +chunk_t *chunk_get_prev_ncnlnp(chunk_t *cur, scope_e scope) { return(chunk_get_ncnlnp(cur, scope, direction_e::BACKWARD)); } -chunk_t *chunk_get_prev_ncnlnpnd(const chunk_t *cur, scope_e scope) +chunk_t *chunk_get_prev_ncnlnpnd(chunk_t *cur, scope_e scope) { return(chunk_get_ncnlnpnd(cur, scope, direction_e::BACKWARD)); } -chunk_t *chunk_get_next_nblank(const chunk_t *cur, scope_e scope) +chunk_t *chunk_get_next_nblank(chunk_t *cur, scope_e scope) { return(chunk_search(cur, chunk_is_comment_newline_or_blank, scope, direction_e::FORWARD, false)); } -chunk_t *chunk_get_prev_nblank(const chunk_t *cur, scope_e scope) +chunk_t *chunk_get_prev_nblank(chunk_t *cur, scope_e scope) { return(chunk_search(cur, chunk_is_comment_newline_or_blank, scope, direction_e::BACKWARD, false)); } -chunk_t *chunk_get_next_nc(const chunk_t *cur, scope_e scope) +chunk_t *chunk_get_next_nc(chunk_t *cur, scope_e scope) { return(chunk_search(cur, chunk_is_comment, scope, direction_e::FORWARD, false)); } -chunk_t *chunk_get_next_nisq(const chunk_t *cur, scope_e scope) +chunk_t *chunk_get_next_nisq(chunk_t *cur, scope_e scope) { return(chunk_search(cur, chunk_is_balanced_square, scope, direction_e::FORWARD, false)); } -chunk_t *chunk_get_prev_ncnl(const chunk_t *cur, scope_e scope) +chunk_t *chunk_get_prev_ncnl(chunk_t *cur, scope_e scope) { return(chunk_search(cur, chunk_is_comment_or_newline, scope, direction_e::BACKWARD, false)); } -chunk_t *chunk_get_prev_nc(const chunk_t *cur, scope_e scope) +chunk_t *chunk_get_prev_nc(chunk_t *cur, scope_e scope) { return(chunk_search(cur, chunk_is_comment, scope, direction_e::BACKWARD, false)); } -chunk_t *chunk_get_next_type(const chunk_t *cur, c_token_t type, int level, scope_e scope) +chunk_t *chunk_get_next_type(chunk_t *cur, c_token_t type, int level, scope_e scope) { return(chunk_search_typelevel(cur, type, scope, direction_e::FORWARD, level)); } -chunk_t *chunk_get_next_str(const chunk_t *cur, const char *str, size_t len, int level, scope_e scope) +chunk_t *chunk_get_next_str(chunk_t *cur, const char *str, size_t len, int level, scope_e scope) { return(chunk_search_str(cur, str, len, scope, direction_e::FORWARD, level)); } -chunk_t *chunk_get_prev_type(const chunk_t *cur, c_token_t type, int level, scope_e scope) +chunk_t *chunk_get_prev_type(chunk_t *cur, c_token_t type, int level, scope_e scope) { return(chunk_search_typelevel(cur, type, scope, direction_e::BACKWARD, level)); } -chunk_t *chunk_get_prev_str(const chunk_t *cur, const char *str, size_t len, int level, scope_e scope) +chunk_t *chunk_get_prev_str(chunk_t *cur, const char *str, size_t len, int level, scope_e scope) { return(chunk_search_str(cur, str, len, scope, direction_e::BACKWARD, level)); } -bool chunk_is_newline_between(const chunk_t *start, const chunk_t *end) +bool chunk_is_newline_between(chunk_t *start, chunk_t *end) { - if (chunk_is_newline(start)) - { - return(true); - } - - for (chunk_t *pc = chunk_get_next(start); pc != end; pc = chunk_get_next(pc)) + for (chunk_t *pc = start; pc != end; pc = chunk_get_next(pc)) { if (chunk_is_newline(pc)) { @@ -608,37 +591,37 @@ void chunk_swap(chunk_t *pc1, chunk_t *pc2) // TODO: the following function shall be made similar to the search functions -chunk_t *chunk_first_on_line(const chunk_t *start) +chunk_t *chunk_first_on_line(chunk_t *pc) { - chunk_t *prev = chunk_get_prev(start); + chunk_t *first = pc; - if (prev == nullptr || chunk_is_newline(prev)) + while ((pc = chunk_get_prev(pc)) != nullptr && !chunk_is_newline(pc)) { - return(const_cast(start)); // can be nullptr + first = pc; } - chunk_t *out = prev; - while (prev != nullptr && !chunk_is_newline(prev)) - { - out = prev; - prev = chunk_get_prev(out); - } - - return(out); + return(first); } -bool chunk_is_last_on_line(const chunk_t &pc) +bool chunk_is_last_on_line(chunk_t &pc) //TODO: pc should be const here { // check if pc is the very last chunk of the file - if (&pc == chunk_get_tail()) + const auto *end = chunk_get_tail(); + + if (&pc == end) { return(true); } // if the next chunk is a newline then pc is the last chunk on its line const auto *next = chunk_get_next(&pc); - return((next != nullptr && next->type == CT_NEWLINE) ? true : false); + if (next != nullptr && next->type == CT_NEWLINE) + { + return(true); + } + + return(false); } @@ -717,13 +700,13 @@ void chunk_swap_lines(chunk_t *pc1, chunk_t *pc2) } // chunk_swap_lines -chunk_t *chunk_get_next_nvb(const chunk_t *cur, const scope_e scope) +chunk_t *chunk_get_next_nvb(chunk_t *cur, const scope_e scope) { return(chunk_search(cur, chunk_is_vbrace, scope, direction_e::FORWARD, false)); } -chunk_t *chunk_get_prev_nvb(const chunk_t *cur, const scope_e scope) +chunk_t *chunk_get_prev_nvb(chunk_t *cur, const scope_e scope) { return(chunk_search(cur, chunk_is_vbrace, scope, direction_e::BACKWARD, false)); } @@ -799,29 +782,29 @@ void set_chunk_real(chunk_t *pc, c_token_t token, log_sev_t what) } -static chunk_t *chunk_get_ncnlnp(const chunk_t *cur, const scope_e scope, const direction_e dir) +static chunk_t *chunk_get_ncnlnp(chunk_t *cur, const scope_e scope, const direction_e dir) { - return(chunk_is_preproc(cur) == true - ? chunk_search(cur, chunk_is_comment_or_newline_in_preproc, scope, dir, false) - : chunk_search(cur, chunk_is_comment_newline_or_preproc, scope, dir, false)); + chunk_t *pc = cur; + + pc = (chunk_is_preproc(pc) == true) ? + chunk_search(pc, chunk_is_comment_or_newline_in_preproc, scope, dir, false) : + chunk_search(pc, chunk_is_comment_newline_or_preproc, scope, dir, false); + return(pc); } -static chunk_t *chunk_get_ncnlnpnd(const chunk_t *cur, const scope_e scope, - const direction_e dir) +static chunk_t *chunk_get_ncnlnpnd(chunk_t *cur, const scope_e scope, const direction_e dir) { search_t search_function = select_search_fct(dir); + chunk_t *pc = cur; - // loop over the chunk list - chunk_t *pc = search_function(cur, scope); - - while ( pc != nullptr // the end of the list was not reached yet - && !chunk_is_comment_or_newline(pc) - && !chunk_is_preproc(pc) - && (pc->type == CT_DC_MEMBER)) + do // loop over the chunk list { - pc = search_function(pc, scope); - } + pc = search_function(pc, scope); // in either direction while + } while ( pc != nullptr // the end of the list was not reached yet + && !chunk_is_comment_or_newline(pc) + && !chunk_is_preproc(pc) + && (pc->type == CT_DC_MEMBER)); return(pc); } diff --git a/src/chunk_list.h b/src/chunk_list.h index 05a470259d..a4c5c3a75c 100644 --- a/src/chunk_list.h +++ b/src/chunk_list.h @@ -120,7 +120,7 @@ chunk_t *chunk_get_tail(void); * * @return pointer to next chunk or nullptr if no chunk was found */ -chunk_t *chunk_get_next(const chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_next(chunk_t *cur, scope_e scope = scope_e::ALL); /** @@ -131,7 +131,7 @@ chunk_t *chunk_get_next(const chunk_t *cur, scope_e scope = scope_e::ALL); * * @return pointer to previous chunk or nullptr if no chunk was found */ -chunk_t *chunk_get_prev(const chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_prev(chunk_t *cur, scope_e scope = scope_e::ALL); /** @@ -162,11 +162,11 @@ void chunk_swap_lines(chunk_t *pc1, chunk_t *pc2); * * @param pc chunk to start with */ -chunk_t *chunk_first_on_line(const chunk_t *pc); +chunk_t *chunk_first_on_line(chunk_t *pc); //! check if a given chunk is the last on its line -bool chunk_is_last_on_line(const chunk_t &pc); +bool chunk_is_last_on_line(chunk_t &pc); /** @@ -175,7 +175,7 @@ bool chunk_is_last_on_line(const chunk_t &pc); * @param cur chunk to use as start point * @param scope code region to search in */ -chunk_t *chunk_get_next_nl(const chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_next_nl(chunk_t *cur, scope_e scope = scope_e::ALL); /** @@ -184,7 +184,7 @@ chunk_t *chunk_get_next_nl(const chunk_t *cur, scope_e scope = scope_e::ALL); * @param cur chunk to use as start point * @param scope code region to search in */ -chunk_t *chunk_get_next_nc(const chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_next_nc(chunk_t *cur, scope_e scope = scope_e::ALL); /** @@ -193,7 +193,7 @@ chunk_t *chunk_get_next_nc(const chunk_t *cur, scope_e scope = scope_e::ALL); * @param cur chunk to use as start point * @param scope code region to search in */ -chunk_t *chunk_get_next_nnl(const chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_next_nnl(chunk_t *cur, scope_e scope = scope_e::ALL); /** @@ -202,7 +202,7 @@ chunk_t *chunk_get_next_nnl(const chunk_t *cur, scope_e scope = scope_e::ALL); * @param cur chunk to use as start point * @param scope code region to search in */ -chunk_t *chunk_get_next_ncnl(const chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_next_ncnl(chunk_t *cur, scope_e scope = scope_e::ALL); /** @@ -211,7 +211,7 @@ chunk_t *chunk_get_next_ncnl(const chunk_t *cur, scope_e scope = scope_e::ALL); * @param cur chunk to use as start point * @param scope code region to search in */ -chunk_t *chunk_get_next_ncnlnp(const chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_next_ncnlnp(chunk_t *cur, scope_e scope = scope_e::ALL); /** @@ -224,7 +224,7 @@ chunk_t *chunk_get_next_ncnlnp(const chunk_t *cur, scope_e scope = scope_e::ALL) * * @return nullptr or the next chunk not in or part of square brackets */ -chunk_t *chunk_get_next_nisq(const chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_next_nisq(chunk_t *cur, scope_e scope = scope_e::ALL); /** @@ -233,7 +233,7 @@ chunk_t *chunk_get_next_nisq(const chunk_t *cur, scope_e scope = scope_e::ALL); * @param cur chunk to use as start point * @param scope code region to search in */ -chunk_t *chunk_get_next_nblank(const chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_next_nblank(chunk_t *cur, scope_e scope = scope_e::ALL); /** @@ -242,7 +242,7 @@ chunk_t *chunk_get_next_nblank(const chunk_t *cur, scope_e scope = scope_e::ALL) * @param cur chunk to use as start point * @param scope code region to search in */ -chunk_t *chunk_get_prev_nblank(const chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_prev_nblank(chunk_t *cur, scope_e scope = scope_e::ALL); /** @@ -251,7 +251,7 @@ chunk_t *chunk_get_prev_nblank(const chunk_t *cur, scope_e scope = scope_e::ALL) * @param cur chunk to use as start point * @param scope code region to search in */ -chunk_t *chunk_get_prev_nl(const chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_prev_nl(chunk_t *cur, scope_e scope = scope_e::ALL); /** @@ -260,7 +260,7 @@ chunk_t *chunk_get_prev_nl(const chunk_t *cur, scope_e scope = scope_e::ALL); * @param cur chunk to use as start point * @param scope code region to search in */ -chunk_t *chunk_get_prev_nc(const chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_prev_nc(chunk_t *cur, scope_e scope = scope_e::ALL); /** @@ -269,7 +269,7 @@ chunk_t *chunk_get_prev_nc(const chunk_t *cur, scope_e scope = scope_e::ALL); * @param cur chunk to use as start point * @param scope code region to search in */ -chunk_t *chunk_get_prev_nnl(const chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_prev_nnl(chunk_t *cur, scope_e scope = scope_e::ALL); /** @@ -278,7 +278,7 @@ chunk_t *chunk_get_prev_nnl(const chunk_t *cur, scope_e scope = scope_e::ALL); * @param cur chunk to use as start point * @param scope code region to search in */ -chunk_t *chunk_get_prev_ncnl(const chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_prev_ncnl(chunk_t *cur, scope_e scope = scope_e::ALL); /** @@ -287,7 +287,7 @@ chunk_t *chunk_get_prev_ncnl(const chunk_t *cur, scope_e scope = scope_e::ALL); * @param cur chunk to use as start point * @param scope code region to search in */ -chunk_t *chunk_get_prev_ncnlnp(const chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_prev_ncnlnp(chunk_t *cur, scope_e scope = scope_e::ALL); /** @@ -296,7 +296,7 @@ chunk_t *chunk_get_prev_ncnlnp(const chunk_t *cur, scope_e scope = scope_e::ALL) * @param cur chunk to use as start point * @param scope code region to search in */ -chunk_t *chunk_get_prev_ncnlnpnd(const chunk_t *cur, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_prev_ncnlnpnd(chunk_t *cur, scope_e scope = scope_e::ALL); /** @@ -309,7 +309,7 @@ chunk_t *chunk_get_prev_ncnlnpnd(const chunk_t *cur, scope_e scope = scope_e::AL * * @return nullptr or the match */ -chunk_t *chunk_get_next_type(const chunk_t *cur, c_token_t type, int level, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_next_type(chunk_t *cur, c_token_t type, int level, scope_e scope = scope_e::ALL); /** @@ -322,7 +322,7 @@ chunk_t *chunk_get_next_type(const chunk_t *cur, c_token_t type, int level, scop * * @return nullptr or the match */ -chunk_t *chunk_get_prev_type(const chunk_t *cur, c_token_t type, int level, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_prev_type(chunk_t *cur, c_token_t type, int level, scope_e scope = scope_e::ALL); /** @@ -339,7 +339,7 @@ chunk_t *chunk_get_prev_type(const chunk_t *cur, c_token_t type, int level, scop * @retval nullptr no chunk found or invalid parameters provided * @retval chunk_t pointer to the found chunk */ -chunk_t *chunk_get_next_str(const chunk_t *cur, const char *str, size_t len, int level, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_next_str(chunk_t *cur, const char *str, size_t len, int level, scope_e scope = scope_e::ALL); /** @@ -356,7 +356,7 @@ chunk_t *chunk_get_next_str(const chunk_t *cur, const char *str, size_t len, int * @retval nullptr no chunk found or invalid parameters provided * @retval chunk_t pointer to the found chunk */ -chunk_t *chunk_get_prev_str(const chunk_t *cur, const char *str, size_t len, int level, scope_e scope = scope_e::ALL); +chunk_t *chunk_get_prev_str(chunk_t *cur, const char *str, size_t len, int level, scope_e scope = scope_e::ALL); /** @@ -367,7 +367,7 @@ chunk_t *chunk_get_prev_str(const chunk_t *cur, const char *str, size_t len, int * * @return pointer to found chunk or nullptr if no chunk was found */ -chunk_t *chunk_get_next_nvb(const chunk_t *cur, const scope_e scope = scope_e::ALL); +chunk_t *chunk_get_next_nvb(chunk_t *cur, const scope_e scope = scope_e::ALL); /** @@ -378,7 +378,7 @@ chunk_t *chunk_get_next_nvb(const chunk_t *cur, const scope_e scope = scope_e::A * * @return pointer to found chunk or nullptr if no chunk was found */ -chunk_t *chunk_get_prev_nvb(const chunk_t *cur, const scope_e scope = scope_e::ALL); +chunk_t *chunk_get_prev_nvb(chunk_t *cur, const scope_e scope = scope_e::ALL); /** @@ -390,7 +390,7 @@ chunk_t *chunk_get_prev_nvb(const chunk_t *cur, const scope_e scope = scope_e::A * @retval nullptr no object found, or invalid parameters provided * @retval chunk_t pointer to the found object */ -chunk_t *chunk_search_prev_cat(const chunk_t *pc, const c_token_t cat); +chunk_t *chunk_search_prev_cat(chunk_t *pc, const c_token_t cat); /** @@ -402,7 +402,7 @@ chunk_t *chunk_search_prev_cat(const chunk_t *pc, const c_token_t cat); * @retval nullptr no object found, or invalid parameters provided * @retval chunk_t pointer to the found object */ -chunk_t *chunk_search_next_cat(const chunk_t *pc, const c_token_t cat); +chunk_t *chunk_search_next_cat(chunk_t *pc, const c_token_t cat); /* * TODO: better move the function implementations to the source file. @@ -415,7 +415,7 @@ chunk_t *chunk_search_next_cat(const chunk_t *pc, const c_token_t cat); * The compiler should know how to optimize the code itself. * To clarify do a profiling run with and without inline */ -static_inline bool is_expected_type_and_level(const chunk_t *pc, c_token_t type, int level) +static_inline bool is_expected_type_and_level(chunk_t *pc, c_token_t type, int level) { // we don't care about the level (if it is negative) or it is as expected // and the type is as expected @@ -424,7 +424,7 @@ static_inline bool is_expected_type_and_level(const chunk_t *pc, c_token_t type, } -static_inline bool is_expected_string_and_level(const chunk_t *pc, const char *str, int level, size_t len) +static_inline bool is_expected_string_and_level(chunk_t *pc, const char *str, int level, size_t len) { // we don't care about the level (if it is negative) or it is as expected return( (level < 0 || pc->level == static_cast(level)) @@ -441,9 +441,9 @@ static_inline bool is_expected_string_and_level(const chunk_t *pc, const char *s * * @return nullptr or the matching paren/brace/square */ -static_inline chunk_t *chunk_skip_to_match(const chunk_t *cur, scope_e scope = scope_e::ALL) +static_inline chunk_t *chunk_skip_to_match(chunk_t *cur, scope_e scope = scope_e::ALL) { - if ( cur != nullptr + if ( cur && ( cur->type == CT_PAREN_OPEN || cur->type == CT_SPAREN_OPEN || cur->type == CT_FPAREN_OPEN @@ -453,17 +453,15 @@ static_inline chunk_t *chunk_skip_to_match(const chunk_t *cur, scope_e scope = s || cur->type == CT_ANGLE_OPEN || cur->type == CT_SQUARE_OPEN)) { - //TODO remove dirty enum value hack - return(chunk_get_next_type(cur, static_cast(cur->type + 1), - cur->level, scope)); + return(chunk_get_next_type(cur, (c_token_t)(cur->type + 1), cur->level, scope)); } - return(const_cast(cur)); + return(cur); } -static_inline chunk_t *chunk_skip_to_match_rev(const chunk_t *cur, scope_e scope = scope_e::ALL) +static_inline chunk_t *chunk_skip_to_match_rev(chunk_t *cur, scope_e scope = scope_e::ALL) { - if ( cur != nullptr + if ( cur && ( cur->type == CT_PAREN_CLOSE || cur->type == CT_SPAREN_CLOSE || cur->type == CT_FPAREN_CLOSE @@ -473,11 +471,9 @@ static_inline chunk_t *chunk_skip_to_match_rev(const chunk_t *cur, scope_e scope || cur->type == CT_ANGLE_CLOSE || cur->type == CT_SQUARE_CLOSE)) { - //TODO remove dirty enum value hack - return(chunk_get_prev_type(cur, static_cast(cur->type - 1), - cur->level, scope)); + return(chunk_get_prev_type(cur, (c_token_t)(cur->type - 1), cur->level, scope)); } - return(const_cast(cur)); + return(cur); } @@ -490,7 +486,7 @@ static_inline chunk_t *chunk_skip_to_match_rev(const chunk_t *cur, scope_e scope * - C comment * - C++ comment */ -static_inline bool chunk_is_comment(const chunk_t *pc) +static_inline bool chunk_is_comment(chunk_t *pc) { return( pc != NULL && ( pc->type == CT_COMMENT @@ -499,21 +495,21 @@ static_inline bool chunk_is_comment(const chunk_t *pc) } -static_inline bool chunk_is_single_line_comment(const chunk_t *pc) +static_inline bool chunk_is_single_line_comment(chunk_t *pc) { return( pc != NULL && (pc->type == CT_COMMENT || pc->type == CT_COMMENT_CPP)); } -static_inline bool chunk_is_newline(const chunk_t *pc) +static_inline bool chunk_is_newline(chunk_t *pc) { return( pc != NULL && (pc->type == CT_NEWLINE || pc->type == CT_NL_CONT)); } -static_inline bool chunk_is_semicolon(const chunk_t *pc) +static_inline bool chunk_is_semicolon(chunk_t *pc) { return( pc != NULL && (pc->type == CT_SEMICOLON || pc->type == CT_VSEMICOLON)); @@ -527,20 +523,20 @@ static_inline bool chunk_is_semicolon(const chunk_t *pc) * * @todo rename function: blank is a space not an empty string */ -static_inline bool chunk_is_blank(const chunk_t *pc) +static_inline bool chunk_is_blank(chunk_t *pc) { return(pc != NULL && (pc->len() == 0)); } //! checks if a chunk is valid and either a comment or newline -static_inline bool chunk_is_comment_or_newline(const chunk_t *pc) +static_inline bool chunk_is_comment_or_newline(chunk_t *pc) { return(chunk_is_comment(pc) || chunk_is_newline(pc)); } -static_inline bool chunk_is_balanced_square(const chunk_t *pc) +static_inline bool chunk_is_balanced_square(chunk_t *pc) { return( pc != NULL && ( pc->type == CT_SQUARE_OPEN @@ -549,13 +545,13 @@ static_inline bool chunk_is_balanced_square(const chunk_t *pc) } -static_inline bool chunk_is_preproc(const chunk_t *pc) +static_inline bool chunk_is_preproc(chunk_t *pc) { return(pc != NULL && (pc->flags & PCF_IN_PREPROC)); } -static_inline bool chunk_is_comment_or_newline_in_preproc(const chunk_t *pc) +static_inline bool chunk_is_comment_or_newline_in_preproc(chunk_t *pc) { return( pc != NULL && chunk_is_preproc(pc) @@ -563,7 +559,7 @@ static_inline bool chunk_is_comment_or_newline_in_preproc(const chunk_t *pc) } -static_inline bool chunk_is_comment_newline_or_preproc(const chunk_t *pc) +static_inline bool chunk_is_comment_newline_or_preproc(chunk_t *pc) { return( chunk_is_comment(pc) || chunk_is_newline(pc) @@ -571,13 +567,13 @@ static_inline bool chunk_is_comment_newline_or_preproc(const chunk_t *pc) } -static_inline bool chunk_is_comment_newline_or_blank(const chunk_t *pc) +static_inline bool chunk_is_comment_newline_or_blank(chunk_t *pc) { return(chunk_is_comment_or_newline(pc) || chunk_is_blank(pc)); } -static_inline bool chunk_is_Doxygen_comment(const chunk_t *pc) +static_inline bool chunk_is_Doxygen_comment(chunk_t *pc) { if (!chunk_is_comment(pc)) { @@ -596,7 +592,7 @@ static_inline bool chunk_is_Doxygen_comment(const chunk_t *pc) } -static_inline bool chunk_is_type(const chunk_t *pc) +static_inline bool chunk_is_type(chunk_t *pc) { return( pc != NULL && ( pc->type == CT_TYPE @@ -610,13 +606,13 @@ static_inline bool chunk_is_type(const chunk_t *pc) } -static_inline bool chunk_is_token(const chunk_t *pc, c_token_t c_token) +static_inline bool chunk_is_token(chunk_t *pc, c_token_t c_token) { return(pc != NULL && pc->type == c_token); } -static_inline bool chunk_is_str(const chunk_t *pc, const char *str, size_t len) +static_inline bool chunk_is_str(chunk_t *pc, const char *str, size_t len) { return( pc != NULL // valid pc pointer && (pc->len() == len) // token size equals size parameter @@ -629,7 +625,7 @@ static_inline bool chunk_is_str(const chunk_t *pc, const char *str, size_t len) } -static_inline bool chunk_is_str_case(const chunk_t *pc, const char *str, size_t len) +static_inline bool chunk_is_str_case(chunk_t *pc, const char *str, size_t len) { return( pc != NULL && (pc->len() == len) @@ -637,7 +633,7 @@ static_inline bool chunk_is_str_case(const chunk_t *pc, const char *str, size_t } -static_inline bool chunk_is_word(const chunk_t *pc) +static_inline bool chunk_is_word(chunk_t *pc) { return( pc != NULL && (pc->len() >= 1) @@ -645,7 +641,7 @@ static_inline bool chunk_is_word(const chunk_t *pc) } -static_inline bool chunk_is_star(const chunk_t *pc) +static_inline bool chunk_is_star(chunk_t *pc) { return( pc != NULL && (pc->len() == 1) @@ -654,7 +650,7 @@ static_inline bool chunk_is_star(const chunk_t *pc) } -static_inline bool chunk_is_addr(const chunk_t *pc) +static_inline bool chunk_is_addr(chunk_t *pc) { if ( pc != NULL && ( pc->type == CT_BYREF @@ -678,7 +674,7 @@ static_inline bool chunk_is_addr(const chunk_t *pc) } -static_inline bool chunk_is_msref(const chunk_t *pc) // ms compilers for C++/CLI and WinRT use '^' instead of '*' for marking up reference types vs pointer types +static_inline bool chunk_is_msref(chunk_t *pc) // ms compilers for C++/CLI and WinRT use '^' instead of '*' for marking up reference types vs pointer types { return( (cpd.lang_flags & LANG_CPP) && ( pc != NULL @@ -688,7 +684,7 @@ static_inline bool chunk_is_msref(const chunk_t *pc) // ms compilers for C++/CLI } -static_inline bool chunk_is_ptr_operator(const chunk_t *pc) +static_inline bool chunk_is_ptr_operator(chunk_t *pc) { return( chunk_is_star(pc) || chunk_is_addr(pc) @@ -697,31 +693,31 @@ static_inline bool chunk_is_ptr_operator(const chunk_t *pc) //! Check to see if there is a newline between the two chunks -bool chunk_is_newline_between(const chunk_t *start, const chunk_t *end); +bool chunk_is_newline_between(chunk_t *start, chunk_t *end); -static_inline bool chunk_is_closing_brace(const chunk_t *pc) +static_inline bool chunk_is_closing_brace(chunk_t *pc) { return( pc != NULL && (pc->type == CT_BRACE_CLOSE || pc->type == CT_VBRACE_CLOSE)); } -static_inline bool chunk_is_opening_brace(const chunk_t *pc) +static_inline bool chunk_is_opening_brace(chunk_t *pc) { return( pc != NULL && (pc->type == CT_BRACE_OPEN || pc->type == CT_VBRACE_OPEN)); } -static_inline bool chunk_is_vbrace(const chunk_t *pc) +static_inline bool chunk_is_vbrace(chunk_t *pc) { return( pc != NULL && (pc->type == CT_VBRACE_CLOSE || pc->type == CT_VBRACE_OPEN)); } -static_inline bool chunk_is_paren_open(const chunk_t *pc) +static_inline bool chunk_is_paren_open(chunk_t *pc) { return( pc != NULL && ( pc->type == CT_PAREN_OPEN @@ -731,7 +727,7 @@ static_inline bool chunk_is_paren_open(const chunk_t *pc) } -static_inline bool chunk_is_paren_close(const chunk_t *pc) +static_inline bool chunk_is_paren_close(chunk_t *pc) { return( pc != NULL && ( pc->type == CT_PAREN_CLOSE @@ -745,7 +741,7 @@ static_inline bool chunk_is_paren_close(const chunk_t *pc) * Returns true if either chunk is null or both have the same preproc flags. * If this is true, you can remove a newline/nl_cont between the two. */ -static_inline bool chunk_same_preproc(const chunk_t *pc1, chunk_t *pc2) +static_inline bool chunk_same_preproc(chunk_t *pc1, chunk_t *pc2) { return( pc1 == NULL || pc2 == NULL @@ -758,7 +754,7 @@ static_inline bool chunk_same_preproc(const chunk_t *pc1, chunk_t *pc2) * The prev and next chunks must have the same PCF_IN_PREPROC flag AND * the newline can't be after a C++ comment. */ -static_inline bool chunk_safe_to_del_nl(const chunk_t *nl) +static_inline bool chunk_safe_to_del_nl(chunk_t *nl) { chunk_t *tmp = chunk_get_prev(nl); @@ -776,28 +772,29 @@ static_inline bool chunk_safe_to_del_nl(const chunk_t *nl) * * @return true - the chunk is the opening parentheses of a for in loop */ -static_inline bool chunk_is_forin(const chunk_t *pc) +static_inline bool chunk_is_forin(chunk_t *pc) { - chunk_t *prev = chunk_get_prev_ncnl(pc); - - if ( !(cpd.lang_flags & LANG_OC) - || prev == nullptr - || pc == nullptr - || prev->type != CT_FOR - || pc->type != CT_SPAREN_OPEN) - { - return(false); - } - - // search CT_IN token between the two 'for' parenthesis - chunk_t *next = chunk_get_next_ncnl(pc); - for ( ; ( next != nullptr - && next->type != CT_IN - && next->type != CT_SPAREN_CLOSE) - ; next = chunk_get_next_ncnl(next)) + if ( (cpd.lang_flags & LANG_OC) + && pc + && pc->type == CT_SPAREN_OPEN) { + chunk_t *prev = chunk_get_prev_ncnl(pc); + if (prev->type == CT_FOR) + { + chunk_t *next = pc; + while ( next + && next->type != CT_SPAREN_CLOSE + && next->type != CT_IN) + { + next = chunk_get_next_ncnl(next); + } + if (next->type == CT_IN) + { + return(true); + } + } } - return((next != nullptr && next->type == CT_IN) ? true : false); + return(false); } From 40d2fa3e44614dea18576cb08bee58f4ddcbab3b Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Sun, 12 Nov 2017 18:04:15 +0100 Subject: [PATCH 120/136] The index of the arry cpd.al must be controlled --- src/align.cpp | 8 ++++++++ src/uncrustify_types.h | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/align.cpp b/src/align.cpp index beeefbf0fb..e05d8e7693 100644 --- a/src/align.cpp +++ b/src/align.cpp @@ -1689,6 +1689,14 @@ static chunk_t *scan_ib_line(chunk_t *start, bool first_pass) cpd.al[cpd.al_cnt].col = pc->column; cpd.al[cpd.al_cnt].len = token_width; cpd.al_cnt++; + if (cpd.al_cnt == AL_SIZE) + { + fprintf(stderr, "Number of 'entry' to be aligned is too big for the current value %d,\n", AL_SIZE); + fprintf(stderr, "at line %zu, column %zu.\n", pc->orig_line, pc->orig_col); + fprintf(stderr, "Please make a report.\n"); + log_flush(true); + exit(EX_SOFTWARE); + } idx++; } else diff --git a/src/uncrustify_types.h b/src/uncrustify_types.h index 2eb16af9a3..e4bffc55c9 100644 --- a/src/uncrustify_types.h +++ b/src/uncrustify_types.h @@ -465,7 +465,8 @@ struct cp_data_t int changes; int pass_count; //! indicates how often the chunk list shall be processed - align_t al[80]; +#define AL_SIZE 8000 + align_t al[AL_SIZE]; size_t al_cnt; bool al_c99_array; From a544e44f388d987b9c8b3f16172084a8b7102de6 Mon Sep 17 00:00:00 2001 From: Kalle Raiskila Date: Sat, 11 Nov 2017 16:54:49 +0200 Subject: [PATCH 121/136] Fix indent_func_const. Without this fix, the 'indent_func_const' configuration is used as an absolute value, not as a relative to the current indentation level. The C++ test 30270 has in its configuration 'indent_func_const = 69', yet the outputs 'const' started on column 69, i.e. 68 spaces indent. The error is even more noticable when the 'const' is part of a class member function, already indented. This appends the 30270 test case with such an example. --- src/indent.cpp | 2 +- tests/config/const_throw.cfg | 3 +++ tests/input/cpp/const_throw.cpp | 5 +++++ tests/output/cpp/30270-const_throw.cpp | 7 ++++++- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/indent.cpp b/src/indent.cpp index 080303030f..e4e694a02f 100644 --- a/src/indent.cpp +++ b/src/indent.cpp @@ -2412,7 +2412,7 @@ void indent_text(void) || next->type == CT_VBRACE_OPEN)) { // indent const - void GetFoo(void)\n const\n { return (m_Foo); } - indent_column_set(cpd.settings[UO_indent_func_const].u); + indent_column_set(frm.pse[frm.pse_tos].indent + cpd.settings[UO_indent_func_const].u); LOG_FMT(LINDENT, "%s(%d): %zu] const => %zu [%s]\n", __func__, __LINE__, pc->orig_line, indent_column, pc->text()); reindent_line(pc, indent_column); diff --git a/tests/config/const_throw.cfg b/tests/config/const_throw.cfg index 3fc6324ba2..40a9463bea 100644 --- a/tests/config/const_throw.cfg +++ b/tests/config/const_throw.cfg @@ -6,3 +6,6 @@ indent_func_const = 69 # number # e.g., int GetFoo(void)\n throw (std::bad_alloc)\n { return (m_Foo); } indent_func_throw = 41 # number +#indent class memeber function declarations. This is to test +#that a 'const' qualifier is continuation indented +indent_class = true diff --git a/tests/input/cpp/const_throw.cpp b/tests/input/cpp/const_throw.cpp index b1210b9bb1..f0d1773d24 100644 --- a/tests/input/cpp/const_throw.cpp +++ b/tests/input/cpp/const_throw.cpp @@ -6,3 +6,8 @@ int GetFoo(void) throw (std::bad_alloc) { return (m_Foo); } +class foo{ + void bar(void) + const; +}; + diff --git a/tests/output/cpp/30270-const_throw.cpp b/tests/output/cpp/30270-const_throw.cpp index 4c38df7a10..44f0ca680e 100644 --- a/tests/output/cpp/30270-const_throw.cpp +++ b/tests/output/cpp/30270-const_throw.cpp @@ -1,5 +1,5 @@ void GetFoo(void) - const + const { return (m_Foo); } @@ -10,3 +10,8 @@ int GetFoo(void) return (m_Foo); } +class foo { + void bar(void) + const; +}; + From 7789a21337e85a09a81cc5d8ebb6aeba695124fb Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Wed, 15 Nov 2017 16:17:40 +0100 Subject: [PATCH 122/136] frame_count must be controlled. --- src/parse_frame.cpp | 63 +++++++++++++++++++++++++++--------------- src/uncrustify_types.h | 7 +++-- 2 files changed, 45 insertions(+), 25 deletions(-) diff --git a/src/parse_frame.cpp b/src/parse_frame.cpp index dd1fd94877..fb97e88a0b 100644 --- a/src/parse_frame.cpp +++ b/src/parse_frame.cpp @@ -42,8 +42,8 @@ static void pf_log(log_sev_t logsev, parse_frame_t *pf) static void pf_log_frms(log_sev_t logsev, const char *txt, parse_frame_t *pf) { - LOG_FMT(logsev, "%s Parse Frames(%d):", txt, cpd.frame_count); - for (int idx = 0; idx < cpd.frame_count; idx++) + LOG_FMT(logsev, "%s Parse Frames(%zu):", txt, cpd.frame_count); + for (size_t idx = 0; idx < cpd.frame_count; idx++) { LOG_FMT(logsev, " [%s-%d]", get_token_name(cpd.frames[idx].in_ifdef), @@ -55,11 +55,11 @@ static void pf_log_frms(log_sev_t logsev, const char *txt, parse_frame_t *pf) static void pf_log_all(log_sev_t logsev) { - LOG_FMT(logsev, "##=- Parse Frame : %d entries\n", cpd.frame_count); + LOG_FMT(logsev, "##=- Parse Frame : %zu entries\n", cpd.frame_count); - for (int idx = 0; idx < cpd.frame_count; idx++) + for (size_t idx = 0; idx < cpd.frame_count; idx++) { - LOG_FMT(logsev, "## <%d> ", idx); + LOG_FMT(logsev, "## idx is %zu, ", idx); pf_log(logsev, &cpd.frames[idx]); } @@ -73,36 +73,46 @@ void pf_copy(parse_frame_t *dst, const parse_frame_t *src) } +void controlFrameCount() +{ + if (cpd.frame_count == FRAME_SIZE) + { + fprintf(stderr, "Number of 'frame' is too big for the current value %d,\n", FRAME_SIZE); + //fprintf(stderr, "at line %zu, column %zu.\n", pc->orig_line, pc->orig_col); + fprintf(stderr, "Please make a report.\n"); + log_flush(true); + exit(EX_SOFTWARE); + } +} + + void pf_push(parse_frame_t *pf) { static int ref_no = 1; - if (cpd.frame_count < static_cast ARRAY_SIZE(cpd.frames)) - { - pf_copy(&cpd.frames[cpd.frame_count], pf); - cpd.frame_count++; - - pf->ref_no = ref_no++; - } - LOG_FMT(LPF, "%s(%d): count = %d\n", __func__, __LINE__, cpd.frame_count); + pf_copy(&cpd.frames[cpd.frame_count], pf); + cpd.frame_count++; + controlFrameCount(); + pf->ref_no = ref_no++; + LOG_FMT(LPF, "%s(%d): frame_count is %zu\n", __func__, __LINE__, cpd.frame_count); } void pf_push_under(parse_frame_t *pf) { - LOG_FMT(LPF, "%s(%d): before count = %d\n", __func__, __LINE__, cpd.frame_count); + LOG_FMT(LPF, "%s(%d): before frame_count is %zu\n", __func__, __LINE__, cpd.frame_count); - if ( cpd.frame_count < static_cast ARRAY_SIZE(cpd.frames) - && cpd.frame_count >= 1) + if (cpd.frame_count >= 1) { parse_frame_t *npf1 = &cpd.frames[cpd.frame_count - 1]; parse_frame_t *npf2 = &cpd.frames[cpd.frame_count]; pf_copy(npf2, npf1); pf_copy(npf1, pf); cpd.frame_count++; + controlFrameCount(); } - LOG_FMT(LPF, "%s(%d): after count = %d\n", __func__, __LINE__, cpd.frame_count); + LOG_FMT(LPF, "%s(%d): after frame_count is %zu\n", __func__, __LINE__, cpd.frame_count); } @@ -112,7 +122,7 @@ void pf_copy_tos(parse_frame_t *pf) { pf_copy(pf, &cpd.frames[cpd.frame_count - 1]); } - LOG_FMT(LPF, "%s(%d): count = %d\n", __func__, __LINE__, cpd.frame_count); + LOG_FMT(LPF, "%s(%d): frame_count is %zu\n", __func__, __LINE__, cpd.frame_count); } @@ -122,7 +132,7 @@ void pf_copy_2nd_tos(parse_frame_t *pf) { pf_copy(pf, &cpd.frames[cpd.frame_count - 2]); } - LOG_FMT(LPF, "%s(%d): count = %d\n", __func__, __LINE__, cpd.frame_count); + LOG_FMT(LPF, "%s(%d): frame_count is %zu\n", __func__, __LINE__, cpd.frame_count); } @@ -132,7 +142,7 @@ void pf_trash_tos(void) { cpd.frame_count--; } - LOG_FMT(LPF, "%s(%d): count = %d\n", __func__, __LINE__, cpd.frame_count); + LOG_FMT(LPF, "%s(%d): frame_count is %zu\n", __func__, __LINE__, cpd.frame_count); } @@ -164,7 +174,7 @@ int pf_check(parse_frame_t *frm, chunk_t *pc) if (pc->parent_type != next->type) { - LOG_FMT(LNOTE, "%s(%d): Preproc parent not set correctly on line %zu: got %s expected %s\n", + LOG_FMT(LNOTE, "%s(%d): Preproc parent not set correctly on orig_line %zu: got %s expected %s\n", __func__, __LINE__, pc->orig_line, get_token_name(pc->parent_type), get_token_name(next->type)); set_chunk_parent(pc, next->type); @@ -226,6 +236,14 @@ int pf_check(parse_frame_t *frm, chunk_t *pc) * We want: [...]-[if] */ pf_copy_tos(frm); // [...] [base] [if]-[if] + + if (cpd.frame_count < 2) + { + fprintf(stderr, "Number of 'frame' is too small.\n"); + fprintf(stderr, "Please make a report.\n"); + log_flush(true); + exit(EX_SOFTWARE); + } frm->in_ifdef = cpd.frames[cpd.frame_count - 2].in_ifdef; pf_trash_tos(); // [...] [base]-[if] pf_trash_tos(); // [...]-[if] @@ -250,7 +268,8 @@ int pf_check(parse_frame_t *frm, chunk_t *pc) if (txt != nullptr) { - LOG_FMT(LPF, "%s(%d): %zu> %s: %s in_ifdef=%d/%d counts=%d/%d\n", __func__, __LINE__, + LOG_FMT(LPF, "%s(%d): orig_line is %zu, type is %s: %s in_ifdef is %d/%d, counts is %d, frame_count is %zu\n", + __func__, __LINE__, pc->orig_line, get_token_name(pc->parent_type), txt, in_ifdef, frm->in_ifdef, b4_cnt, cpd.frame_count); pf_log_all(LPF); diff --git a/src/uncrustify_types.h b/src/uncrustify_types.h index e4bffc55c9..3e2d61a982 100644 --- a/src/uncrustify_types.h +++ b/src/uncrustify_types.h @@ -444,7 +444,7 @@ struct cp_data_t int ifdef_over_whole_file; bool frag; //! activates code fragment option - uint32_t frag_cols; + UINT32 frag_cols; // stuff to auto-detect line endings UINT32 le_counts[LE_AUTO]; @@ -474,8 +474,9 @@ struct cp_data_t op_val_t settings[UO_option_count]; //! array with all uncrustify option settings - parse_frame_t frames[16]; - int frame_count; +#define FRAME_SIZE 16 + parse_frame_t frames[FRAME_SIZE]; + size_t frame_count; int pp_level; // TODO: can this ever be -1? // the default values for settings From ade536ef9b2338f7bcbaf5b8877ec7c50dc710cd Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Wed, 15 Nov 2017 17:27:14 +0100 Subject: [PATCH 123/136] The variable pse_tos must be controlled. --- src/controlPSECount.cpp | 20 ++++++++++++++++++++ src/controlPSECount.h | 16 ++++++++++++++++ src/indent.cpp | 41 ++++++++++++++++++++++++++++++++--------- src/uncrustify_types.h | 3 ++- 4 files changed, 70 insertions(+), 10 deletions(-) create mode 100644 src/controlPSECount.cpp create mode 100644 src/controlPSECount.h diff --git a/src/controlPSECount.cpp b/src/controlPSECount.cpp new file mode 100644 index 0000000000..3916332437 --- /dev/null +++ b/src/controlPSECount.cpp @@ -0,0 +1,20 @@ +/** + * @file controlPSECount.cpp + * + * @author Guy Maurel + * @license GPL v2+ + */ + +#include "controlPSECount.h" + + +void controlPSECount(size_t value) +{ + if (value >= PSE_SIZE) + { + fprintf(stderr, "Index of 'frm.pse' is too big for the current value %d,\n", PSE_SIZE); + fprintf(stderr, "Please make a report.\n"); + log_flush(true); + exit(EX_SOFTWARE); + } +} diff --git a/src/controlPSECount.h b/src/controlPSECount.h new file mode 100644 index 0000000000..138b72cc53 --- /dev/null +++ b/src/controlPSECount.h @@ -0,0 +1,16 @@ +/** + * @file controlPSECount.h + * + * @author Guy Maurel + * @license GPL v2+ + */ + +#ifndef CONTROLPSECOUNT_H_INCLUDED +#define CONTROLPSECOUNT_H_INCLUDED + +#include "uncrustify_types.h" + + +void controlPSECount(size_t value); + +#endif /* CONTROLPSECOUNT_H_INCLUDED */ diff --git a/src/indent.cpp b/src/indent.cpp index e4e694a02f..eb266dc6bc 100644 --- a/src/indent.cpp +++ b/src/indent.cpp @@ -22,6 +22,7 @@ #include "space.h" #include "parse_frame.h" #include "helper_for_print.h" +#include "controlPSECount.h" using namespace std; @@ -399,17 +400,19 @@ static void indent_pse_push(parse_frame_t &frm, chunk_t *pc) frm.pse_tos++; LOG_FMT(LINDLINE, "%s(%d): orig_line is %zu, pse_tos is %zu, type is %s, brace_level is %zu, pc->level is %zu\n", __func__, __LINE__, pc->orig_line, frm.pse_tos, get_token_name(pc->type), pc->brace_level, pc->level); + controlPSECount(frm.pse_tos); memset(&frm.pse[frm.pse_tos], 0, sizeof(frm.pse[frm.pse_tos])); //LOG_FMT(LINDPSE, "%s(%d):%d] (pp=%d) OPEN [%d,%s] level=%d\n", // __func__, __LINE__, pc->orig_line, cpd.pp_level, frm.pse_tos, get_token_name(pc->type), pc->level); - frm.pse[frm.pse_tos].pc = pc; - frm.pse[frm.pse_tos].type = pc->type; - frm.pse[frm.pse_tos].level = pc->level; - frm.pse[frm.pse_tos].open_line = pc->orig_line; - frm.pse[frm.pse_tos].ref = ++ref; - frm.pse[frm.pse_tos].in_preproc = (pc->flags & PCF_IN_PREPROC); + frm.pse[frm.pse_tos].pc = pc; + frm.pse[frm.pse_tos].type = pc->type; + frm.pse[frm.pse_tos].level = pc->level; + frm.pse[frm.pse_tos].open_line = pc->orig_line; + frm.pse[frm.pse_tos].ref = ++ref; + frm.pse[frm.pse_tos].in_preproc = (pc->flags & PCF_IN_PREPROC); + controlPSECount(frm.pse_tos - 1); frm.pse[frm.pse_tos].indent_tab = frm.pse[frm.pse_tos - 1].indent_tab; frm.pse[frm.pse_tos].indent_cont = frm.pse[frm.pse_tos - 1].indent_cont; frm.pse[frm.pse_tos].non_vardef = false; @@ -430,6 +433,7 @@ static void indent_pse_pop(parse_frame_t &frm, chunk_t *pc) { LOG_FUNC_ENTRY(); // Bump up the index and initialize it + controlPSECount(frm.pse_tos); if (frm.pse_tos > 0) { if (pc != nullptr) @@ -527,7 +531,8 @@ static size_t calc_indent_continue(parse_frame_t &frm, size_t pse_tos) { int ic = cpd.settings[UO_indent_continue].n; - if (ic < 0 && frm.pse[pse_tos].indent_cont) + controlPSECount(frm.pse_tos); + if (ic < 0 && frm.pse[pse_tos].indent_cont > 0) { return(frm.pse[pse_tos].indent); } @@ -690,6 +695,7 @@ void indent_text(void) { in_func_def = true; indent_pse_push(frm, pc); + controlPSECount(frm.pse_tos); frm.pse[frm.pse_tos].indent_tmp = 1; frm.pse[frm.pse_tos].indent = 1; frm.pse[frm.pse_tos].indent_tab = 1; @@ -710,6 +716,7 @@ void indent_text(void) // Clean up after a #define, etc if (!in_preproc) { + controlPSECount(frm.pse_tos); while (frm.pse_tos > 0 && frm.pse[frm.pse_tos].in_preproc) { c_token_t type = frm.pse[frm.pse_tos].type; @@ -729,6 +736,7 @@ void indent_text(void) else if (pc->type == CT_PREPROC) { // Close out PP_IF_INDENT before playing with the parse frames + controlPSECount(frm.pse_tos); if ( (frm.pse[frm.pse_tos].type == CT_PP_IF_INDENT) && ( pc->parent_type == CT_PP_ENDIF || pc->parent_type == CT_PP_ELSE)) @@ -753,6 +761,8 @@ void indent_text(void) set_chunk_type(next, CT_PP_REGION); // Indent one level + controlPSECount(frm.pse_tos); + controlPSECount(frm.pse_tos - 1); frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - 1].indent + indent_size; log_indent(); frm.pse[frm.pse_tos].indent_tab = frm.pse[frm.pse_tos - 1].indent_tab + indent_size; @@ -762,11 +772,13 @@ void indent_text(void) } // If option set, remove indent inside switch statement + controlPSECount(frm.pse_tos); if ( frm.pse[frm.pse_tos].type == CT_CASE && !cpd.settings[UO_indent_switch_pp].b) { indent_pse_push(frm, pc); + controlPSECount(frm.pse_tos - 1); frm.pse[frm.pse_tos - 1].indent = frm.pse[frm.pse_tos].indent - indent_size; log_indent(); } @@ -816,6 +828,8 @@ void indent_text(void) // Indent one level except if the #if is a #include guard size_t extra = ( pc->pp_level == 0 && ifdef_over_whole_file()) ? 0 : indent_size; + controlPSECount(frm.pse_tos); + controlPSECount(frm.pse_tos - 1); frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - 1].indent + extra; log_indent(); frm.pse[frm.pse_tos].indent_tab = frm.pse[frm.pse_tos - 1].indent_tab + extra; @@ -834,6 +848,8 @@ void indent_text(void) } indent_pse_push(frm, pp_next); + controlPSECount(frm.pse_tos); + controlPSECount(frm.pse_tos - 1); if ( pc->parent_type == CT_PP_DEFINE || pc->parent_type == CT_PP_UNDEF) { @@ -930,6 +946,7 @@ void indent_text(void) old_pse_tos = frm.pse_tos; // End anything that drops a level + controlPSECount(frm.pse_tos); if ( !chunk_is_newline(pc) && !chunk_is_comment(pc) && (frm.pse[frm.pse_tos].level > pc->level)) @@ -1078,6 +1095,7 @@ void indent_text(void) } while (old_pse_tos > frm.pse_tos); // Grab a copy of the current indent + controlPSECount(frm.pse_tos); indent_column_set(frm.pse[frm.pse_tos].indent_tmp); log_indent_tmp(); @@ -1087,9 +1105,9 @@ void indent_text(void) { LOG_FMT(LINDPC, " -=[ %zu:%zu %s ]=-\n", pc->orig_line, pc->orig_col, pc->text()); - for (int ttidx = frm.pse_tos; ttidx > 0; ttidx--) + for (size_t ttidx = frm.pse_tos; ttidx > 0; ttidx--) { - LOG_FMT(LINDPC, " [%d %zu:%zu %s %s/%s tmp=%zu ind=%zu bri=%d tab=%zu cont=%d lvl=%zu blvl=%zu]\n", + LOG_FMT(LINDPC, " [%zu %zu:%zu %s %s/%s tmp=%zu ind=%zu bri=%d tab=%zu cont=%d lvl=%zu blvl=%zu]\n", ttidx, frm.pse[ttidx].pc->orig_line, frm.pse[ttidx].pc->orig_col, @@ -1136,6 +1154,7 @@ void indent_text(void) || pc->parent_type != CT_STRUCT)); } + controlPSECount(frm.pse_tos); if (pc->type == CT_BRACE_CLOSE) { if (frm.pse[frm.pse_tos].type == CT_BRACE_OPEN) @@ -1787,6 +1806,7 @@ void indent_text(void) && pc->parent_type == CT_FUNC_DEF))) { // Skip any continuation indents + controlPSECount(frm.pse_tos - 1); idx = frm.pse_tos - 1; while ( idx > 0 && frm.pse[idx].type != CT_BRACE_OPEN @@ -2593,17 +2613,20 @@ void indent_text(void) null_pc: // Throw out any stuff inside a preprocessor - no need to warn + controlPSECount(frm.pse_tos); while (frm.pse_tos > 0 && frm.pse[frm.pse_tos].in_preproc) { indent_pse_pop(frm, pc); } // Throw out any VBRACE_OPEN at the end - implied with the end of file + controlPSECount(frm.pse_tos); while (frm.pse_tos > 0 && (frm.pse[frm.pse_tos].type == CT_VBRACE_OPEN)) { indent_pse_pop(frm, pc); } + controlPSECount(frm.pse_tos); for (size_t idx_temp = 1; idx_temp <= frm.pse_tos; idx_temp++) { LOG_FMT(LWARN, "%s:%zu Unmatched %s\n", diff --git a/src/uncrustify_types.h b/src/uncrustify_types.h index e4bffc55c9..2bc1cf083f 100644 --- a/src/uncrustify_types.h +++ b/src/uncrustify_types.h @@ -128,7 +128,8 @@ struct parse_frame_t int sparen_count; - paren_stack_entry_t pse[128]; +#define PSE_SIZE 128 + paren_stack_entry_t pse[PSE_SIZE]; size_t pse_tos; int paren_count; From 11dd2f05294d472f165ce78ca9a527f218b59112 Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Wed, 15 Nov 2017 17:43:28 +0100 Subject: [PATCH 124/136] The missed informations --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 32ff43f7aa..36b5dc2f0f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -208,6 +208,7 @@ add_executable(uncrustify src/unc_tools.cpp src/unicode.cpp src/universalindentgui.cpp + src/controlPSECount.cpp src/width.cpp src/align_stack.h src/args.h @@ -231,6 +232,7 @@ add_executable(uncrustify src/unc_ctype.h src/unc_text.h src/unc_tools.h + src/controlPSECount.h ) if(CMAKE_VERSION VERSION_LESS 2.8.10) From 9477a2f1a4d49c8dcd339be1e1d9bda44eeefe33 Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Fri, 17 Nov 2017 17:14:57 +0100 Subject: [PATCH 125/136] Add a control at brace_cleanup.cpp --- release-steps.txt | 20 ++++++++++++++++---- src/brace_cleanup.cpp | 2 ++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/release-steps.txt b/release-steps.txt index 909e976f80..6cc1052f02 100644 --- a/release-steps.txt +++ b/release-steps.txt @@ -46,13 +46,23 @@ Change the date at the first line of this document. (use an admin) 4. Create a GIT tag and push it + +4a. $ git tag -a uncrustify-0.nn -m uncrustify-0.nn - $ git push --tags --repo=https://github.com/uncrustify/uncrustify.git - (use an admin) 4b. Update the config files + $ cd build + $ # remove the old file + $ rm uncrustify_version.h + $ # to be sure to generate a new one with the new version + $ make + $ # generate the config files $ scripts/update-defaults.sh +4c. LATER!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + $ git push --tags --repo=https://github.com/uncrustify/uncrustify.git + (use an admin) + 5. The source tarball is available from the release on GitHub, or use $ git archive -o uncrustify-0.nn.tar.gz uncrustify-0.nn Test it somewhere else @@ -93,8 +103,10 @@ Change the date at the first line of this document. Select files, or drag & drop files here. README.md uncrustify-0.nn.tar.gz - uncrustify-0.nn-win32.zip - uncrustify-0.nn-win64.zip + buildwin-32/uncrustify-0.nn-win32.zip + buildwin-64/uncrustify-0.nn-win64.zip + + "Done" $ scp -r documentation/htdocs/* ChangeLog USER,uncrustify@web.sourceforge.net:htdocs/ diff --git a/src/brace_cleanup.cpp b/src/brace_cleanup.cpp index 060864e3cf..8675c79133 100644 --- a/src/brace_cleanup.cpp +++ b/src/brace_cleanup.cpp @@ -23,6 +23,7 @@ #include "logger.h" #include "helper_for_print.h" #include "indent.h" +#include "controlPSECount.h" /* @@ -192,6 +193,7 @@ void brace_cleanup(void) // Do before assigning stuff from the frame if (cpd.lang_flags & LANG_PAWN) { + controlPSECount(frm.pse_tos); if ( (frm.pse[frm.pse_tos].type == CT_VBRACE_OPEN) && pc->type == CT_NEWLINE) { From 7483d88cde2c96fc981220fffd76c97db7c8e74a Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Fri, 17 Nov 2017 17:47:01 +0100 Subject: [PATCH 126/136] Prepare bugfix for #1349 --- .gitignore | 3 ++- README.md | 4 ++-- src/align.cpp | 50 ++++++++++++++++++++++++++--------------- tests/cli/Output/31.txt | 44 ------------------------------------ 4 files changed, 36 insertions(+), 65 deletions(-) diff --git a/.gitignore b/.gitignore index 0913fdf0df..7a1d7910b4 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ src/uncrustify_version.h # Testing framework results/ tests/results/ +tests/results_2/ tests/usage.txt tests/pclint/ *.sh.trs @@ -90,4 +91,4 @@ build/ # Eclipse Configuration .cproject .project -.settings \ No newline at end of file +.settings diff --git a/README.md b/README.md index 04e77631df..8648f8f64f 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ A source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA ## Features -* highly configurable - __608 configurable options as of version 0.66 +* highly configurable - 608 configurable options as of version 0.66 -
    add/remove spaces - `sp_before_sparen`: _Add or remove space before '(' of 'if', 'for', 'switch', 'while', etc._ @@ -199,7 +199,7 @@ The software has been previously tested on the following operating systems: - OS X - FreeBSD, NetBSD, OpenBSD - Sun Solaris 9 -- Windows XP (binary available) +- Windows (binary available) --------------------------------------------------------------------------- diff --git a/src/align.cpp b/src/align.cpp index e05d8e7693..dd000a1f02 100644 --- a/src/align.cpp +++ b/src/align.cpp @@ -1655,8 +1655,8 @@ static chunk_t *scan_ib_line(chunk_t *start, bool first_pass) if (pc != nullptr) { - LOG_FMT(LSIB, "%s(%d): start=%s col %zu/%zu line %zu\n", - __func__, __LINE__, get_token_name(pc->type), pc->column, pc->orig_col, pc->orig_line); + LOG_FMT(LSIB, "%s(%d): start: orig_line is %zu, orig_col is %zu, column is %zu, type is %s\n", + __func__, __LINE__, pc->orig_line, pc->orig_col, pc->column, get_token_name(pc->type)); } while ( pc != nullptr @@ -1683,8 +1683,12 @@ static chunk_t *scan_ib_line(chunk_t *start, bool first_pass) // Is this a new entry? if (idx >= cpd.al_cnt) { - LOG_FMT(LSIB, " - New [%zu] %.2zu/%zu - %10.10s\n", - idx, pc->column, token_width, get_token_name(pc->type)); + if (idx == 0) + { + LOG_FMT(LSIB, "%s(%d): Prepare the 'idx's\n", __func__, __LINE__); + } + LOG_FMT(LSIB, "%s(%d): New idx is %2.1zu, pc->column is %2.1zu, text() '%s', token_width is %zu, type is %s\n", + __func__, __LINE__, idx, pc->column, pc->text(), token_width, get_token_name(pc->type)); cpd.al[cpd.al_cnt].type = pc->type; cpd.al[cpd.al_cnt].col = pc->column; cpd.al[cpd.al_cnt].len = token_width; @@ -1704,16 +1708,16 @@ static chunk_t *scan_ib_line(chunk_t *start, bool first_pass) // expect to match stuff if (cpd.al[idx].type == pc->type) { - LOG_FMT(LSIB, " - Match [%zu] %.2zu/%zu - %10.10s", - idx, pc->column, token_width, get_token_name(pc->type)); + LOG_FMT(LSIB, "%s(%d): Match? idx is %2.1zu, orig_line is %2.1zu, column is %2.1zu, token_width is %zu, type is %s\n", + __func__, __LINE__, idx, pc->orig_line, pc->column, token_width, get_token_name(pc->type)); // Shift out based on column if (prev_match == nullptr) { if (pc->column > cpd.al[idx].col) { - LOG_FMT(LSIB, " [ pc->col(%zu) > col(%zu) ] ", - pc->column, cpd.al[idx].col); + LOG_FMT(LSIB, "%s(%d): [ pc->column (%zu) > cpd.al[%zu].col(%zu) ] \n", + __func__, __LINE__, pc->column, idx, cpd.al[idx].col); ib_shift_out(idx, pc->column - cpd.al[idx].col); cpd.al[idx].col = pc->column; @@ -1721,16 +1725,19 @@ static chunk_t *scan_ib_line(chunk_t *start, bool first_pass) } else if (idx > 0) { + LOG_FMT(LSIB, "%s(%d): prev_match '%s', prev_match->orig_line is %zu, prev_match->orig_col is %zu\n", + __func__, __LINE__, prev_match->text(), prev_match->orig_line, prev_match->orig_col); int min_col_diff = pc->column - prev_match->column; int cur_col_diff = cpd.al[idx].col - cpd.al[idx - 1].col; if (cur_col_diff < min_col_diff) { - LOG_FMT(LSIB, " [ min_col_diff(%d) > cur_col_diff(%d) ] ", - min_col_diff, cur_col_diff); + LOG_FMT(LSIB, "%s(%d): pc->orig_line is %zu\n", + __func__, __LINE__, pc->orig_line); ib_shift_out(idx, min_col_diff - cur_col_diff); } } - LOG_FMT(LSIB, " - now col %zu, len %zu\n", cpd.al[idx].col, cpd.al[idx].len); + LOG_FMT(LSIB, "%s(%d): at ende of the loop: now is col %zu, len is %zu\n", + __func__, __LINE__, cpd.al[idx].col, cpd.al[idx].len); idx++; } } @@ -1746,11 +1753,12 @@ static void align_log_al(log_sev_t sev, size_t line) { if (log_sev_on(sev)) { - log_fmt(sev, "%s(%d): line %zu, %zu)", + log_fmt(sev, "%s(%d): line %zu, cpd.al_cnt is %zu\n", __func__, __LINE__, line, cpd.al_cnt); for (size_t idx = 0; idx < cpd.al_cnt; idx++) { - log_fmt(sev, " %zu/%zu=%s", cpd.al[idx].col, cpd.al[idx].len, + log_fmt(sev, " cpd.al[%2.1zu].col is %2.1zu, cpd.al[%2.1zu].len is %zu, type is %s\n", + idx, cpd.al[idx].col, idx, cpd.al[idx].len, get_token_name(cpd.al[idx].type)); } log_fmt(sev, "\n"); @@ -1767,7 +1775,7 @@ static void align_init_brace(chunk_t *start) cpd.al_cnt = 0; cpd.al_c99_array = false; - LOG_FMT(LALBR, "%s(%d): start @ %zu:%zu\n", + LOG_FMT(LALBR, "%s(%d): start @ orig_line is %zu, orig_col is %zu\n", __func__, __LINE__, start->orig_line, start->orig_col); chunk_t *pc = chunk_get_next_ncnl(start); @@ -1776,14 +1784,18 @@ static void align_init_brace(chunk_t *start) || (pc->type == CT_BRACE_CLOSE && pc->parent_type == CT_ASSIGN)) { // single line - nothing to do + LOG_FMT(LALBR, "%s(%d): single line - nothing to do\n", __func__, __LINE__); return; } + LOG_FMT(LALBR, "%s(%d): is not a single line\n", __func__, __LINE__); do { pc = scan_ib_line(pc, false); // debug dump the current frame + LOG_FMT(LALBR, "%s(%d): debug dump after, orig_line is %zu\n", + __func__, __LINE__, pc->orig_line); align_log_al(LALBR, pc->orig_line); while (chunk_is_newline(pc)) @@ -1870,6 +1882,8 @@ static void align_init_brace(chunk_t *start) } else if (idx < (cpd.al_cnt - 1)) { + LOG_FMT(LALBR, "%s(%d): idx is %zu, al_cnt is %zu, cpd.al[%zu].col is %zu, cpd.al[%zu].len is %zu\n", + __func__, __LINE__, idx, cpd.al_cnt, idx, cpd.al[idx].col, idx, cpd.al[idx].len); reindent_line(next, cpd.al[idx].col + cpd.al[idx].len); chunk_flags_set(next, PCF_WAS_ALIGNED); } @@ -1972,13 +1986,13 @@ static void align_left_shift(void) { if (pc->type == CT_NEWLINE) { - LOG_FMT(LAVDB, "%s(%d): NEWLINE\n", __func__, __LINE__); + LOG_FMT(LAVDB, "%s(%d): orig_line is %zu, NEWLINE\n", __func__, __LINE__, pc->orig_line); } else { - LOG_FMT(LAVDB, "%s(%d): pc->text() '%s'\n", - __func__, __LINE__, pc->text()); - log_pcf_flags(LINDLINE, pc->flags); + LOG_FMT(LAVDB, "%s(%d): orig_line is %zu, orig_col is %zu, pc->text() '%s'\n", + __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text()); + //log_pcf_flags(LINDLINE, pc->flags); } if ( start != nullptr && ((pc->flags & PCF_IN_PREPROC) != (start->flags & PCF_IN_PREPROC))) diff --git a/tests/cli/Output/31.txt b/tests/cli/Output/31.txt index 76d22a1c1d..e1c43b6eb0 100644 --- a/tests/cli/Output/31.txt +++ b/tests/cli/Output/31.txt @@ -272,50 +272,6 @@ indent_text(): orig_line is , NEWLINE indent_text(): frm.pse_tos is , ...indent_tmp is indent_text(): frm.pse_tos is , ...indent_tmp is indent_text(): frm.pse_tos is , ...indent_tmp is -[x:IN_STRUCT,FORCE_SPACE,STMT_START,EXPR_START] -[x:IN_STRUCT] -[x:IN_STRUCT,PUNCTUATOR] -[x:IN_STRUCT,IN_CLASS,STMT_START,EXPR_START] -[x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] -[x:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,FORCE_SPACE,EXPR_START] -[x:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,VAR_TYPE] -[x:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] -[x:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,VAR_DEF] -[x:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] -[x:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,FORCE_SPACE,EXPR_START,VAR_TYPE] -[x:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,FORCE_SPACE,VAR_TYPE] -[x:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,VAR_DEF] -[x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] -[x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] -[x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,STMT_START,EXPR_START] -[x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] -[x:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,EXPR_START] -[x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] -[x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] -[x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,EXPR_START] -[x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] -[x:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,EXPR_START] -[x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] -[x:IN_STRUCT,IN_CLASS,EMPTY_BODY,PUNCTUATOR] -[x:IN_STRUCT,IN_CLASS,EMPTY_BODY,PUNCTUATOR] -[x:IN_STRUCT,IN_CLASS,STMT_START,EXPR_START,PUNCTUATOR] -[x:IN_STRUCT,IN_CLASS,EXPR_START] -[x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] -[x:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR] -[x:IN_STRUCT,IN_CLASS,EMPTY_BODY,PUNCTUATOR] -[x:IN_STRUCT,IN_CLASS,EMPTY_BODY,PUNCTUATOR] -[x:IN_STRUCT,IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE] -[x:IN_STRUCT,IN_CLASS,VAR_TYPE] -[x:IN_STRUCT,IN_CLASS,VAR_TYPE,PUNCTUATOR] -[x:IN_STRUCT,IN_CLASS,FORCE_SPACE,VAR_TYPE] -[x:IN_STRUCT,IN_CLASS,VAR_DEF,VAR_ST] -[x:IN_STRUCT,IN_CLASS,PUNCTUATOR] -[x:IN_STRUCT,IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE] -[x:IN_STRUCT,IN_CLASS,FORCE_SPACE,VAR_TYPE] -[x:IN_STRUCT,IN_CLASS,VAR_DEF,VAR_ST] -[x:IN_STRUCT,IN_CLASS,PUNCTUATOR] -[x:IN_CLASS,PUNCTUATOR] -[x:PUNCTUATOR] indent_text(): orig_line is , orig_col is , column is , for 'struct' [x:IN_STRUCT,FORCE_SPACE,STMT_START,EXPR_START] indent_text(): frm.pse_tos is , ...indent_tmp is From 40ea596a597298d190f89a40596779e36fdeb688 Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Fri, 17 Nov 2017 18:05:48 +0100 Subject: [PATCH 127/136] The test must begin with the first line of the block. --- src/align.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/align.cpp b/src/align.cpp index dd000a1f02..670b0ec6b2 100644 --- a/src/align.cpp +++ b/src/align.cpp @@ -1779,9 +1779,9 @@ static void align_init_brace(chunk_t *start) __func__, __LINE__, start->orig_line, start->orig_col); chunk_t *pc = chunk_get_next_ncnl(start); - pc = scan_ib_line(pc, true); - if ( pc == nullptr - || (pc->type == CT_BRACE_CLOSE && pc->parent_type == CT_ASSIGN)) + chunk_t *pcSingle = scan_ib_line(pc, true); + if ( pcSingle == nullptr + || (pcSingle->type == CT_BRACE_CLOSE && pcSingle->parent_type == CT_ASSIGN)) { // single line - nothing to do LOG_FMT(LALBR, "%s(%d): single line - nothing to do\n", __func__, __LINE__); From 8f904c74b3402872e2b756eb3b1a1d673dc85c4c Mon Sep 17 00:00:00 2001 From: Guy Maurel Date: Fri, 17 Nov 2017 18:08:17 +0100 Subject: [PATCH 128/136] typo --- src/align.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/align.cpp b/src/align.cpp index 670b0ec6b2..9891f8915a 100644 --- a/src/align.cpp +++ b/src/align.cpp @@ -1778,7 +1778,7 @@ static void align_init_brace(chunk_t *start) LOG_FMT(LALBR, "%s(%d): start @ orig_line is %zu, orig_col is %zu\n", __func__, __LINE__, start->orig_line, start->orig_col); - chunk_t *pc = chunk_get_next_ncnl(start); + chunk_t *pc = chunk_get_next_ncnl(start); chunk_t *pcSingle = scan_ib_line(pc, true); if ( pcSingle == nullptr || (pcSingle->type == CT_BRACE_CLOSE && pcSingle->parent_type == CT_ASSIGN)) From 2987fdc053d4da11b8404e77cd1f42709f9f11a5 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Thu, 16 Nov 2017 19:52:44 +0100 Subject: [PATCH 129/136] tests - align config option values --- tests/config/1liner-no-split.cfg | 320 +- tests/config/1liner-split.cfg | 304 +- tests/config/622_ifdef-indentation.cfg | 2 +- tests/config/623_caret-spacing.cfg | 2 +- tests/config/DoxygenComments_f.cfg | 2 +- tests/config/DoxygenComments_t.cfg | 4 +- tests/config/I1112-2.cfg | 2 +- tests/config/NewLine-f.cfg | 8 +- tests/config/NewLine-i.cfg | 4 +- tests/config/NewLine-r.cfg | 4 +- tests/config/STUCK_macro-difficulties.cfg | 12 +- tests/config/Uncrustify.Common-CStyle.cfg | 486 +-- tests/config/Uncrustify.Common-Cpp.cfg | 26 +- tests/config/Uncrustify.Cpp.cfg | 4 +- .../config/add_long_closebrace_comment_1.cfg | 2 +- tests/config/al.cfg | 542 ++-- tests/config/align-1.cfg | 154 +- tests/config/align-2.cfg | 154 +- tests/config/align-3.cfg | 154 +- tests/config/align_attr.cfg | 6 +- tests/config/align_fcall-2.cfg | 6 +- tests/config/align_fcall.cfg | 4 +- tests/config/align_func_params.cfg | 2 +- tests/config/align_func_params_gap.cfg | 4 +- tests/config/align_func_params_span.cfg | 2 +- tests/config/align_func_params_thresh_1.cfg | 4 +- tests/config/align_func_params_thresh_2.cfg | 4 +- tests/config/align_func_params_thresh_3.cfg | 4 +- tests/config/align_func_params_thresh_4.cfg | 4 +- tests/config/align_keep_extra.cfg | 8 +- tests/config/align_left_shift.cfg | 2 +- tests/config/align_right_cmt_gap-1.cfg | 10 +- tests/config/align_right_cmt_gap-2.cfg | 10 +- tests/config/align_typedef_func-0.cfg | 8 +- tests/config/align_typedef_func-1.cfg | 8 +- tests/config/align_typedef_func-2.cfg | 10 +- tests/config/align_var_class_span.cfg | 2 +- tests/config/align_var_def_thresh_1.cfg | 8 +- tests/config/align_var_def_thresh_2.cfg | 8 +- tests/config/align_var_def_thresh_3.cfg | 8 +- tests/config/amxmodx.cfg | 266 +- tests/config/annot-after.cfg | 6 +- tests/config/annot-between.cfg | 6 +- tests/config/annot-both.cfg | 6 +- tests/config/annot-none.cfg | 6 +- tests/config/annotation.cfg | 6 +- tests/config/avalon.cfg | 208 +- tests/config/avalon2.cfg | 218 +- tests/config/avalon3.cfg | 310 +- tests/config/avalon4.cfg | 406 +-- tests/config/ben.cfg | 436 +-- tests/config/ben2.cfg | 814 ++--- tests/config/blc-1.cfg | 22 +- tests/config/bool-pos-eol-break.cfg | 18 +- tests/config/bool-pos-eol-force.cfg | 18 +- tests/config/bool-pos-eol.cfg | 18 +- tests/config/bool-pos-sol-break.cfg | 18 +- tests/config/bool-pos-sol-force.cfg | 18 +- tests/config/bool-pos-sol.cfg | 18 +- tests/config/brace-allman.cfg | 36 +- tests/config/brace-banner.cfg | 52 +- tests/config/brace-banner.rerun.cfg | 4 +- tests/config/brace-gnu.cfg | 38 +- tests/config/brace-kr-br.cfg | 52 +- tests/config/brace-kr-nobr.cfg | 54 +- tests/config/brace-kr.cfg | 46 +- tests/config/brace-remove-2.cfg | 12 +- tests/config/brace-remove-all.cfg | 12 +- tests/config/brace-ws.cfg | 38 +- tests/config/brace-ws2.cfg | 40 +- tests/config/braces_empty.cfg | 2 +- tests/config/bug_1001.cfg | 6 +- tests/config/bug_1002-r.cfg | 6 +- tests/config/bug_1002.cfg | 6 +- tests/config/bug_1005.cfg | 4 +- tests/config/bug_1041.cfg | 2 +- tests/config/bug_1068.cfg | 2 +- tests/config/bug_1108.cfg | 10 +- tests/config/bug_1112.cfg | 6 +- tests/config/bug_1139-f.cfg | 2 +- tests/config/bug_1139-r.cfg | 2 +- tests/config/bug_1170.cfg | 10 +- tests/config/bug_1235.cfg | 22 +- tests/config/bug_1236.cfg | 24 +- tests/config/bug_1249.cfg | 4 +- tests/config/bug_1315.cfg | 4 +- tests/config/bug_1324.cfg | 6 +- tests/config/bug_1338.cfg | 2 +- tests/config/bug_1349.cfg | 10 +- tests/config/bug_340.cfg | 770 ++--- tests/config/bug_472.cfg | 10 +- tests/config/bug_488.cfg | 8 +- tests/config/bug_489.cfg | 398 +-- tests/config/bug_600.cfg | 2 +- tests/config/bug_612.cfg | 4 +- tests/config/bug_620.cfg | 10 +- tests/config/bug_631.cfg | 342 +- tests/config/bug_633.cfg | 16 +- tests/config/bug_634.cfg | 2 +- tests/config/bug_651.cfg | 10 +- tests/config/bug_657.cfg | 246 +- tests/config/bug_662.cfg | 4 +- tests/config/bug_663.cfg | 2 +- tests/config/bug_664.cfg | 258 +- tests/config/bug_666.cfg | 4 +- tests/config/bug_670.cfg | 598 ++-- tests/config/bug_671.cfg | 982 +++--- tests/config/bug_i_1000-f.cfg | 2 +- tests/config/bug_i_1000-r.cfg | 2 +- tests/config/bug_i_125-412.cfg | 4 +- tests/config/bug_i_222.cfg | 100 +- tests/config/bug_i_322.cfg | 44 +- tests/config/bug_i_323.cfg | 4 +- tests/config/bug_i_359.cfg | 6 +- tests/config/bug_i_405.cfg | 10 +- tests/config/bug_i_408.cfg | 4 +- tests/config/bug_i_409-create.cfg | 10 +- tests/config/bug_i_409-split.cfg | 10 +- tests/config/bug_i_411.cfg | 2 +- tests/config/bug_i_411a.cfg | 2 +- tests/config/bug_i_411b.cfg | 2 +- tests/config/bug_i_477.cfg | 2 +- tests/config/bug_i_478.cfg | 8 +- tests/config/bug_i_481.cfg | 20 +- tests/config/bug_i_552.cfg | 4 +- tests/config/bug_i_568.cfg | 2 +- tests/config/bug_i_596.cfg | 6 +- tests/config/bug_i_663.cfg | 8 +- tests/config/bug_i_666.cfg | 4 +- tests/config/bug_i_679.cfg | 2 +- tests/config/bug_i_687.cfg | 4 +- tests/config/bug_i_771.cfg | 10 +- tests/config/bug_i_793.cfg | 8 +- tests/config/bug_i_825.cfg | 4 +- tests/config/bug_i_876.cfg | 2 +- tests/config/bug_i_889.cfg | 2 +- tests/config/bug_i_928.cfg | 8 +- tests/config/bug_i_935.cfg | 2 +- tests/config/bug_i_938.cfg | 2 +- tests/config/bug_i_width.cfg | 6 +- tests/config/byref-2.cfg | 16 +- tests/config/byref-center.cfg | 8 +- tests/config/byref-left.cfg | 8 +- tests/config/byref-right.cfg | 8 +- tests/config/case-1.cfg | 16 +- tests/config/case-2.cfg | 16 +- tests/config/case-3.cfg | 16 +- tests/config/cast-sp-a.cfg | 390 +-- tests/config/cast-sp-r.cfg | 390 +-- tests/config/cast-type.cfg | 392 +-- tests/config/cast.cfg | 6 +- tests/config/cgal.cfg | 418 +-- tests/config/clark.cfg | 322 +- tests/config/class-colon-pos-eol-add.cfg | 34 +- tests/config/class-colon-pos-eol.cfg | 20 +- tests/config/class-colon-pos-sol-add.cfg | 36 +- tests/config/class-colon-pos-sol.cfg | 20 +- tests/config/class-nl_func-add.cfg | 36 +- tests/config/class-nl_func-add2.cfg | 38 +- tests/config/class-nl_func-del.cfg | 38 +- tests/config/class-on-colon-indent.cfg | 52 +- tests/config/cmt_indent-1.cfg | 10 +- tests/config/cmt_indent-2.cfg | 12 +- tests/config/cmt_indent-3.cfg | 14 +- tests/config/cmt_indent_pp.cfg | 14 +- tests/config/cmt_insert-0.cfg | 14 +- tests/config/cmt_insert-1.cfg | 14 +- tests/config/cmt_multi-1.cfg | 4 +- tests/config/cmt_multi-2.cfg | 4 +- tests/config/cmt_nl_end.cfg | 12 +- tests/config/cmt_right.cfg | 4 +- tests/config/code_width-25.cfg | 2 +- tests/config/comment-align.cfg | 6 +- tests/config/comment_tab_f.cfg | 2 +- tests/config/comment_tab_t.cfg | 2 +- tests/config/cond-1.cfg | 6 +- tests/config/cond-2.cfg | 6 +- tests/config/const_throw.cfg | 6 +- tests/config/cpp_move.cfg | 10 +- tests/config/cpp_to_c-1.cfg | 14 +- tests/config/cpp_to_c-2.cfg | 14 +- tests/config/cpp_to_c-3.cfg | 20 +- tests/config/cs_delegate_default.cfg | 2 +- tests/config/cs_delegate_indent.cfg | 2 +- tests/config/cs_generics.cfg | 14 +- tests/config/cu.cfg | 274 +- tests/config/custom-open.cfg | 30 +- tests/config/custom-open2.cfg | 30 +- tests/config/custom_types_ssl.cfg | 84 +- tests/config/d-tst2.cfg | 168 +- tests/config/d.cfg | 150 +- tests/config/d2.cfg | 180 +- tests/config/d3.cfg | 146 +- tests/config/d3a.cfg | 154 +- tests/config/d_sp_paren.cfg | 10 +- tests/config/del_semicolon.cfg | 8 +- tests/config/delete.cfg | 4 +- tests/config/digraph.cfg | 4 +- tests/config/dont-detab-strings.cfg | 2 +- tests/config/doxy-comment-no.cfg | 988 +++--- tests/config/doxy-comment-yes.cfg | 988 +++--- tests/config/else-if-1.cfg | 8 +- tests/config/else-if-2.cfg | 8 +- tests/config/empty.cfg | 2 +- tests/config/empty_body.cfg | 16 +- tests/config/enable_processing_cmt-empty.cfg | 2 +- tests/config/endif.cfg | 176 +- tests/config/enum.cfg | 26 +- tests/config/enum_comma-1.cfg | 4 +- tests/config/enum_comma-2.cfg | 4 +- tests/config/enum_comma-3.cfg | 4 +- tests/config/enum_comma-4.cfg | 4 +- tests/config/enum_comma-5.cfg | 4 +- tests/config/enum_comma-6.cfg | 6 +- tests/config/first_len_minimum.cfg | 2 +- tests/config/for_auto.cfg | 8 +- tests/config/freebsd.cfg | 738 ++--- tests/config/func-def-1.cfg | 28 +- tests/config/func-def-2.cfg | 22 +- tests/config/func-def-3.cfg | 22 +- tests/config/func_call_user.cfg | 546 ++-- tests/config/func_class.cfg | 10 +- tests/config/func_param.cfg | 12 +- tests/config/func_wrap1.cfg | 4 +- tests/config/func_wrap2.cfg | 4 +- tests/config/ger.cfg | 708 ++--- tests/config/getset.cfg | 106 +- tests/config/gh137.cfg | 10 +- tests/config/gh293.a.cfg | 204 +- tests/config/gh293.b.cfg | 204 +- tests/config/gh419.cfg | 2 +- tests/config/i1165.cfg | 4 +- tests/config/i1181.cfg | 2 +- tests/config/i683.cfg | 4 +- tests/config/if_chain.cfg | 132 +- tests/config/if_chain_braces_0.cfg | 2 +- tests/config/if_chain_braces_1.cfg | 2 +- tests/config/if_chain_braces_2.cfg | 4 +- tests/config/indent-1.cfg | 18 +- tests/config/indent-vbrace.cfg | 990 +++--- tests/config/indent.cfg | 12 +- tests/config/indent_braces_no.cfg | 322 +- .../config/indent_comment_align_thresh_1.cfg | 8 +- .../config/indent_comment_align_thresh_2.cfg | 10 +- tests/config/indent_ctor_init.cfg | 30 +- tests/config/indent_ctor_init_leading.cfg | 32 +- tests/config/indent_ctor_members_twice.cfg | 10 +- tests/config/indent_func_call_param.cfg | 14 +- tests/config/indent_func_def_param.cfg | 14 +- tests/config/indent_func_param.cfg | 12 +- tests/config/indent_func_proto_param.cfg | 12 +- tests/config/indent_namespace-f.cfg | 4 +- tests/config/indent_namespace-t.cfg | 6 +- .../config/indent_namespace_single_indent.cfg | 6 +- tests/config/indent_once.cfg | 10 +- tests/config/indent_paren_after_func_call.cfg | 2 +- tests/config/indent_paren_after_func_decl.cfg | 2 +- tests/config/indent_paren_after_func_def.cfg | 2 +- tests/config/indent_paren_close-0.cfg | 10 +- tests/config/indent_paren_close-1.cfg | 24 +- tests/config/indent_paren_close-2.cfg | 10 +- tests/config/indent_shift.cfg | 8 +- tests/config/indent_switch_pp.cfg | 2 +- tests/config/indent_ternary-1.cfg | 2 +- tests/config/indent_ternary-2.cfg | 2 +- tests/config/indent_var_def.cfg | 652 ++-- tests/config/indent_var_def_cont.cfg | 2 +- tests/config/initlist_leading_commas.cfg | 6 +- tests/config/issue_564.cfg | 4 +- tests/config/issue_574.cfg | 930 +++--- tests/config/issue_633_typename.cfg | 4 +- tests/config/java_foreach.cfg | 390 +-- tests/config/java_synchronized_1.cfg | 16 +- tests/config/java_synchronized_2.cfg | 16 +- tests/config/jdbi-f.cfg | 4 +- tests/config/jdbi-r.cfg | 6 +- tests/config/kdepim.cfg | 980 +++--- tests/config/kw_subst.cfg | 10 +- tests/config/kw_subst2.cfg | 6 +- tests/config/kw_subst3.cfg | 570 ++-- tests/config/kw_subst4.cfg | 8 +- tests/config/label_colon_nl_1.cfg | 2 +- tests/config/label_colon_nl_2.cfg | 2 +- tests/config/lambda1.cfg | 434 +-- tests/config/lambda2.cfg | 436 +-- tests/config/lambda3.cfg | 436 +-- tests/config/libd.cfg | 392 +-- tests/config/long_br_cmt.cfg | 10 +- tests/config/long_namespace.cfg | 4 +- tests/config/mda_space_a.cfg | 8 +- tests/config/mda_space_b.cfg | 8 +- tests/config/mda_space_c.cfg | 8 +- tests/config/misc6.cfg | 6 +- tests/config/mod-paren.cfg | 310 +- tests/config/mod-paren2.cfg | 310 +- tests/config/mod_case_brace_add.cfg | 690 ++--- tests/config/mod_case_brace_rm.cfg | 690 ++--- .../mod_full_brace_nl_block_rem_mlcond-0.cfg | 8 +- .../mod_full_brace_nl_block_rem_mlcond-1.cfg | 2 +- tests/config/mod_move_case_brace.cfg | 690 ++--- tests/config/mod_remove_empty_return.cfg | 2 +- tests/config/mod_remove_extra_semicolon-t.cfg | 2 +- tests/config/mono.cfg | 102 +- tests/config/ms-style-ref.cfg | 2 +- tests/config/multi.cfg | 2 +- tests/config/multi_line_0.cfg | 2 +- tests/config/multi_line_1.cfg | 4 +- tests/config/multi_line_10.cfg | 4 +- tests/config/multi_line_2.cfg | 4 +- tests/config/multi_line_3.cfg | 4 +- tests/config/multi_line_4.cfg | 4 +- tests/config/multi_line_5.cfg | 4 +- tests/config/multi_line_6.cfg | 4 +- tests/config/multi_line_7.cfg | 14 +- tests/config/multi_line_8.cfg | 4 +- tests/config/multi_line_9.cfg | 4 +- tests/config/nSolve.cfg | 2746 ++++++++--------- tests/config/namespace_namespace.cfg | 2 +- tests/config/negative_indent.cfg | 60 +- tests/config/nepenthes.cfg | 728 ++--- tests/config/new_op_a.cfg | 8 +- tests/config/new_op_f.cfg | 8 +- tests/config/new_op_paren_open_close.cfg | 6 +- tests/config/new_op_r.cfg | 8 +- tests/config/newline_after_endif.cfg | 320 +- tests/config/nl-comment.cfg | 174 +- tests/config/nl_access_spec.cfg | 14 +- tests/config/nl_after_func_body-2.cfg | 16 +- tests/config/nl_after_func_body-3.cfg | 6 +- tests/config/nl_after_func_body.cfg | 12 +- tests/config/nl_assign1.cfg | 14 +- tests/config/nl_assign2.cfg | 14 +- tests/config/nl_before_after.cfg | 10 +- tests/config/nl_brace_brace-a.cfg | 2 +- tests/config/nl_brace_square.cfg | 12 +- tests/config/nl_brace_test.cfg | 666 ++-- tests/config/nl_class-a.cfg | 6 +- tests/config/nl_class-r.cfg | 6 +- tests/config/nl_create_one_liner.cfg | 10 +- tests/config/nl_ds_struct_enum-1.cfg | 4 +- tests/config/nl_ds_struct_enum-2.cfg | 4 +- tests/config/nl_endif.cfg | 320 +- tests/config/nl_enum_own_lines-1.cfg | 4 +- tests/config/nl_enum_own_lines-2.cfg | 4 +- tests/config/nl_enum_own_lines-3.cfg | 4 +- tests/config/nl_enum_own_lines-4.cfg | 6 +- tests/config/nl_func_call_empty.cfg | 2 +- tests/config/nl_func_call_paren.cfg | 2 +- tests/config/nl_func_call_paren_empty.cfg | 2 +- tests/config/nl_func_class_scope.cfg | 2 +- tests/config/nl_func_decl_1.cfg | 26 +- tests/config/nl_func_decl_2.cfg | 28 +- tests/config/nl_func_def_paren_empty.cfg | 8 +- tests/config/nl_func_paren_empty.cfg | 8 +- tests/config/nl_func_scope_name.cfg | 8 +- tests/config/nl_func_type_name_class.cfg | 12 +- tests/config/nl_func_type_name_force.cfg | 10 +- tests/config/nl_func_type_name_remove.cfg | 10 +- tests/config/nl_max_blank_in_func-0.cfg | 2 +- tests/config/nl_max_blank_in_func-1.cfg | 2 +- tests/config/nl_max_blank_in_func-2.cfg | 2 +- tests/config/nl_namespace-a.cfg | 6 +- tests/config/nl_namespace-r.cfg | 6 +- tests/config/nl_semicolon.cfg | 170 +- tests/config/nl_template_class-force.cfg | 34 +- tests/config/nl_template_class-remove.cfg | 38 +- tests/config/nl_try-a.cfg | 8 +- tests/config/nl_type_brace_init_lst-f.cfg | 2 +- tests/config/nl_type_brace_init_lst-r.cfg | 2 +- .../config/nl_type_brace_init_lst_close-f.cfg | 2 +- .../config/nl_type_brace_init_lst_close-r.cfg | 2 +- .../config/nl_type_brace_init_lst_open-f.cfg | 2 +- .../config/nl_type_brace_init_lst_open-r.cfg | 2 +- tests/config/no_squeeze_ifdef.cfg | 4 +- tests/config/obj-c-properties.cfg | 12 +- tests/config/obj-c.cfg | 450 +-- tests/config/objc_bug_497.cfg | 4 +- tests/config/objc_complex_method.cfg | 160 +- tests/config/oc-split.cfg | 2 +- tests/config/oc_cond_colon.cfg | 8 +- tests/config/op-space-force.cfg | 18 +- tests/config/op-space-remove-align-1.cfg | 24 +- tests/config/op-space-remove-align-2.cfg | 26 +- tests/config/op-space-remove.cfg | 18 +- tests/config/op_sym_empty.cfg | 8 +- tests/config/pascal_ptr.cfg | 14 +- tests/config/patch_32.cfg | 2 +- tests/config/pawn-escape.cfg | 66 +- tests/config/pawn.cfg | 70 +- tests/config/pbtech.cfg | 154 +- tests/config/pos_compare-eol.cfg | 4 +- tests/config/pos_compare-sol.cfg | 4 +- tests/config/pos_conditional-eol.cfg | 4 +- tests/config/pos_conditional-sol.cfg | 4 +- tests/config/pp-indent-1.cfg | 4 +- tests/config/pp-indent-2.cfg | 6 +- tests/config/pp-indent-3.cfg | 4 +- tests/config/pp-pragma.cfg | 6 +- tests/config/pp-space.cfg | 12 +- tests/config/pp_define_at_level-1.cfg | 10 +- tests/config/pp_if_indent-0.cfg | 10 +- tests/config/pp_if_indent-1.cfg | 10 +- tests/config/pp_if_indent-2.cfg | 10 +- tests/config/pp_if_indent-3.cfg | 10 +- tests/config/pp_if_indent-4.cfg | 18 +- tests/config/pp_indent_brace.cfg | 4 +- tests/config/pp_indent_case.cfg | 4 +- tests/config/pp_indent_extern.cfg | 4 +- tests/config/pp_indent_func_def.cfg | 4 +- tests/config/pp_ret.cfg | 442 +-- tests/config/preproc-cleanup.cfg | 204 +- tests/config/proto-wrap.cfg | 4 +- tests/config/ptr_star-1.cfg | 16 +- tests/config/ptr_star-2.cfg | 16 +- tests/config/ptr_star-3.cfg | 16 +- tests/config/ptr_star-4.cfg | 2 +- tests/config/qt-1.cfg | 40 +- tests/config/rdan.cfg | 734 ++--- tests/config/region-0.cfg | 8 +- tests/config/region-1.cfg | 8 +- tests/config/region-2.cfg | 8 +- tests/config/region-3.cfg | 8 +- tests/config/return-1.cfg | 14 +- tests/config/return-2.cfg | 14 +- tests/config/return-3.cfg | 14 +- tests/config/return-4.cfg | 16 +- tests/config/sef.cfg | 516 ++-- tests/config/sf.3266678.cfg | 12 +- tests/config/sf.3315874.cfg | 192 +- tests/config/sf537.cfg | 222 +- tests/config/sf538.cfg | 224 +- tests/config/sf557.cfg | 4 +- tests/config/sf562.cfg | 338 +- tests/config/sf567.cfg | 2 +- tests/config/sf574.cfg | 962 +++--- tests/config/sf583.cfg | 2 +- tests/config/sf593.cfg | 4 +- tests/config/sf607.cfg | 4 +- tests/config/sf628.cfg | 2 +- tests/config/sim.cfg | 404 +-- tests/config/sort_imports.cfg | 6 +- tests/config/sort_using_categ.cfg | 6 +- tests/config/sp-for-semi.cfg | 8 +- tests/config/sp_after_cast.cfg | 390 +-- tests/config/sp_after_oc_at_sel_add.cfg | 12 +- tests/config/sp_after_oc_at_sel_force.cfg | 12 +- tests/config/sp_after_oc_at_sel_remove.cfg | 12 +- tests/config/sp_after_oc_block_caret_add.cfg | 8 +- .../config/sp_after_oc_block_caret_force.cfg | 8 +- .../config/sp_after_oc_block_caret_remove.cfg | 8 +- tests/config/sp_after_oc_return_type_add.cfg | 10 +- .../config/sp_after_oc_return_type_force.cfg | 10 +- .../config/sp_after_oc_return_type_remove.cfg | 10 +- tests/config/sp_after_sparen.cfg | 6 +- tests/config/sp_after_throw_force.cfg | 4 +- tests/config/sp_after_throw_remove.cfg | 4 +- .../sp_after_type_brace_init_lst_open-f.cfg | 2 +- .../sp_after_type_brace_init_lst_open-r.cfg | 2 +- tests/config/sp_angle_paren.cfg | 4 +- tests/config/sp_angle_paren_empty.cfg | 4 +- tests/config/sp_arith_additive-f.cfg | 2 +- tests/config/sp_arith_additive-r.cfg | 2 +- tests/config/sp_balance_nested_parens.cfg | 4 +- .../sp_before_after_oc_block_caret_remove.cfg | 10 +- tests/config/sp_before_byref-r.cfg | 2 +- tests/config/sp_before_ellipsis-f.cfg | 10 +- tests/config/sp_before_ellipsis-r.cfg | 12 +- tests/config/sp_before_oc_block_caret_add.cfg | 8 +- .../config/sp_before_oc_block_caret_force.cfg | 10 +- .../sp_before_oc_block_caret_remove.cfg | 8 +- tests/config/sp_before_ptr_star-r.cfg | 2 +- tests/config/sp_before_tr_emb_cmt-a.cfg | 736 ++--- tests/config/sp_before_tr_emb_cmt-f.cfg | 736 ++--- .../sp_before_type_brace_init_lst_close-f.cfg | 2 +- .../sp_before_type_brace_init_lst_close-r.cfg | 2 +- tests/config/sp_between_new_paren.cfg | 4 +- tests/config/sp_block_as_argument.cfg | 14 +- tests/config/sp_block_as_argument2.cfg | 6 +- tests/config/sp_block_as_argument3.cfg | 8 +- tests/config/sp_block_as_argument4.cfg | 10 +- tests/config/sp_block_as_argument5.cfg | 14 +- tests/config/sp_cmt_cpp_start_add.cfg | 2 +- tests/config/sp_cmt_cpp_start_force.cfg | 4 +- tests/config/sp_cmt_cpp_start_remove.cfg | 2 +- tests/config/sp_cond_colon.cfg | 10 +- tests/config/sp_cparen_oparen-f.cfg | 6 +- tests/config/sp_cparen_oparen-r.cfg | 6 +- tests/config/sp_enum_paren-f.cfg | 2 +- tests/config/sp_enum_paren-r.cfg | 2 +- tests/config/sp_func_call_empty.cfg | 426 +-- tests/config/sp_func_class_empty.cfg | 6 +- tests/config/sp_func_def_empty.cfg | 6 +- tests/config/sp_func_proto_empty.cfg | 6 +- .../sp_inside_type_brace_init_lst-f.cfg | 2 +- .../sp_inside_type_brace_init_lst-r.cfg | 2 +- tests/config/sp_skip_vbrace_tokens.cfg | 8 +- tests/config/sp_this_paren.cfg | 4 +- tests/config/sp_throw_paren-f.cfg | 2 +- tests/config/sp_throw_paren-r.cfg | 2 +- tests/config/sp_type_brace_init_lst-f.cfg | 2 +- tests/config/sp_type_brace_init_lst-r.cfg | 2 +- tests/config/sp_word_brace_force.cfg | 4 +- tests/config/sp_word_brace_remove.cfg | 4 +- tests/config/squeeze_ifdef.cfg | 4 +- tests/config/squeeze_ifdef_top.cfg | 4 +- tests/config/star_pos-0.cfg | 32 +- tests/config/star_pos-1.cfg | 30 +- tests/config/star_pos-2.cfg | 30 +- tests/config/stdcall.cfg | 2 +- tests/config/string_replace_tab_chars.cfg | 2 +- tests/config/string_replace_tab_chars_f.cfg | 2 +- tests/config/tab-0-11.cfg | 4 +- tests/config/tab-1-11.cfg | 2 +- tests/config/tcf.cfg | 8 +- tests/config/template4.cfg | 2 +- tests/config/template_sp-force.cfg | 38 +- tests/config/template_sp-remove.cfg | 38 +- tests/config/ternary_short.cfg | 10 +- tests/config/toggle_processing_cmt.cfg | 2 +- tests/config/toggle_processing_cmt2.cfg | 2 +- tests/config/type_wrap.cfg | 8 +- tests/config/var_def_gap.cfg | 24 +- tests/config/verbatim_strings.cfg | 12 +- tests/config/verbatim_strings.rerun.cfg | 4 +- tests/config/wessex.cfg | 406 +-- tests/config/width-2.cfg | 56 +- tests/config/width-3.cfg | 44 +- tests/config/width.cfg | 44 +- tests/config/xml-str.cfg | 162 +- 529 files changed, 21488 insertions(+), 21488 deletions(-) diff --git a/tests/config/1liner-no-split.cfg b/tests/config/1liner-no-split.cfg index 88eda4f18b..c50b5a29ed 100644 --- a/tests/config/1liner-no-split.cfg +++ b/tests/config/1liner-no-split.cfg @@ -10,514 +10,514 @@ # # The type of line endings -newlines = lf # auto/lf/crlf/cr +newlines = lf # auto/lf/crlf/cr # The original size of tabs in the input -input_tab_size = 8 # number +input_tab_size = 8 # number # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 3 # number +output_tab_size = 3 # number # The ascii value of the string escape char, usually 92 (\). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # number # # Indenting # # The number of columns to indent per level (usually 2, 3, 4, or 8) -indent_columns = 3 # number +indent_columns = 3 # number # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # number # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # false/true # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # number # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # false/true # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # false/true # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # false/true # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # false/true # Whether to indent the stuff after a leading class colon -indent_class_colon = true # false/true +indent_class_colon = true # false/true # Whether to indent continued function call parameters one indent level (true) or aligns instead of indent (false) -indent_func_call_param = false # false/true +indent_func_call_param = false # false/true # The number of spaces to indent a continued '->' or '.' # Usually set to indent_columns. -indent_member = 3 # number +indent_member = 3 # number # Spaces to indent 'case' from 'switch' -indent_switch_case = 0 # number +indent_switch_case = 0 # number # Spaces to indent '{' from 'case' -indent_case_brace = 0 # number +indent_case_brace = 0 # number # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # false/true # How to indent goto labels (>0=absolute column where 1 is the leftmost column, <=0=subtract from brace indent) -indent_label = 1 # number +indent_label = 1 # number # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # false/true # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # false/true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # ignore/add/remove/force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # ignore/add/remove/force # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # ignore/add/remove/force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # ignore/add/remove/force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # ignore/add/remove/force # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # ignore/add/remove/force # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # ignore/add/remove/force # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # ignore/add/remove/force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # ignore/add/remove/force # Add or remove space after pointer star '*' -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # ignore/add/remove/force # Add or remove space before reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # ignore/add/remove/force # Add or remove space after reference sign '&' -sp_after_byref = ignore # ignore/add/remove/force +sp_after_byref = ignore # ignore/add/remove/force # Add or remove space before '<>' -sp_before_angle = force # ignore/add/remove/force +sp_before_angle = force # ignore/add/remove/force # Add or remove space after '<>' -sp_after_angle = force # ignore/add/remove/force +sp_after_angle = force # ignore/add/remove/force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # ignore/add/remove/force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # ignore/add/remove/force # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # ignore/add/remove/force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = add # ignore/add/remove/force +sp_sparen_brace = add # ignore/add/remove/force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # ignore/add/remove/force # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # ignore/add/remove/force # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # ignore/add/remove/force # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # ignore/add/remove/force # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # ignore/add/remove/force # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # ignore/add/remove/force # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # ignore/add/remove/force # Add or remove space after cast -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # ignore/add/remove/force # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # ignore/add/remove/force # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # ignore/add/remove/force # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = force # ignore/add/remove/force +sp_inside_braces_enum = force # ignore/add/remove/force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = force # ignore/add/remove/force +sp_inside_braces_struct = force # ignore/add/remove/force # Add or remove space inside '{' and '}' -sp_inside_braces = force # ignore/add/remove/force +sp_inside_braces = force # ignore/add/remove/force # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # ignore/add/remove/force # Add or remove space between return type and function name (a minimum of 1 is forced except for pointer return types) -sp_type_func = ignore # ignore/add/remove/force +sp_type_func = ignore # ignore/add/remove/force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # ignore/add/remove/force # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # ignore/add/remove/force # Add or remove space inside empty function '()' -sp_inside_fparens = ignore # ignore/add/remove/force +sp_inside_fparens = ignore # ignore/add/remove/force # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # ignore/add/remove/force # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # ignore/add/remove/force # Add or remove space between ')' and '{' of function -sp_fparen_brace = add # ignore/add/remove/force +sp_fparen_brace = add # ignore/add/remove/force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # ignore/add/remove/force # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # ignore/add/remove/force # Add or remove space between 'return' and '(' -sp_return_paren = remove # ignore/add/remove/force +sp_return_paren = remove # ignore/add/remove/force # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # ignore/add/remove/force # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # ignore/add/remove/force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = force # ignore/add/remove/force +sp_else_brace = force # ignore/add/remove/force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = force # ignore/add/remove/force +sp_brace_else = force # ignore/add/remove/force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # false/true # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # false/true # Whether to right-align numbers -align_number_right = true # false/true +align_number_right = true # false/true -align_func_params = true +align_func_params = true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 1 # number +align_var_def_span = 1 # number # Whether the pointer star is part of the variable name or not -align_var_def_star_style = 1 # number +align_var_def_star_style = 1 # number # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 12 # number +align_var_def_thresh = 12 # number # Whether to align the colon in struct bit fields -align_var_def_colon = true # false/true +align_var_def_colon = true # false/true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = true # false/true +align_var_def_inline = true # false/true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 1 # number +align_assign_span = 1 # number # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 12 # number +align_assign_thresh = 12 # number # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 16 # number +align_enum_equ_span = 16 # number # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # number # The span for aligning struct/union (0=don't align) -align_var_struct_span = 99 # number +align_var_struct_span = 99 # number # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 3 # number +align_struct_init_span = 3 # number # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 3 # number +align_typedef_gap = 3 # number # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 5 # number +align_typedef_span = 5 # number # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type: typedef int * pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # number # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 3 # number +align_right_cmt_span = 3 # number # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # number # Whether to align macros wrapped with a backslash and a newline -align_nl_cont = true # false/true +align_nl_cont = true # false/true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 4 # number +align_pp_define_gap = 4 # number # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 3 # number +align_pp_define_span = 3 # number # # Newline adding and removing options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # number # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # false/true # Don't touch one-line function bodies inside a class xx { } body -nl_class_leave_one_liners = true # false/true -nl_assign_leave_one_liners = true -nl_enum_leave_one_liners = true -nl_func_leave_one_liners = true -nl_if_leave_one_liners = true +nl_class_leave_one_liners = true # false/true +nl_assign_leave_one_liners = true +nl_enum_leave_one_liners = true +nl_func_leave_one_liners = true +nl_if_leave_one_liners = true # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # ignore/add/remove/force # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # number # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # ignore/add/remove/force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # number # Add or remove newline between '=' and '{' -nl_assign_brace = add # ignore/add/remove/force +nl_assign_brace = add # ignore/add/remove/force # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # number # Add or remove newline between function call and '(' -nl_fcall_brace = add # ignore/add/remove/force +nl_fcall_brace = add # ignore/add/remove/force # Add or remove newline between 'enum' and '{' -nl_enum_brace = add # ignore/add/remove/force +nl_enum_brace = add # ignore/add/remove/force # Add or remove newline between 'struct and '{' -nl_struct_brace = add # ignore/add/remove/force +nl_struct_brace = add # ignore/add/remove/force # Add or remove newline between 'union' and '{' -nl_union_brace = add # ignore/add/remove/force +nl_union_brace = add # ignore/add/remove/force # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # ignore/add/remove/force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = ignore # ignore/add/remove/force +nl_elseif_brace = ignore # ignore/add/remove/force # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # ignore/add/remove/force # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # ignore/add/remove/force # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # ignore/add/remove/force # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # ignore/add/remove/force # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # ignore/add/remove/force # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # false/true # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # false/true # Newline between namespace and { -nl_namespace_brace = ignore # ignore/add/remove/force +nl_namespace_brace = ignore # ignore/add/remove/force # Add or remove newline between 'template<>' and 'class' -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # ignore/add/remove/force # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # ignore/add/remove/force # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # ignore/add/remove/force # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # ignore/add/remove/force # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # ignore/add/remove/force # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # ignore/add/remove/force # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # ignore/add/remove/force # Whether to put a newline after 'return' statement -nl_after_return = true # false/true +nl_after_return = true # false/true # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # false/true # Whether to put a newline after brace open -nl_after_brace_open = true # false/true +nl_after_brace_open = true # false/true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # false/true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = true # false/true +nl_squeeze_ifdef = true # false/true # # Positioning options # # The position of boolean operators in wrapped expressions -pos_bool = trail # ignore/lead/trail +pos_bool = trail # ignore/lead/trail # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # ignore/lead/trail # # Blank line options # # The maximum consecutive newlines -nl_max = 4 # number +nl_max = 4 # number # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # number # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # number # The number of newlines after '}' of the function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # number # The minimum number of newlines before a multi-line comment (doesn't apply if after a brace open) -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # number # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # false/true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # false/true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # ignore/add/remove/force # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # ignore/add/remove/force # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # ignore/add/remove/force # Add or remove braces on single-line 'if' statement -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # ignore/add/remove/force # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # number # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # ignore/add/remove/force # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = add # ignore/add/remove/force +mod_paren_on_return = add # ignore/add/remove/force # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # false/true # # Comment modifications # # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # false/true # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # false/true # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # false/true # Whether to put a star on subsequent comment lines -cmt_star_cont = true # false/true +cmt_star_cont = true # false/true # # Preprocessor options # # Add or remove indent of preprocessor directives -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # ignore/add/remove/force # Add or remove space between # and, say, define -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # ignore/add/remove/force -nl_getset_brace = force +nl_getset_brace = force -mod_full_paren_if_bool = true +mod_full_paren_if_bool = true -sp_before_semi_for_empty = force +sp_before_semi_for_empty = force diff --git a/tests/config/1liner-split.cfg b/tests/config/1liner-split.cfg index 63a7e3d3dd..494b450e79 100644 --- a/tests/config/1liner-split.cfg +++ b/tests/config/1liner-split.cfg @@ -8,453 +8,453 @@ # # The type of line endings -newlines = lf # auto/lf/crlf/cr +newlines = lf # auto/lf/crlf/cr # The original size of tabs in the input -input_tab_size = 8 # number +input_tab_size = 8 # number # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 3 # number +output_tab_size = 3 # number # The ascii value of the string escape char, usually 92 (\). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # number # # Indenting # # The number of columns to indent per level (usually 2, 3, 4, or 8) -indent_columns = 3 # number +indent_columns = 3 # number # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # number # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # false/true # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # number # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # false/true # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # false/true # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # false/true # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # false/true # Whether to indent the stuff after a leading class colon -indent_class_colon = true # false/true +indent_class_colon = true # false/true # Whether to indent continued function call parameters one indent level (true) or aligns instead of indent (false) -indent_func_call_param = false # false/true +indent_func_call_param = false # false/true # The number of spaces to indent a continued '->' or '.' # Usually set to indent_columns. -indent_member = 3 # number +indent_member = 3 # number # Spaces to indent 'case' from 'switch' -indent_switch_case = 0 # number +indent_switch_case = 0 # number # Spaces to indent '{' from 'case' -indent_case_brace = 0 # number +indent_case_brace = 0 # number # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # false/true # How to indent goto labels (>0=absolute column where 1 is the leftmost column, <=0=subtract from brace indent) -indent_label = 1 # number +indent_label = 1 # number # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # false/true # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # false/true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # ignore/add/remove/force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # ignore/add/remove/force # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # ignore/add/remove/force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # ignore/add/remove/force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # ignore/add/remove/force # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # ignore/add/remove/force # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # ignore/add/remove/force # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # ignore/add/remove/force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # ignore/add/remove/force # Add or remove space after pointer star '*' -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # ignore/add/remove/force # Add or remove space before reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # ignore/add/remove/force # Add or remove space after reference sign '&' -sp_after_byref = ignore # ignore/add/remove/force +sp_after_byref = ignore # ignore/add/remove/force # Add or remove space before '<>' -sp_before_angle = force # ignore/add/remove/force +sp_before_angle = force # ignore/add/remove/force # Add or remove space after '<>' -sp_after_angle = force # ignore/add/remove/force +sp_after_angle = force # ignore/add/remove/force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # ignore/add/remove/force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # ignore/add/remove/force # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # ignore/add/remove/force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = add # ignore/add/remove/force +sp_sparen_brace = add # ignore/add/remove/force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # ignore/add/remove/force # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # ignore/add/remove/force # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # ignore/add/remove/force # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # ignore/add/remove/force # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # ignore/add/remove/force # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # ignore/add/remove/force # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # ignore/add/remove/force # Add or remove space after cast -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # ignore/add/remove/force # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # ignore/add/remove/force # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # ignore/add/remove/force # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = force # ignore/add/remove/force +sp_inside_braces_enum = force # ignore/add/remove/force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = force # ignore/add/remove/force +sp_inside_braces_struct = force # ignore/add/remove/force # Add or remove space inside '{' and '}' -sp_inside_braces = force # ignore/add/remove/force +sp_inside_braces = force # ignore/add/remove/force # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # ignore/add/remove/force # Add or remove space between return type and function name (a minimum of 1 is forced except for pointer return types) -sp_type_func = ignore # ignore/add/remove/force +sp_type_func = ignore # ignore/add/remove/force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # ignore/add/remove/force # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # ignore/add/remove/force # Add or remove space inside empty function '()' -sp_inside_fparens = ignore # ignore/add/remove/force +sp_inside_fparens = ignore # ignore/add/remove/force # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # ignore/add/remove/force # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # ignore/add/remove/force # Add or remove space between ')' and '{' of function -sp_fparen_brace = add # ignore/add/remove/force +sp_fparen_brace = add # ignore/add/remove/force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # ignore/add/remove/force # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # ignore/add/remove/force # Add or remove space between 'return' and '(' -sp_return_paren = remove # ignore/add/remove/force +sp_return_paren = remove # ignore/add/remove/force # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # ignore/add/remove/force # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # ignore/add/remove/force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = ignore # ignore/add/remove/force +sp_else_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # ignore/add/remove/force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # false/true # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # false/true # Whether to right-align numbers -align_number_right = true # false/true +align_number_right = true # false/true -align_func_params = true +align_func_params = true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 1 # number +align_var_def_span = 1 # number # Whether the pointer star is part of the variable name or not -align_var_def_star_style = 1 # number +align_var_def_star_style = 1 # number # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 12 # number +align_var_def_thresh = 12 # number # Whether to align the colon in struct bit fields -align_var_def_colon = true # false/true +align_var_def_colon = true # false/true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = true # false/true +align_var_def_inline = true # false/true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 1 # number +align_assign_span = 1 # number # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 12 # number +align_assign_thresh = 12 # number # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 16 # number +align_enum_equ_span = 16 # number # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # number # The span for aligning struct/union (0=don't align) -align_var_struct_span = 99 # number +align_var_struct_span = 99 # number # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 3 # number +align_struct_init_span = 3 # number # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 3 # number +align_typedef_gap = 3 # number # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 5 # number +align_typedef_span = 5 # number # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type: typedef int * pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # number # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 3 # number +align_right_cmt_span = 3 # number # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # number # Whether to align macros wrapped with a backslash and a newline -align_nl_cont = true # false/true +align_nl_cont = true # false/true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 4 # number +align_pp_define_gap = 4 # number # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 3 # number +align_pp_define_span = 3 # number # # Newline adding and removing options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # number # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # false/true # Don't touch one-line function bodies inside a class xx { } body -nl_class_leave_one_liners = true # false/true -nl_assign_leave_one_liners = false -nl_enum_leave_one_liners = false -nl_func_leave_one_liners = false +nl_class_leave_one_liners = true # false/true +nl_assign_leave_one_liners = false +nl_enum_leave_one_liners = false +nl_func_leave_one_liners = false # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # ignore/add/remove/force # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # number # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # ignore/add/remove/force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # number # Add or remove newline between '=' and '{' -nl_assign_brace = add # ignore/add/remove/force +nl_assign_brace = add # ignore/add/remove/force # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # number # Add or remove newline between function call and '(' -nl_fcall_brace = add # ignore/add/remove/force +nl_fcall_brace = add # ignore/add/remove/force # Add or remove newline between 'enum' and '{' -nl_enum_brace = add # ignore/add/remove/force +nl_enum_brace = add # ignore/add/remove/force # Add or remove newline between 'struct and '{' -nl_struct_brace = add # ignore/add/remove/force +nl_struct_brace = add # ignore/add/remove/force # Add or remove newline between 'union' and '{' -nl_union_brace = add # ignore/add/remove/force +nl_union_brace = add # ignore/add/remove/force # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # ignore/add/remove/force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = ignore # ignore/add/remove/force +nl_elseif_brace = ignore # ignore/add/remove/force # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # ignore/add/remove/force # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # ignore/add/remove/force # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # ignore/add/remove/force # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # ignore/add/remove/force # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # ignore/add/remove/force # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # false/true # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # false/true # Newline between namespace and { -nl_namespace_brace = ignore # ignore/add/remove/force +nl_namespace_brace = ignore # ignore/add/remove/force # Add or remove newline between 'template<>' and 'class' -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # ignore/add/remove/force # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # ignore/add/remove/force # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # ignore/add/remove/force # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # ignore/add/remove/force # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # ignore/add/remove/force # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # ignore/add/remove/force # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # ignore/add/remove/force # Whether to put a newline after 'return' statement -nl_after_return = true # false/true +nl_after_return = true # false/true # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # false/true # Whether to put a newline after brace open -nl_after_brace_open = true # false/true -nl_after_vbrace_open = true +nl_after_brace_open = true # false/true +nl_after_vbrace_open = true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # false/true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = true # false/true +nl_squeeze_ifdef = true # false/true # # Positioning options # # The position of boolean operators in wrapped expressions -pos_bool = trail # ignore/lead/trail +pos_bool = trail # ignore/lead/trail # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # ignore/lead/trail # # Blank line options # # The maximum consecutive newlines -nl_max = 4 # number +nl_max = 4 # number # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # number # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # number # The number of newlines after '}' of the function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # number # The minimum number of newlines before a multi-line comment (doesn't apply if after a brace open) -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # number # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # false/true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # false/true # # Code modifying options (non-whitespace) @@ -489,33 +489,33 @@ eat_blanks_before_close_brace = true # false/true # # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # false/true # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # false/true # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # false/true # Whether to put a star on subsequent comment lines -cmt_star_cont = true # false/true +cmt_star_cont = true # false/true # # Preprocessor options # # Add or remove indent of preprocessor directives -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # ignore/add/remove/force # Add or remove space between # and, say, define -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # ignore/add/remove/force -nl_getset_brace = force +nl_getset_brace = force -mod_full_paren_if_bool = true +mod_full_paren_if_bool = true -sp_before_semi_for_empty = force +sp_before_semi_for_empty = force diff --git a/tests/config/622_ifdef-indentation.cfg b/tests/config/622_ifdef-indentation.cfg index 0f342db5e2..aa9f962a37 100644 --- a/tests/config/622_ifdef-indentation.cfg +++ b/tests/config/622_ifdef-indentation.cfg @@ -1 +1 @@ -pp_space=ignore +pp_space = ignore diff --git a/tests/config/623_caret-spacing.cfg b/tests/config/623_caret-spacing.cfg index 6260329c8d..29727227a4 100644 --- a/tests/config/623_caret-spacing.cfg +++ b/tests/config/623_caret-spacing.cfg @@ -1 +1 @@ -sp_arith=add +sp_arith = add diff --git a/tests/config/DoxygenComments_f.cfg b/tests/config/DoxygenComments_f.cfg index e7ab65f266..bf637708dd 100644 --- a/tests/config/DoxygenComments_f.cfg +++ b/tests/config/DoxygenComments_f.cfg @@ -1 +1 @@ -sp_cmt_cpp_start=add +sp_cmt_cpp_start = add diff --git a/tests/config/DoxygenComments_t.cfg b/tests/config/DoxygenComments_t.cfg index 3bb34e9f42..83385e8aa5 100644 --- a/tests/config/DoxygenComments_t.cfg +++ b/tests/config/DoxygenComments_t.cfg @@ -1,2 +1,2 @@ -sp_cmt_cpp_start=add -sp_cmt_cpp_doxygen=true +sp_cmt_cpp_start = add +sp_cmt_cpp_doxygen = true diff --git a/tests/config/I1112-2.cfg b/tests/config/I1112-2.cfg index b4e29f4a52..935595019c 100644 --- a/tests/config/I1112-2.cfg +++ b/tests/config/I1112-2.cfg @@ -1,4 +1,4 @@ indent_continue = indent_columns #indent_member should not be used in I1112-2.cpp indent_member = 3 -indent_access_spec_body = true \ No newline at end of file +indent_access_spec_body = true diff --git a/tests/config/NewLine-f.cfg b/tests/config/NewLine-f.cfg index 8b429e5c8c..b76e5420fd 100644 --- a/tests/config/NewLine-f.cfg +++ b/tests/config/NewLine-f.cfg @@ -1,4 +1,4 @@ -nl_start_of_file=force -nl_start_of_file_min=1 -nl_end_of_file=force -nl_end_of_file_min=1 +nl_start_of_file = force +nl_start_of_file_min = 1 +nl_end_of_file = force +nl_end_of_file_min = 1 diff --git a/tests/config/NewLine-i.cfg b/tests/config/NewLine-i.cfg index 45bcd54eae..6f61bc15d9 100644 --- a/tests/config/NewLine-i.cfg +++ b/tests/config/NewLine-i.cfg @@ -1,2 +1,2 @@ -nl_start_of_file=ignore -nl_end_of_file=ignore +nl_start_of_file = ignore +nl_end_of_file = ignore diff --git a/tests/config/NewLine-r.cfg b/tests/config/NewLine-r.cfg index 2d4d67d220..dd29e851ee 100644 --- a/tests/config/NewLine-r.cfg +++ b/tests/config/NewLine-r.cfg @@ -1,2 +1,2 @@ -nl_start_of_file=remove -nl_end_of_file=remove +nl_start_of_file = remove +nl_end_of_file = remove diff --git a/tests/config/STUCK_macro-difficulties.cfg b/tests/config/STUCK_macro-difficulties.cfg index a344d5d9bc..0ccef77b19 100644 --- a/tests/config/STUCK_macro-difficulties.cfg +++ b/tests/config/STUCK_macro-difficulties.cfg @@ -1,6 +1,6 @@ -sp_pp_concat=ignore - -# try to get rid of the need for this. though is it really possible without uncrustify processing #includes itself? -# it would have no way otherwise of knowing that 'inline' suddenly is no longer a keyword. really need to add the ability -# to set this inline in the file that is hitting the trouble instead. -set WORD inline +sp_pp_concat = ignore + +# try to get rid of the need for this. though is it really possible without uncrustify processing #includes itself? +# it would have no way otherwise of knowing that 'inline' suddenly is no longer a keyword. really need to add the ability +# to set this inline in the file that is hitting the trouble instead. +set WORD inline diff --git a/tests/config/Uncrustify.Common-CStyle.cfg b/tests/config/Uncrustify.Common-CStyle.cfg index edf3f866cc..9d35b4ec5c 100644 --- a/tests/config/Uncrustify.Common-CStyle.cfg +++ b/tests/config/Uncrustify.Common-CStyle.cfg @@ -7,7 +7,7 @@ #newlines { Auto, LF, CR, CRLF } # The type of line endings. Default=Auto # -input_tab_size=4 # Number +input_tab_size = 4 # Number # The original size of tabs in the input. Default=8 # #output_tab_size Number @@ -19,37 +19,37 @@ input_tab_size=4 # Number #string_escape_char2 Number # Alternate string escape char for Pawn. Only works right before the quote char. # -string_replace_tab_chars=true # { False, True } +string_replace_tab_chars = true # { False, True } # Replace tab characters found in string literals with the escape sequence \t instead. # -tok_split_gte=false # { False, True } +tok_split_gte = false # { False, True } # Allow interpreting '>=' and '>>=' as part of a template in 'void f(list>=val);'. # If true, 'assert(x<0 && y>=3)' will be broken. Default=False # Improvements to template detection may make this option obsolete. # -disable_processing_cmt=*begin-nonstandard-formatting* +disable_processing_cmt = *begin-nonstandard-formatting* # Override the default ' *INDENT-OFF*' in comments for disabling processing of part of the file. # -enable_processing_cmt=*end-nonstandard-formatting* +enable_processing_cmt = *end-nonstandard-formatting* # Override the default ' *INDENT-ON*' in comments for enabling processing of part of the file. # #enable_digraphs { False, True } # Enable parsing of digraphs. Default=False # -utf8_bom=remove # { Ignore, Add, Remove, Force } +utf8_bom = remove # { Ignore, Add, Remove, Force } # Control what to do with the UTF-8 BOM (recommend 'remove') # -utf8_byte=false # { False, True } +utf8_byte = false # { False, True } # If the file contains bytes with values between 128 and 255, but is not UTF-8, then output as UTF-8 # -utf8_force=false # { False, True } +utf8_force = false # { False, True } # Force the output encoding to UTF-8 # ## ## Indenting ## # -indent_columns=4 # Number +indent_columns = 4 # Number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. Default=8 # @@ -57,17 +57,17 @@ indent_columns=4 # Number # The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents. # For FreeBSD, this is set to 4. Negative value is absolute and not increased for each ( level # -indent_with_tabs=0 # Number +indent_with_tabs = 0 # Number # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs to brace level, align with spaces (default) # 2=indent and align with tabs, using spaces when not on a tabstop # -indent_cmt_with_tabs=false # { False, True } +indent_cmt_with_tabs = false # { False, True } # Comments that are not a brace level are indented with tabs on a tabstop. # Requires indent_with_tabs=2. If false, will use spaces. # -indent_align_string=false # { False, True } +indent_align_string = false # { False, True } # Whether to indent strings broken by '\' so that they line up # #indent_xml_string Number @@ -77,28 +77,28 @@ indent_align_string=false # { False, True } #indent_brace Number # Spaces to indent '{' from level # -indent_braces=false # { False, True } +indent_braces = false # { False, True } # Whether braces are indented to the body level # -indent_braces_no_func=false # { False, True } +indent_braces_no_func = false # { False, True } # Disabled indenting function braces if indent_braces is true # -indent_braces_no_class=false # { False, True } +indent_braces_no_class = false # { False, True } # Disabled indenting class braces if indent_braces is true # -indent_braces_no_struct=false # { False, True } +indent_braces_no_struct = false # { False, True } # Disabled indenting struct braces if indent_braces is true # -indent_brace_parent=false # { False, True } +indent_brace_parent = false # { False, True } # Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc. # #indent_paren_open_brace { False, True } # Indent based on the paren open instead of the brace open in '({\n', default is to indent by brace. # -indent_cs_delegate_brace=true # { False, True } +indent_cs_delegate_brace = true # { False, True } # indent a C# delegate by another level, default is to not indent by another level. # -indent_namespace=true # { False, True } +indent_namespace = true # { False, True } # Whether the 'namespace' body is indented # #indent_namespace_single_indent { False, True } @@ -112,13 +112,13 @@ indent_namespace=true # { False, True } # If the body of the namespace is longer than this number, it won't be indented. # Requires indent_namespace=true. Default=0 (no limit) # -indent_extern=false # { False, True } +indent_extern = false # { False, True } # Whether the 'extern "C"' body is indented # -indent_class=true # { False, True } +indent_class = true # { False, True } # Whether the 'class' body is indented # -indent_class_colon=false # { False, True } +indent_class_colon = false # { False, True } # Whether to indent the stuff after a leading base class colon # #indent_class_on_colon { False, True } @@ -134,14 +134,14 @@ indent_class_colon=false # { False, True } #indent_ctor_init Number # Additional indenting for constructor initializer list # -indent_else_if=false # { False, True } +indent_else_if = false # { False, True } # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level # #indent_var_def_blk Number # Amount to indent variable declarations after a open brace. neg=relative, pos=absolute # -indent_var_def_cont=false # { False, True } +indent_var_def_cont = false # { False, True } # Indent continued variable declarations instead of aligning. # #indent_shift { False, True } @@ -152,26 +152,26 @@ indent_var_def_cont=false # { False, True } # True: force indentation of function definition to start in column 1 # False: use the default behavior # -indent_func_call_param=true # { False, True } +indent_func_call_param = true # { False, True } # True: indent continued function call parameters one indent level # False: align parameters under the open paren # -indent_func_def_param=true # { False, True } +indent_func_def_param = true # { False, True } # Same as indent_func_call_param, but for function defs # -indent_func_proto_param=true # { False, True } +indent_func_proto_param = true # { False, True } # Same as indent_func_call_param, but for function protos # -indent_func_class_param=false # { False, True } +indent_func_class_param = false # { False, True } # Same as indent_func_call_param, but for class declarations # -indent_func_ctor_var_param=false # { False, True } +indent_func_ctor_var_param = false # { False, True } # Same as indent_func_call_param, but for class variable constructors # -indent_template_param=false # { False, True } +indent_template_param = false # { False, True } # Same as indent_func_call_param, but for templates # -indent_func_param_double=false # { False, True } +indent_func_param_double = false # { False, True } # Double the indent for indent_func_xxx_param options # #indent_func_const Number @@ -187,40 +187,40 @@ indent_func_param_double=false # { False, True } #indent_sing_line_comments Number # Spaces to indent single line ('//') comments on lines before code # -indent_relative_single_line_comments=false # { False, True } +indent_relative_single_line_comments = false # { False, True } # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column # -indent_switch_case=4 # Number +indent_switch_case = 4 # Number # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. # -indent_case_shift=0 # Number +indent_case_shift = 0 # Number # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. # -indent_case_brace=0 # Number +indent_case_brace = 0 # Number # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. # -indent_col1_comment=false # { False, True } +indent_col1_comment = false # { False, True } # Whether to indent comments found in first column # -indent_label=-4 # Number +indent_label = -4 # Number # How to indent goto labels # >0: absolute column where 1 is the leftmost column # <=0: subtract from brace indent # Default=1 # -indent_access_spec=-4 # Number +indent_access_spec = -4 # Number # Same as indent_label, but for access specifiers that are followed by a colon. Default=1 # #indent_access_spec_body { False, True } # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' # -indent_paren_nl=false # { False, True } +indent_paren_nl = false # { False, True } # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) # #indent_paren_close Number @@ -229,19 +229,19 @@ indent_paren_nl=false # { False, True } # 1: Align under the open paren # 2: Indent to the brace level # -indent_comma_paren=false # { False, True } +indent_comma_paren = false # { False, True } # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren # -indent_bool_paren=false # { False, True } +indent_bool_paren = false # { False, True } # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren # -indent_first_bool_expr=false # { False, True } +indent_first_bool_expr = false # { False, True } # If 'indent_bool_paren' is true, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones # -indent_square_nl=false # { False, True } +indent_square_nl = false # { False, True } # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) # -indent_preserve_sql=false # { False, True } +indent_preserve_sql = false # { False, True } # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies # #indent_align_assign { False, True } @@ -262,7 +262,7 @@ indent_preserve_sql=false # { False, True } # If true, prioritize aligning with initial colon (and stripping spaces from lines, if necessary). # Default=True. # -indent_oc_block_msg_xcode_style=true # { False, True } +indent_oc_block_msg_xcode_style = true # { False, True } # If indent_oc_block_msg and this option are on, blocks will be indented the way that Xcode does by default (from keyword if the parameter is on its own line; otherwise, from the previous indentation level). # #indent_oc_block_msg_from_keyword { False, True } @@ -293,11 +293,11 @@ indent_oc_block_msg_xcode_style=true # { False, True } ## Spacing options ## # -sp_arith=add # { Ignore, Add, Remove, Force } +sp_arith = add # { Ignore, Add, Remove, Force } # Add or remove space around arithmetic operator '+', '-', '/', '*', etc # also '>>>' '<<' '>>' '%' '|' # -sp_assign=add # { Ignore, Add, Remove, Force } +sp_assign = add # { Ignore, Add, Remove, Force } # Add or remove space around assignment operator '=', '+=', etc # #sp_cpp_lambda_assign { Ignore, Add, Remove, Force } @@ -306,7 +306,7 @@ sp_assign=add # { Ignore, Add, Remove, For #sp_cpp_lambda_paren { Ignore, Add, Remove, Force } # Add or remove space after the capture specification in C++11 lambda. # -sp_assign_default=add # { Ignore, Add, Remove, Force } +sp_assign_default = add # { Ignore, Add, Remove, Force } # Add or remove space around assignment operator '=' in a prototype # #sp_before_assign { Ignore, Add, Remove, Force } @@ -318,7 +318,7 @@ sp_assign_default=add # { Ignore, Add, Remove, For #sp_enum_paren { Ignore, Add, Remove, Force } # Add or remove space in 'NS_ENUM (' # -sp_enum_assign=add # { Ignore, Add, Remove, Force } +sp_enum_assign = add # { Ignore, Add, Remove, Force } # Add or remove space around assignment '=' in enum # #sp_enum_before_assign { Ignore, Add, Remove, Force } @@ -327,34 +327,34 @@ sp_enum_assign=add # { Ignore, Add, Remove, For #sp_enum_after_assign { Ignore, Add, Remove, Force } # Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. # -sp_pp_concat=remove # { Ignore, Add, Remove, Force } +sp_pp_concat = remove # { Ignore, Add, Remove, Force } # Add or remove space around preprocessor '##' concatenation operator. Default=Add # -sp_pp_stringify=remove # { Ignore, Add, Remove, Force } +sp_pp_stringify = remove # { Ignore, Add, Remove, Force } # Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator. # #sp_before_pp_stringify { Ignore, Add, Remove, Force } # Add or remove space before preprocessor '#' stringify operator as in '#define x(y) L#y'. # -sp_bool=add # { Ignore, Add, Remove, Force } +sp_bool = add # { Ignore, Add, Remove, Force } # Add or remove space around boolean operators '&&' and '||' # -sp_compare=add # { Ignore, Add, Remove, Force } +sp_compare = add # { Ignore, Add, Remove, Force } # Add or remove space around compare operator '<', '>', '==', etc # -sp_inside_paren=remove # { Ignore, Add, Remove, Force } +sp_inside_paren = remove # { Ignore, Add, Remove, Force } # Add or remove space inside '(' and ')' # -sp_paren_paren=remove # { Ignore, Add, Remove, Force } +sp_paren_paren = remove # { Ignore, Add, Remove, Force } # Add or remove space between nested parens: '((' vs ') )' # #sp_cparen_oparen { Ignore, Add, Remove, Force } # Add or remove space between back-to-back parens: ')(' vs ') (' # -sp_balance_nested_parens=false # { False, True } +sp_balance_nested_parens = false # { False, True } # Whether to balance spaces inside nested parens # -sp_paren_brace=force # { Ignore, Add, Remove, Force } +sp_paren_brace = force # { Ignore, Add, Remove, Force } # Add or remove space between ')' and '{' # #sp_before_ptr_star { Ignore, Add, Remove, Force } @@ -398,45 +398,45 @@ sp_paren_brace=force # { Ignore, Add, Remove, For #sp_before_byref_func { Ignore, Add, Remove, Force } # Add or remove space before a reference sign '&', if followed by a func proto/def. # -sp_after_type=ignore # { Ignore, Add, Remove, Force } +sp_after_type = ignore # { Ignore, Add, Remove, Force } # Add or remove space between type and word. Default=Force # #sp_before_template_paren { Ignore, Add, Remove, Force } # Add or remove space before the paren in the D constructs 'template Foo(' and 'class Foo('. # -sp_template_angle=remove # { Ignore, Add, Remove, Force } +sp_template_angle = remove # { Ignore, Add, Remove, Force } # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. # -sp_before_angle=remove # { Ignore, Add, Remove, Force } +sp_before_angle = remove # { Ignore, Add, Remove, Force } # Add or remove space before '<>' # -sp_inside_angle=remove # { Ignore, Add, Remove, Force } +sp_inside_angle = remove # { Ignore, Add, Remove, Force } # Add or remove space inside '<' and '>' # #sp_after_angle { Ignore, Add, Remove, Force } # Add or remove space after '<>' # -sp_angle_paren=remove # { Ignore, Add, Remove, Force } +sp_angle_paren = remove # { Ignore, Add, Remove, Force } # Add or remove space between '<>' and '(' as found in 'new List(foo);' # -sp_angle_paren_empty=remove # { Ignore, Add, Remove, Force } +sp_angle_paren_empty = remove # { Ignore, Add, Remove, Force } # Add or remove space between '<>' and '()' as found in 'new List();' # -sp_angle_word=add # { Ignore, Add, Remove, Force } +sp_angle_word = add # { Ignore, Add, Remove, Force } # Add or remove space between '<>' and a word as in 'List m;' or 'template static ...' # -sp_angle_shift=remove # { Ignore, Add, Remove, Force } +sp_angle_shift = remove # { Ignore, Add, Remove, Force } # Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add # #sp_permit_cpp11_shift { False, True } # Permit removal of the space between '>>' in 'foo >' (C++11 only). Default=False # sp_angle_shift cannot remove the space without this option. # -sp_before_sparen=force # { Ignore, Add, Remove, Force } +sp_before_sparen = force # { Ignore, Add, Remove, Force } # Add or remove space before '(' of 'if', 'for', 'switch', 'while', etc. # -sp_inside_sparen=remove # { Ignore, Add, Remove, Force } +sp_inside_sparen = remove # { Ignore, Add, Remove, Force } # Add or remove space inside if-condition '(' and ')' # #sp_inside_sparen_close { Ignore, Add, Remove, Force } @@ -445,10 +445,10 @@ sp_inside_sparen=remove # { Ignore, Add, Remove, For #sp_inside_sparen_open { Ignore, Add, Remove, Force } # Add or remove space after if-condition '('. Overrides sp_inside_sparen. # -sp_after_sparen=add # { Ignore, Add, Remove, Force } +sp_after_sparen = add # { Ignore, Add, Remove, Force } # Add or remove space after ')' of 'if', 'for', 'switch', and 'while', etc. # -sp_sparen_brace=force # { Ignore, Add, Remove, Force } +sp_sparen_brace = force # { Ignore, Add, Remove, Force } # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while', etc. # #sp_invariant_paren { Ignore, Add, Remove, Force } @@ -457,61 +457,61 @@ sp_sparen_brace=force # { Ignore, Add, Remove, For #sp_after_invariant_paren { Ignore, Add, Remove, Force } # Add or remove space after the ')' in 'invariant (C) c' in the D language. # -sp_special_semi=force # { Ignore, Add, Remove, Force } +sp_special_semi = force # { Ignore, Add, Remove, Force } # Add or remove space before empty statement ';' on 'if', 'for' and 'while' # -sp_before_semi=remove # { Ignore, Add, Remove, Force } +sp_before_semi = remove # { Ignore, Add, Remove, Force } # Add or remove space before ';'. Default=Remove # -sp_before_semi_for=remove # { Ignore, Add, Remove, Force } +sp_before_semi_for = remove # { Ignore, Add, Remove, Force } # Add or remove space before ';' in non-empty 'for' statements # -sp_before_semi_for_empty=remove # { Ignore, Add, Remove, Force } +sp_before_semi_for_empty = remove # { Ignore, Add, Remove, Force } # Add or remove space before a semicolon of an empty part of a for statement. # -sp_after_semi=add # { Ignore, Add, Remove, Force } +sp_after_semi = add # { Ignore, Add, Remove, Force } # Add or remove space after ';', except when followed by a comment. Default=Add # -sp_after_semi_for=force # { Ignore, Add, Remove, Force } +sp_after_semi_for = force # { Ignore, Add, Remove, Force } # Add or remove space after ';' in non-empty 'for' statements. Default=Force # -sp_after_semi_for_empty=remove # { Ignore, Add, Remove, Force } +sp_after_semi_for_empty = remove # { Ignore, Add, Remove, Force } # Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; ). # -sp_before_square=remove # { Ignore, Add, Remove, Force } +sp_before_square = remove # { Ignore, Add, Remove, Force } # Add or remove space before '[' (except '[]') # -sp_before_squares=remove # { Ignore, Add, Remove, Force } +sp_before_squares = remove # { Ignore, Add, Remove, Force } # Add or remove space before '[]' # -sp_inside_square=remove # { Ignore, Add, Remove, Force } +sp_inside_square = remove # { Ignore, Add, Remove, Force } # Add or remove space inside a non-empty '[' and ']' # -sp_after_comma=add # { Ignore, Add, Remove, Force } +sp_after_comma = add # { Ignore, Add, Remove, Force } # Add or remove space after ',' # -sp_before_comma=ignore # { Ignore, Add, Remove, Force } +sp_before_comma = ignore # { Ignore, Add, Remove, Force } # Add or remove space before ','. Default=Remove # -sp_after_mdatype_commas=remove # { Ignore, Add, Remove, Force } +sp_after_mdatype_commas = remove # { Ignore, Add, Remove, Force } # Add or remove space between ',' and ']' in multidimensional array type 'int[,,]' # -sp_before_mdatype_commas=remove # { Ignore, Add, Remove, Force } +sp_before_mdatype_commas = remove # { Ignore, Add, Remove, Force } # Add or remove space between '[' and ',' in multidimensional array type 'int[,,]' # -sp_between_mdatype_commas=remove # { Ignore, Add, Remove, Force } +sp_between_mdatype_commas = remove # { Ignore, Add, Remove, Force } # Add or remove space between ',' in multidimensional array type 'int[,,]' # -sp_paren_comma=remove # { Ignore, Add, Remove, Force } +sp_paren_comma = remove # { Ignore, Add, Remove, Force } # Add or remove space between an open paren and comma: '(,' vs '( ,'. Default=Force # #sp_before_ellipsis { Ignore, Add, Remove, Force } # Add or remove space before the variadic '...' when preceded by a non-punctuator # -sp_after_class_colon=force # { Ignore, Add, Remove, Force } +sp_after_class_colon = force # { Ignore, Add, Remove, Force } # Add or remove space after class ':' # -sp_before_class_colon=force # { Ignore, Add, Remove, Force } +sp_before_class_colon = force # { Ignore, Add, Remove, Force } # Add or remove space before class ':' # #sp_after_constr_colon { Ignore, Add, Remove, Force } @@ -520,34 +520,34 @@ sp_before_class_colon=force # { Ignore, Add, Remove, For #sp_before_constr_colon { Ignore, Add, Remove, Force } # Add or remove space before class constructor ':' # -sp_before_case_colon=remove # { Ignore, Add, Remove, Force } +sp_before_case_colon = remove # { Ignore, Add, Remove, Force } # Add or remove space before case ':'. Default=Remove # -sp_after_operator=remove # { Ignore, Add, Remove, Force } +sp_after_operator = remove # { Ignore, Add, Remove, Force } # Add or remove space between 'operator' and operator sign # -sp_after_operator_sym=remove # { Ignore, Add, Remove, Force } +sp_after_operator_sym = remove # { Ignore, Add, Remove, Force } # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' # -sp_after_operator_sym_empty=remove # { Ignore, Add, Remove, Force } +sp_after_operator_sym_empty = remove # { Ignore, Add, Remove, Force } # Add or remove space between the operator symbol and the open paren when the operator has no arguments, as in 'operator *()' # -sp_after_cast=remove # { Ignore, Add, Remove, Force } +sp_after_cast = remove # { Ignore, Add, Remove, Force } # Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' # -sp_inside_paren_cast=remove # { Ignore, Add, Remove, Force } +sp_inside_paren_cast = remove # { Ignore, Add, Remove, Force } # Add or remove spaces inside cast parens # -sp_cpp_cast_paren=remove # { Ignore, Add, Remove, Force } +sp_cpp_cast_paren = remove # { Ignore, Add, Remove, Force } # Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)' # -sp_sizeof_paren=remove # { Ignore, Add, Remove, Force } +sp_sizeof_paren = remove # { Ignore, Add, Remove, Force } # Add or remove space between 'sizeof' and '(' # #sp_after_tag { Ignore, Add, Remove, Force } # Add or remove space after the tag keyword (Pawn) # -sp_inside_braces_enum=add # { Ignore, Add, Remove, Force } +sp_inside_braces_enum = add # { Ignore, Add, Remove, Force } # Add or remove space inside enum '{' and '}' # #sp_inside_braces_struct { Ignore, Add, Remove, Force } @@ -556,29 +556,29 @@ sp_inside_braces_enum=add # { Ignore, Add, Remove, For #sp_inside_braces { Ignore, Add, Remove, Force } # Add or remove space inside '{' and '}' # -sp_inside_braces_empty=remove # { Ignore, Add, Remove, Force } +sp_inside_braces_empty = remove # { Ignore, Add, Remove, Force } # Add or remove space inside '{}' # -sp_type_func=ignore # { Ignore, Add, Remove, Force } +sp_type_func = ignore # { Ignore, Add, Remove, Force } # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. # -sp_func_proto_paren=remove # { Ignore, Add, Remove, Force } +sp_func_proto_paren = remove # { Ignore, Add, Remove, Force } # Add or remove space between function name and '(' on function declaration # #sp_func_proto_paren_empty { Ignore, Add, Remove, Force } # Add or remove space between function name and '()' on function declaration without parameters # -sp_func_def_paren=remove # { Ignore, Add, Remove, Force } +sp_func_def_paren = remove # { Ignore, Add, Remove, Force } # Add or remove space between function name and '(' on function definition # #sp_func_def_paren_empty { Ignore, Add, Remove, Force } # Add or remove space between function name and '()' on function definition without parameters # -sp_inside_fparens=remove # { Ignore, Add, Remove, Force } +sp_inside_fparens = remove # { Ignore, Add, Remove, Force } # Add or remove space inside empty function '()' # -sp_inside_fparen=remove # { Ignore, Add, Remove, Force } +sp_inside_fparen = remove # { Ignore, Add, Remove, Force } # Add or remove space inside function '(' and ')' # #sp_inside_tparen { Ignore, Add, Remove, Force } @@ -590,45 +590,45 @@ sp_inside_fparen=remove # { Ignore, Add, Remove, For #sp_square_fparen { Ignore, Add, Remove, Force } # Add or remove space between ']' and '(' when part of a function call. # -sp_fparen_brace=add # { Ignore, Add, Remove, Force } +sp_fparen_brace = add # { Ignore, Add, Remove, Force } # Add or remove space between ')' and '{' of function # #sp_fparen_dbrace { Ignore, Add, Remove, Force } # Java: Add or remove space between ')' and '{{' of double brace initializer. # -sp_func_call_paren=remove # { Ignore, Add, Remove, Force } +sp_func_call_paren = remove # { Ignore, Add, Remove, Force } # Add or remove space between function name and '(' on function calls # -sp_func_call_paren_empty=remove # { Ignore, Add, Remove, Force } +sp_func_call_paren_empty = remove # { Ignore, Add, Remove, Force } # Add or remove space between function name and '()' on function calls without parameters. # If set to 'ignore' (the default), sp_func_call_paren is used. # -sp_func_call_user_paren=remove # { Ignore, Add, Remove, Force } +sp_func_call_user_paren = remove # { Ignore, Add, Remove, Force } # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. # -sp_func_class_paren=remove # { Ignore, Add, Remove, Force } +sp_func_class_paren = remove # { Ignore, Add, Remove, Force } # Add or remove space between a constructor/destructor and the open paren # #sp_func_class_paren_empty { Ignore, Add, Remove, Force } # Add or remove space between a constructor without parameters or destructor and '()' # -sp_return_paren=add # { Ignore, Add, Remove, Force } +sp_return_paren = add # { Ignore, Add, Remove, Force } # Add or remove space between 'return' and '(' # #sp_attribute_paren { Ignore, Add, Remove, Force } # Add or remove space between '__attribute__' and '(' # -sp_defined_paren=remove # { Ignore, Add, Remove, Force } +sp_defined_paren = remove # { Ignore, Add, Remove, Force } # Add or remove space between 'defined' and '(' in '#if defined (FOO)' # -sp_throw_paren=add # { Ignore, Add, Remove, Force } +sp_throw_paren = add # { Ignore, Add, Remove, Force } # Add or remove space between 'throw' and '(' in 'throw (something)' # #sp_after_throw { Ignore, Add, Remove, Force } # Add or remove space between 'throw' and anything other than '(' as in '@throw [...];' # -sp_catch_paren=add # { Ignore, Add, Remove, Force } +sp_catch_paren = add # { Ignore, Add, Remove, Force } # Add or remove space between 'catch' and '(' in 'catch (something) { }' # If set to ignore, sp_before_sparen is used. # @@ -658,7 +658,7 @@ sp_catch_paren=add # { Ignore, Add, Remove, For #sp_brace_else { Ignore, Add, Remove, Force } # Add or remove space between '}' and 'else' if on the same line # -sp_brace_typedef=add # { Ignore, Add, Remove, Force } +sp_brace_typedef = add # { Ignore, Add, Remove, Force } # Add or remove space between '}' and the name of a typedef on the same line # #sp_catch_brace { Ignore, Add, Remove, Force } @@ -676,7 +676,7 @@ sp_brace_typedef=add # { Ignore, Add, Remove, For #sp_try_brace { Ignore, Add, Remove, Force } # Add or remove space between 'try' and '{' if on the same line # -sp_getset_brace=add # { Ignore, Add, Remove, Force } +sp_getset_brace = add # { Ignore, Add, Remove, Force } # Add or remove space between get/set and '{' if on the same line # #sp_word_brace { Ignore, Add, Remove, Force } @@ -694,68 +694,68 @@ sp_getset_brace=add # { Ignore, Add, Remove, For #sp_d_array_colon { Ignore, Add, Remove, Force } # Add or remove around the D named array initializer ':' operator # -sp_not=remove # { Ignore, Add, Remove, Force } +sp_not = remove # { Ignore, Add, Remove, Force } # Add or remove space after the '!' (not) operator. Default=Remove # -sp_inv=remove # { Ignore, Add, Remove, Force } +sp_inv = remove # { Ignore, Add, Remove, Force } # Add or remove space after the '~' (invert) operator. Default=Remove # -sp_addr=remove # { Ignore, Add, Remove, Force } +sp_addr = remove # { Ignore, Add, Remove, Force } # Add or remove space after the '&' (address-of) operator. Default=Remove # This does not affect the spacing after a '&' that is part of a type. # -sp_member=remove # { Ignore, Add, Remove, Force } +sp_member = remove # { Ignore, Add, Remove, Force } # Add or remove space around the '.' or '->' operators. Default=Remove # -sp_deref=remove # { Ignore, Add, Remove, Force } +sp_deref = remove # { Ignore, Add, Remove, Force } # Add or remove space after the '*' (dereference) operator. Default=Remove # This does not affect the spacing after a '*' that is part of a type. # -sp_sign=remove # { Ignore, Add, Remove, Force } +sp_sign = remove # { Ignore, Add, Remove, Force } # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove # -sp_incdec=remove # { Ignore, Add, Remove, Force } +sp_incdec = remove # { Ignore, Add, Remove, Force } # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove # -sp_before_nl_cont=add # { Ignore, Add, Remove, Force } +sp_before_nl_cont = add # { Ignore, Add, Remove, Force } # Add or remove space before a backslash-newline at the end of a line. Default=Add # -sp_after_oc_scope=force # { Ignore, Add, Remove, Force } +sp_after_oc_scope = force # { Ignore, Add, Remove, Force } # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' # -sp_after_oc_colon=remove # { Ignore, Add, Remove, Force } +sp_after_oc_colon = remove # { Ignore, Add, Remove, Force } # Add or remove space after the colon in message specs # '-(int) f:(int) x;' vs '-(int) f: (int) x;' # -sp_before_oc_colon=remove # { Ignore, Add, Remove, Force } +sp_before_oc_colon = remove # { Ignore, Add, Remove, Force } # Add or remove space before the colon in message specs # '-(int) f: (int) x;' vs '-(int) f : (int) x;' # -sp_after_oc_dict_colon=force # { Ignore, Add, Remove, Force } +sp_after_oc_dict_colon = force # { Ignore, Add, Remove, Force } # Add or remove space after the colon in immutable dictionary expression # 'NSDictionary *test = @{@"foo" :@"bar"};' # -sp_before_oc_dict_colon=remove # { Ignore, Add, Remove, Force } +sp_before_oc_dict_colon = remove # { Ignore, Add, Remove, Force } # Add or remove space before the colon in immutable dictionary expression # 'NSDictionary *test = @{@"foo" :@"bar"};' # -sp_after_send_oc_colon=force # { Ignore, Add, Remove, Force } +sp_after_send_oc_colon = force # { Ignore, Add, Remove, Force } # Add or remove space after the colon in message specs # '[object setValue:1];' vs '[object setValue: 1];' # -sp_before_send_oc_colon=remove # { Ignore, Add, Remove, Force } +sp_before_send_oc_colon = remove # { Ignore, Add, Remove, Force } # Add or remove space before the colon in message specs # '[object setValue:1];' vs '[object setValue :1];' # -sp_after_oc_type=remove # { Ignore, Add, Remove, Force } +sp_after_oc_type = remove # { Ignore, Add, Remove, Force } # Add or remove space after the (type) in message specs # '-(int)f: (int) x;' vs '-(int)f: (int)x;' # -sp_after_oc_return_type=remove # { Ignore, Add, Remove, Force } +sp_after_oc_return_type = remove # { Ignore, Add, Remove, Force } # Add or remove space after the first (type) in message specs # '-(int) f:(int)x;' vs '-(int)f:(int)x;' # -sp_after_oc_at_sel=remove # { Ignore, Add, Remove, Force } +sp_after_oc_at_sel = remove # { Ignore, Add, Remove, Force } # Add or remove space between '@selector' and '(' # '@selector(msgName)' vs '@selector (msgName)' # Also applies to @protocol() constructs @@ -764,7 +764,7 @@ sp_after_oc_at_sel=remove # { Ignore, Add, Remove, For # Add or remove space between '@selector(x)' and the following word # '@selector(foo) a:' vs '@selector(foo)a:' # -sp_inside_oc_at_sel_parens=remove # { Ignore, Add, Remove, Force } +sp_inside_oc_at_sel_parens = remove # { Ignore, Add, Remove, Force } # Add or remove space inside '@selector' parens # '@selector(foo)' vs '@selector( foo )' # Also applies to @protocol() constructs @@ -784,7 +784,7 @@ sp_inside_oc_at_sel_parens=remove # { Ignore, Add, Remove, For #sp_after_oc_property { Ignore, Add, Remove, Force } # Add or remove space after @property. # -sp_cond_colon=add # { Ignore, Add, Remove, Force } +sp_cond_colon = add # { Ignore, Add, Remove, Force } # Add or remove space around the ':' in 'b ? t : f' # #sp_cond_colon_before { Ignore, Add, Remove, Force } @@ -793,7 +793,7 @@ sp_cond_colon=add # { Ignore, Add, Remove, For #sp_cond_colon_after { Ignore, Add, Remove, Force } # Add or remove space after the ':' in 'b ? t : f'. Overrides sp_cond_colon. # -sp_cond_question=add # { Ignore, Add, Remove, Force } +sp_cond_question = add # { Ignore, Add, Remove, Force } # Add or remove space around the '?' in 'b ? t : f' # #sp_cond_question_before { Ignore, Add, Remove, Force } @@ -805,7 +805,7 @@ sp_cond_question=add # { Ignore, Add, Remove, For #sp_cond_ternary_short { Ignore, Add, Remove, Force } # In the abbreviated ternary form (a ?: b), add/remove space between ? and :.'. Overrides all other sp_cond_* options. # -sp_case_label=ignore # { Ignore, Add, Remove, Force } +sp_case_label = ignore # { Ignore, Add, Remove, Force } # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. # #sp_range { Ignore, Add, Remove, Force } @@ -832,10 +832,10 @@ sp_case_label=ignore # { Ignore, Add, Remove, For #sp_endif_cmt { Ignore, Add, Remove, Force } # Controls the spaces between #else or #endif and a trailing comment # -sp_after_new=force # { Ignore, Add, Remove, Force } +sp_after_new = force # { Ignore, Add, Remove, Force } # Controls the spaces after 'new', 'delete' and 'delete[]' # -sp_between_new_paren=remove # { Ignore, Add, Remove, Force } +sp_between_new_paren = remove # { Ignore, Add, Remove, Force } # Controls the spaces between new and '(' in 'new()' # #sp_before_tr_emb_cmt { Ignore, Add, Remove, Force } @@ -847,32 +847,32 @@ sp_between_new_paren=remove # { Ignore, Add, Remove, For #sp_annotation_paren { Ignore, Add, Remove, Force } # Control space between a Java annotation and the open paren. # -sp_skip_vbrace_tokens=true # { False, True } +sp_skip_vbrace_tokens = true # { False, True } # If true, vbrace tokens are dropped to the previous token and skipped. # ## ## Code alignment (not left column spaces/tabs) ## # -align_keep_tabs=false # { False, True } +align_keep_tabs = false # { False, True } # Whether to keep non-indenting tabs # -align_with_tabs=false # { False, True } +align_with_tabs = false # { False, True } # Whether to use tabs for aligning # -align_on_tabstop=false # { False, True } +align_on_tabstop = false # { False, True } # Whether to bump out to the next tab when aligning # -align_number_right=false # { False, True } +align_number_right = false # { False, True } # Whether to right-align numbers # #align_keep_extra_space { False, True } # Whether to keep whitespace not required for alignment. # -align_func_params=false # { False, True } +align_func_params = false # { False, True } # Align variable definitions in prototypes and functions # -align_same_func_call_params=false # { False, True } +align_same_func_call_params = false # { False, True } # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. # @@ -897,13 +897,13 @@ align_same_func_call_params=false # { False, True } #align_var_def_gap Number # The gap for aligning variable definitions # -align_var_def_colon=false # { False, True } +align_var_def_colon = false # { False, True } # Whether to align the colon in struct bit fields # -align_var_def_attribute=false # { False, True } +align_var_def_attribute = false # { False, True } # Whether to align any attribute after the variable name # -align_var_def_inline=false # { False, True } +align_var_def_inline = false # { False, True } # Whether to align inline struct/enum/union variable definitions # #align_assign_span Number @@ -957,7 +957,7 @@ align_var_def_inline=false # { False, True } #align_right_cmt_span Number # The span for aligning comments that end lines (0=don't align) # -align_right_cmt_mix=false # { False, True } +align_right_cmt_mix = false # { False, True } # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment # #align_right_cmt_gap Number @@ -973,17 +973,17 @@ align_right_cmt_mix=false # { False, True } #align_func_proto_gap Number # Minimum gap between the return type and the function name. # -align_on_operator=false # { False, True } +align_on_operator = false # { False, True } # Align function protos on the 'operator' keyword instead of what follows # -align_mix_var_proto=false # { False, True } +align_mix_var_proto = false # { False, True } # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. # -align_single_line_func=false # { False, True } +align_single_line_func = false # { False, True } # Align single-line functions with function prototypes, uses align_func_proto_span # -align_single_line_brace=false # { False, True } +align_single_line_brace = false # { False, True } # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span # @@ -993,7 +993,7 @@ align_single_line_brace=false # { False, True } #align_oc_msg_spec_span Number # The span for aligning ObjC msg spec (0=don't align) # -align_nl_cont=false # { False, True } +align_nl_cont = false # { False, True } # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. # @@ -1006,7 +1006,7 @@ align_nl_cont=false # { False, True } #align_pp_define_span Number # The span for aligning on '#define' bodies (0=don't align, other=number of lines including comments between blocks) # -align_left_shift=false # { False, True } +align_left_shift = false # { False, True } # Align lines that start with '<<' with previous '<<'. Default=True # #align_asm_colon { False, True } @@ -1025,52 +1025,52 @@ align_left_shift=false # { False, True } ## Newline adding and removing options ## # -nl_collapse_empty_body=false # { False, True } +nl_collapse_empty_body = false # { False, True } # Whether to collapse empty blocks between '{' and '}' # -nl_assign_leave_one_liners=true # { False, True } +nl_assign_leave_one_liners = true # { False, True } # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' # -nl_class_leave_one_liners=true # { False, True } +nl_class_leave_one_liners = true # { False, True } # Don't split one-line braced statements inside a class xx { } body # -nl_enum_leave_one_liners=true # { False, True } +nl_enum_leave_one_liners = true # { False, True } # Don't split one-line enums: 'enum foo { BAR = 15 };' # -nl_getset_leave_one_liners=true # { False, True } +nl_getset_leave_one_liners = true # { False, True } # Don't split one-line get or set functions # -nl_func_leave_one_liners=true # { False, True } +nl_func_leave_one_liners = true # { False, True } # Don't split one-line function definitions - 'int foo() { return 0; }' # -nl_cpp_lambda_leave_one_liners=true # { False, True } +nl_cpp_lambda_leave_one_liners = true # { False, True } # Don't split one-line C++11 lambdas - '[]() { return 0; }' # -nl_if_leave_one_liners=false # { False, True } +nl_if_leave_one_liners = false # { False, True } # Don't split one-line if/else statements - 'if(a) b++;' # #nl_while_leave_one_liners { False, True } # Don't split one-line while statements - 'while(a) b++;' # -nl_oc_msg_leave_one_liner=true # { False, True } +nl_oc_msg_leave_one_liner = true # { False, True } # Don't split one-line OC messages # #nl_oc_block_brace { Ignore, Add, Remove, Force } # Add or remove newline between Objective-C block signature and '{' # -nl_start_of_file=remove # { Ignore, Add, Remove, Force } +nl_start_of_file = remove # { Ignore, Add, Remove, Force } # Add or remove newlines at the start of the file # #nl_start_of_file_min Number # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' # -nl_end_of_file=force # { Ignore, Add, Remove, Force } +nl_end_of_file = force # { Ignore, Add, Remove, Force } # Add or remove newline at the end of the file # -nl_end_of_file_min=1 # Number +nl_end_of_file_min = 1 # Number # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') # -nl_assign_brace=force # { Ignore, Add, Remove, Force } +nl_assign_brace = force # { Ignore, Add, Remove, Force } # Add or remove newline between '=' and '{' # #nl_assign_square { Ignore, Add, Remove, Force } @@ -1113,50 +1113,50 @@ nl_assign_brace=force # { Ignore, Add, Remove, For # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } # -nl_enum_brace=force # { Ignore, Add, Remove, Force } +nl_enum_brace = force # { Ignore, Add, Remove, Force } # Add or remove newline between 'enum' and '{' # -nl_struct_brace=force # { Ignore, Add, Remove, Force } +nl_struct_brace = force # { Ignore, Add, Remove, Force } # Add or remove newline between 'struct and '{' # -nl_union_brace=force # { Ignore, Add, Remove, Force } +nl_union_brace = force # { Ignore, Add, Remove, Force } # Add or remove newline between 'union' and '{' # -nl_if_brace=force # { Ignore, Add, Remove, Force } +nl_if_brace = force # { Ignore, Add, Remove, Force } # Add or remove newline between 'if' and '{' # -nl_brace_else=force # { Ignore, Add, Remove, Force } +nl_brace_else = force # { Ignore, Add, Remove, Force } # Add or remove newline between '}' and 'else' # #nl_elseif_brace { Ignore, Add, Remove, Force } # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead # -nl_else_brace=force # { Ignore, Add, Remove, Force } +nl_else_brace = force # { Ignore, Add, Remove, Force } # Add or remove newline between 'else' and '{' # -nl_else_if=remove # { Ignore, Add, Remove, Force } +nl_else_if = remove # { Ignore, Add, Remove, Force } # Add or remove newline between 'else' and 'if' # -nl_brace_finally=force # { Ignore, Add, Remove, Force } +nl_brace_finally = force # { Ignore, Add, Remove, Force } # Add or remove newline between '}' and 'finally' # -nl_finally_brace=force # { Ignore, Add, Remove, Force } +nl_finally_brace = force # { Ignore, Add, Remove, Force } # Add or remove newline between 'finally' and '{' # -nl_try_brace=force # { Ignore, Add, Remove, Force } +nl_try_brace = force # { Ignore, Add, Remove, Force } # Add or remove newline between 'try' and '{' # -nl_getset_brace=force # { Ignore, Add, Remove, Force } +nl_getset_brace = force # { Ignore, Add, Remove, Force } # Add or remove newline between get/set and '{' # -nl_for_brace=force # { Ignore, Add, Remove, Force } +nl_for_brace = force # { Ignore, Add, Remove, Force } # Add or remove newline between 'for' and '{' # -nl_catch_brace=force # { Ignore, Add, Remove, Force } +nl_catch_brace = force # { Ignore, Add, Remove, Force } # Add or remove newline between 'catch' and '{' # -nl_brace_catch=force # { Ignore, Add, Remove, Force } +nl_brace_catch = force # { Ignore, Add, Remove, Force } # Add or remove newline between '}' and 'catch' # #nl_brace_square { Ignore, Add, Remove, Force } @@ -1165,7 +1165,7 @@ nl_brace_catch=force # { Ignore, Add, Remove, For #nl_brace_fparen { Ignore, Add, Remove, Force } # Add or remove newline between '}' and ')' in a function invocation # -nl_while_brace=force # { Ignore, Add, Remove, Force } +nl_while_brace = force # { Ignore, Add, Remove, Force } # Add or remove newline between 'while' and '{' # #nl_scope_brace { Ignore, Add, Remove, Force } @@ -1177,51 +1177,51 @@ nl_while_brace=force # { Ignore, Add, Remove, For #nl_version_brace { Ignore, Add, Remove, Force } # Add or remove newline between 'version (x)' and '{' (D) # -nl_using_brace=force # { Ignore, Add, Remove, Force } +nl_using_brace = force # { Ignore, Add, Remove, Force } # Add or remove newline between 'using' and '{' # -nl_brace_brace=ignore # { Ignore, Add, Remove, Force } +nl_brace_brace = ignore # { Ignore, Add, Remove, Force } # Add or remove newline between two open or close braces. # Due to general newline/brace handling, REMOVE may not work. # -nl_do_brace=force # { Ignore, Add, Remove, Force } +nl_do_brace = force # { Ignore, Add, Remove, Force } # Add or remove newline between 'do' and '{' # -nl_brace_while=force # { Ignore, Add, Remove, Force } +nl_brace_while = force # { Ignore, Add, Remove, Force } # Add or remove newline between '}' and 'while' of 'do' statement # -nl_switch_brace=force # { Ignore, Add, Remove, Force } +nl_switch_brace = force # { Ignore, Add, Remove, Force } # Add or remove newline between 'switch' and '{' # #nl_synchronized_brace { Ignore, Add, Remove, Force } # Add or remove newline between 'synchronized' and '{' # -nl_multi_line_cond=false # { False, True } +nl_multi_line_cond = false # { False, True } # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch and nl_catch_brace. # #nl_multi_line_define { False, True } # Force a newline in a define after the macro name for multi-line defines. # -nl_before_case=false # { False, True } +nl_before_case = false # { False, True } # Whether to put a newline before 'case' statement, not after the first 'case' # #nl_before_throw { Ignore, Add, Remove, Force } # Add or remove newline between ')' and 'throw' # -nl_after_case=false # { False, True } +nl_after_case = false # { False, True } # Whether to put a newline after 'case' statement # -nl_case_colon_brace=force # { Ignore, Add, Remove, Force } +nl_case_colon_brace = force # { Ignore, Add, Remove, Force } # Add or remove a newline between a case ':' and '{'. Overrides nl_after_case. # -nl_namespace_brace=force # { Ignore, Add, Remove, Force } +nl_namespace_brace = force # { Ignore, Add, Remove, Force } # Newline between namespace and { # -nl_template_class=ignore # { Ignore, Add, Remove, Force } +nl_template_class = ignore # { Ignore, Add, Remove, Force } # Add or remove newline between 'template<>' and whatever follows. # -nl_class_brace=force # { Ignore, Add, Remove, Force } +nl_class_brace = force # { Ignore, Add, Remove, Force } # Add or remove newline between 'class' and '{' # #nl_class_init_args { Ignore, Add, Remove, Force } @@ -1326,7 +1326,7 @@ nl_class_brace=force # { Ignore, Add, Remove, For # Whether to put each OC message parameter on a separate line # See nl_oc_msg_leave_one_liner # -nl_fdef_brace=force # { Ignore, Add, Remove, Force } +nl_fdef_brace = force # { Ignore, Add, Remove, Force } # Add or remove newline between function signature and '{' # #nl_cpp_ldef_brace { Ignore, Add, Remove, Force } @@ -1335,33 +1335,33 @@ nl_fdef_brace=force # { Ignore, Add, Remove, For #nl_return_expr { Ignore, Add, Remove, Force } # Add or remove a newline between the return keyword and return expression. # -nl_after_semicolon=false # { False, True } +nl_after_semicolon = false # { False, True } # Whether to put a newline after semicolons, except in 'for' statements # #nl_paren_dbrace_open { Ignore, Add, Remove, Force } # Java: Control the newline between the ')' and '{{' of the double brace initializer. # -nl_after_brace_open=false # { False, True } +nl_after_brace_open = false # { False, True } # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. # -nl_after_brace_open_cmt=false # { False, True } +nl_after_brace_open_cmt = false # { False, True } # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. # -nl_after_vbrace_open=false # { False, True } +nl_after_vbrace_open = false # { False, True } # Whether to put a newline after a virtual brace open with a non-empty body. # These occur in un-braced if/while/do/for statement bodies. # -nl_after_vbrace_open_empty=false # { False, True } +nl_after_vbrace_open_empty = false # { False, True } # Whether to put a newline after a virtual brace open with an empty body. # These occur in un-braced if/while/do/for statement bodies. # -nl_after_brace_close=false # { False, True } +nl_after_brace_close = false # { False, True } # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. # -nl_after_vbrace_close=false # { False, True } +nl_after_vbrace_close = false # { False, True } # Whether to put a newline after a virtual brace close. # Would add a newline before return in: 'if (foo) a++; return;' # @@ -1372,7 +1372,7 @@ nl_after_vbrace_close=false # { False, True } #nl_define_macro { False, True } # Whether to alter newlines in '#define' macros # -nl_squeeze_ifdef=false # { False, True } +nl_squeeze_ifdef = false # { False, True } # Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and '#endif'. Does not affect top-level #ifdefs. # #nl_squeeze_ifdef_top_level { False, True } @@ -1414,10 +1414,10 @@ nl_squeeze_ifdef=false # { False, True } #nl_after_do { Ignore, Add, Remove, Force } # Add or remove blank line after 'do/while' statement # -nl_ds_struct_enum_cmt=false # { False, True } +nl_ds_struct_enum_cmt = false # { False, True } # Whether to double-space commented-entries in struct/union/enum # -nl_ds_struct_enum_close_brace=false # { False, True } +nl_ds_struct_enum_close_brace = false # { False, True } # force nl before } of a struct/union/enum # (lower priority than 'eat_blanks_before_close_brace') # @@ -1435,15 +1435,15 @@ nl_ds_struct_enum_close_brace=false # { False, True } # Add or remove a newline around a class constructor colon. # Related to nl_constr_init_args, pos_constr_colon and pos_constr_comma. # -nl_create_if_one_liner=false # { False, True } +nl_create_if_one_liner = false # { False, True } # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' # -nl_create_for_one_liner=false # { False, True } +nl_create_for_one_liner = false # { False, True } # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' # -nl_create_while_one_liner=false # { False, True } +nl_create_while_one_liner = false # { False, True } # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' # @@ -1509,10 +1509,10 @@ nl_create_while_one_liner=false # { False, True } #code_width Number # Try to limit code width to N number of columns # -ls_for_split_full=false # { False, True } +ls_for_split_full = false # { False, True } # Whether to fully split long 'for' statements at semi-colons # -ls_func_split_full=false # { False, True } +ls_func_split_full = false # { False, True } # Whether to fully split long function protos/calls at commas # #ls_code_width { False, True } @@ -1522,7 +1522,7 @@ ls_func_split_full=false # { False, True } ## Blank line options ## # -nl_max=3 # Number +nl_max = 3 # Number # The maximum consecutive newlines (3 = 2 blank lines) # #nl_after_func_proto Number @@ -1543,7 +1543,7 @@ nl_max=3 # Number #nl_before_func_body_proto Number # The number of newlines before a multi-line function prototype body # -nl_after_func_body=2 # Number +nl_after_func_body = 2 # Number # The number of newlines after '}' of a multi-line function body # #nl_after_func_body_class Number @@ -1564,7 +1564,7 @@ nl_after_func_body=2 # Number # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. # -nl_after_multiline_comment=false # { False, True } +nl_after_multiline_comment = false # { False, True } # Whether to force a newline after a multi-line comment. # #nl_after_label_colon { False, True } @@ -1602,13 +1602,13 @@ nl_after_multiline_comment=false # { False, True } # The number of newlines between the get/set/add/remove handlers in C#. # 0 = No change. # -nl_property_brace=force # { Ignore, Add, Remove, Force } +nl_property_brace = force # { Ignore, Add, Remove, Force } # Add or remove newline between C# property and the '{' # -eat_blanks_after_open_brace=true # { False, True } +eat_blanks_after_open_brace = true # { False, True } # Whether to remove blank lines after '{' # -eat_blanks_before_close_brace=true # { False, True } +eat_blanks_before_close_brace = true # { False, True } # Whether to remove blank lines before '}' # #nl_remove_extra_newlines Number @@ -1620,7 +1620,7 @@ eat_blanks_before_close_brace=true # { False, True } #nl_before_return { False, True } # Whether to put a blank line before 'return' statements, unless after an open brace. # -nl_after_return=false # { False, True } +nl_after_return = false # { False, True } # Whether to put a blank line after 'return' statements, unless followed by a close brace. # #nl_after_annotation { Ignore, Add, Remove, Force } @@ -1646,7 +1646,7 @@ nl_after_return=false # { False, True } #mod_full_brace_if { Ignore, Add, Remove, Force } # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. # -mod_full_brace_if_chain=false # { False, True } +mod_full_brace_if_chain = false # { False, True } # Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if. # If any must be braced, they are all braced. If all can be unbraced, then the braces are removed. # @@ -1665,16 +1665,16 @@ mod_full_brace_if_chain=false # { False, True } #mod_full_brace_using { Ignore, Add, Remove, Force } # Add or remove braces on single-line 'using ()' statement # -mod_paren_on_return=ignore # { Ignore, Add, Remove, Force } +mod_paren_on_return = ignore # { Ignore, Add, Remove, Force } # Add or remove unnecessary paren on 'return' statement # -mod_pawn_semicolon=false # { False, True } +mod_pawn_semicolon = false # { False, True } # Whether to change optional semicolons to real semicolons # -mod_full_paren_if_bool=false # { False, True } +mod_full_paren_if_bool = false # { False, True } # Add parens on 'while' and 'if' statement around bools # -mod_remove_extra_semicolon=true # { False, True } +mod_remove_extra_semicolon = true # { False, True } # Whether to remove superfluous semicolons # #mod_add_long_function_closebrace_comment Number @@ -1707,14 +1707,14 @@ mod_remove_extra_semicolon=true # { False, True } # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. # -mod_move_case_break=false # { False, True } +mod_move_case_break = false # { False, True } # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. # #mod_case_brace { Ignore, Add, Remove, Force } # Will add or remove the braces around a fully braced case statement. # Will only remove the braces if there are no variable declarations in the block. # -mod_remove_empty_return=true # { False, True } +mod_remove_empty_return = true # { False, True } # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. # ## @@ -1734,32 +1734,32 @@ mod_remove_empty_return=true # { False, True } #cmt_convert_tab_to_spaces { False, True } # Whether to convert all tabs to spaces in comments. Default is to leave tabs inside comments alone, unless used for indenting. # -cmt_indent_multi=false # { False, True } +cmt_indent_multi = false # { False, True } # If false, disable all multi-line comment changes, including cmt_width. keyword substitution and leading chars. # Default=True. # -cmt_c_group=false # { False, True } +cmt_c_group = false # { False, True } # Whether to group c-comments that look like they are in a block # -cmt_c_nl_start=false # { False, True } +cmt_c_nl_start = false # { False, True } # Whether to put an empty '/*' on the first line of the combined c-comment # -cmt_c_nl_end=false # { False, True } +cmt_c_nl_end = false # { False, True } # Whether to put a newline before the closing '*/' of the combined c-comment # -cmt_cpp_group=false # { False, True } +cmt_cpp_group = false # { False, True } # Whether to group cpp-comments that look like they are in a block # -cmt_cpp_nl_start=false # { False, True } +cmt_cpp_nl_start = false # { False, True } # Whether to put an empty '/*' on the first line of the combined cpp-comment # -cmt_cpp_nl_end=false # { False, True } +cmt_cpp_nl_end = false # { False, True } # Whether to put a newline before the closing '*/' of the combined cpp-comment # -cmt_cpp_to_c=false # { False, True } +cmt_cpp_to_c = false # { False, True } # Whether to change cpp-comments into c-comments # -cmt_star_cont=false # { False, True } +cmt_star_cont = false # { False, True } # Whether to put a star on subsequent comment lines # #cmt_sp_before_star_cont Number @@ -1768,7 +1768,7 @@ cmt_star_cont=false # { False, True } #cmt_sp_after_star_cont Number # The number of spaces to insert after the star on subsequent comment lines # -cmt_multi_check_last=false # { False, True } +cmt_multi_check_last = false # { False, True } # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True # @@ -1797,7 +1797,7 @@ cmt_multi_check_last=false # { False, True } # The filename that contains text to insert before a Obj-C message specification if the method isn't preceded with a C/C++ comment. # Will substitute $(message) with the function name and $(javaparam) with the javadoc @param and @return stuff. # -cmt_insert_before_preproc=false # { False, True } +cmt_insert_before_preproc = false # { False, True } # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_oc_msg_header, cmt_insert_func_header and cmt_insert_class_header. @@ -1827,7 +1827,7 @@ cmt_insert_before_preproc=false # { False, True } # If pp_indent_at_level=false, specifies the number of columns to indent preprocessors per level at brace level > 0 (function-level). # Default=1. # -pp_space=ignore # { Ignore, Add, Remove, Force } +pp_space = ignore # { Ignore, Add, Remove, Force } # Add or remove space after # based on pp_level of #if blocks # #pp_space_count Number @@ -1869,7 +1869,7 @@ pp_space=ignore # { Ignore, Add, Remove, For # True: indent_continue will be used only once # False: indent_continue will be used every time (default) # -use_options_overriding_for_qt_macros=false # { False, True } +use_options_overriding_for_qt_macros = false # { False, True } # SIGNAL/SLOT Qt macros have special formatting options. See options_for_QT.cpp for details. # Default=True. # @@ -1877,7 +1877,7 @@ use_options_overriding_for_qt_macros=false # { False, True } ## Warn levels - 1: error, 2: warning (default), 3: note ## # -warn_level_tabs_found_in_verbatim_string_literals=1 # { 1, 2, 3 } +warn_level_tabs_found_in_verbatim_string_literals = 1 # { 1, 2, 3 } # Warning is given if doing tab-to-\t replacement and we have found one in a C# verbatim string literal. # ### @@ -1888,8 +1888,8 @@ warn_level_tabs_found_in_verbatim_string_literals=1 # { 1, 2, 3 } # can be turned back on at any time #mod_add_long_ifdef_else_comment=8 #mod_add_long_ifdef_endif_comment=8 -mod_add_long_ifdef_else_comment=0 -mod_add_long_ifdef_endif_comment=0 +mod_add_long_ifdef_else_comment = 0 +mod_add_long_ifdef_endif_comment = 0 @@ -1909,7 +1909,7 @@ mod_add_long_ifdef_endif_comment=0 # ...except sometimes we really do want that. What we need is an indent_align_assign_threshold, or, # better but maybe more complicated, indent_align_assign=ignore to leave alone what the engineer did. # (currently unreported) -indent_align_assign=false +indent_align_assign = false # this is causing a few problems, but usually with block comments and autodoc markup. perhaps only add a space # if first letter is not a symbol and this is a standalone comment: not preceded or followed by another c++ @@ -1918,11 +1918,11 @@ indent_align_assign=false # (test using Runtime/Allocator/BucketAllocator.h) # IMPORTANT: see task at https://trello.com/c/wUgiuvbX before going further #sp_cmt_cpp_start=add -sp_cmt_cpp_start=ignore +sp_cmt_cpp_start = ignore # https://sourceforge.net/p/uncrustify/bugs/619/ #sp_endif_cmt=force -sp_endif_cmt=ignore +sp_endif_cmt = ignore # want to turn this on, but can't do it without also getting alignment right. try running it on this file as an example: # Tools\BugReporterV2\qt_face\lib\src\MainWindow.cpp diff --git a/tests/config/Uncrustify.Common-Cpp.cfg b/tests/config/Uncrustify.Common-Cpp.cfg index e3a5d7478e..4c0c0272f9 100644 --- a/tests/config/Uncrustify.Common-Cpp.cfg +++ b/tests/config/Uncrustify.Common-Cpp.cfg @@ -1,29 +1,29 @@ ### This file holds rules common to all C++-derived languages -include Uncrustify.Common-CStyle.cfg +include Uncrustify.Common-CStyle.cfg # workaround for some nasty macroing we're doing -set COMMENT PLATFORM_EXCEPTION_SAFEGUARD_PROLOG +set COMMENT PLATFORM_EXCEPTION_SAFEGUARD_PROLOG # without this, uncrustify will parse and process the contents of #defines, which is super unstable. very easy to get into edge cases it does not support, # so just have it treat #defines as black boxes. this will keep all of the contents of the #define as unprocessed. -pp_ignore_define_body=true +pp_ignore_define_body = true # macros in #includes aren't known to Uncrustify, so have to inform it here for macros that will confuse it -set MACRO_FUNC ATTRIBUTE_ALIGN +set MACRO_FUNC ATTRIBUTE_ALIGN # we have some truly insane deep namespace nesting in il2cpp. :/ -indent_namespace_single_indent=true +indent_namespace_single_indent = true # needed for fmod apparently (via HEVAGTool.h - the *'s near F_STDCALL will be interpreted as ARITH without this) -set COMMENT F_STDCALL +set COMMENT F_STDCALL # https://github.com/uncrustify/uncrustify/pull/602 # https://sourceforge.net/p/uncrustify/bugs/633/ -set COMMENT __cdecl -set COMMENT __clrcall -set COMMENT __fastcall -set COMMENT __stdcall -set COMMENT __thiscall -set COMMENT __vectorcall -set COMMENT WINAPI +set COMMENT __cdecl +set COMMENT __clrcall +set COMMENT __fastcall +set COMMENT __stdcall +set COMMENT __thiscall +set COMMENT __vectorcall +set COMMENT WINAPI diff --git a/tests/config/Uncrustify.Cpp.cfg b/tests/config/Uncrustify.Cpp.cfg index 23d62d9dba..67f19be5e1 100644 --- a/tests/config/Uncrustify.Cpp.cfg +++ b/tests/config/Uncrustify.Cpp.cfg @@ -1,5 +1,5 @@ -include Uncrustify.Common-Cpp.cfg +include Uncrustify.Common-Cpp.cfg # We need to make FAKE_FUNCTION a PROTO_WRAP macro function to help properly tokenize it's parameters. # Previously parameters with CT_AMP and CT_STAR were tokenized as CT_ARITH. Support for optional parenthesis added in github PR #629. -set PROTO_WRAP FAKE_FUNCTION +set PROTO_WRAP FAKE_FUNCTION diff --git a/tests/config/add_long_closebrace_comment_1.cfg b/tests/config/add_long_closebrace_comment_1.cfg index 5827edf6e2..d06cd2f863 100644 --- a/tests/config/add_long_closebrace_comment_1.cfg +++ b/tests/config/add_long_closebrace_comment_1.cfg @@ -1,3 +1,3 @@ -mod_add_long_switch_closebrace_comment = 8 +mod_add_long_switch_closebrace_comment = 8 mod_add_long_function_closebrace_comment = 8 diff --git a/tests/config/al.cfg b/tests/config/al.cfg index a56957d735..47dd0cbe41 100644 --- a/tests/config/al.cfg +++ b/tests/config/al.cfg @@ -3,19 +3,19 @@ # # The type of line endings -newlines = auto # auto/lf/crlf/cr +newlines = auto # auto/lf/crlf/cr # The original size of tabs in the input -input_tab_size = 4 # number +input_tab_size = 4 # number # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 4 # number +output_tab_size = 4 # number # The ascii value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # number # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # number # # Indenting @@ -23,894 +23,894 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 4 # number +indent_columns = 4 # number # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # number # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # false/true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # number # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # number # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # false/true # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # false/true # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # false/true # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # false/true # Whether the 'class' body is indented -indent_class = false # false/true +indent_class = false # false/true # Whether to indent the stuff after a leading class colon -indent_class_colon = false # false/true +indent_class_colon = false # false/true # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = false # false/true +indent_func_call_param = false # false/true # Same as indent_func_call_param, but for function defs -indent_func_def_param = false # false/true +indent_func_def_param = false # false/true # Same as indent_func_call_param, but for function protos -indent_func_proto_param = false # false/true +indent_func_proto_param = false # false/true # Same as indent_func_call_param, but for class declarations -indent_func_class_param = false # false/true +indent_func_class_param = false # false/true # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = false # false/true +indent_func_ctor_var_param = false # false/true # Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true +indent_func_param_double = false # false/true # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 4 # number +indent_member = 4 # number # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # number # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 4 # number +indent_switch_case = 4 # number # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 4 # number +indent_case_shift = 4 # number # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 4 # number +indent_case_brace = 4 # number # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # false/true # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # number # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # number # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # false/true # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 1 # number +indent_paren_close = 1 # number # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # false/true # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # false/true # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # false/true # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # false/true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # ignore/add/remove/force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # ignore/add/remove/force # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # ignore/add/remove/force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # ignore/add/remove/force # Add or remove space inside '(' and ')' -sp_inside_paren = ignore # ignore/add/remove/force +sp_inside_paren = ignore # ignore/add/remove/force # Add or remove space between nested parens -sp_paren_paren = force # ignore/add/remove/force +sp_paren_paren = force # ignore/add/remove/force # Whether to balance spaces inside nested parens -sp_balance_nested_parens = true # false/true +sp_balance_nested_parens = true # false/true # Add or remove space between ')' and '{' -sp_paren_brace = remove # ignore/add/remove/force +sp_paren_brace = remove # ignore/add/remove/force # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # ignore/add/remove/force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # ignore/add/remove/force # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # ignore/add/remove/force # Add or remove space before reference sign '&' -sp_before_byref = force # ignore/add/remove/force +sp_before_byref = force # ignore/add/remove/force # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = remove # ignore/add/remove/force +sp_after_byref = remove # ignore/add/remove/force # Add or remove space before '<>' -sp_before_angle = force # ignore/add/remove/force +sp_before_angle = force # ignore/add/remove/force # Add or remove space after '<>' -sp_after_angle = force # ignore/add/remove/force +sp_after_angle = force # ignore/add/remove/force # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = remove # ignore/add/remove/force -sp_angle_paren_empty = remove +sp_angle_paren = remove # ignore/add/remove/force +sp_angle_paren_empty = remove # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = force # ignore/add/remove/force +sp_angle_word = force # ignore/add/remove/force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # ignore/add/remove/force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # ignore/add/remove/force # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = remove # ignore/add/remove/force +sp_after_sparen = remove # ignore/add/remove/force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = remove # ignore/add/remove/force +sp_sparen_brace = remove # ignore/add/remove/force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = force # ignore/add/remove/force +sp_special_semi = force # ignore/add/remove/force # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # ignore/add/remove/force # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = force # ignore/add/remove/force +sp_before_semi_for = force # ignore/add/remove/force # Add or remove space before a semicolon of an empty part of a for statment. -sp_before_semi_for_empty = force # ignore/add/remove/force +sp_before_semi_for_empty = force # ignore/add/remove/force # Add or remove space after the final semicolon of an empty part of a for statment: for ( ; ; ). -sp_after_semi_for_empty = force # ignore/add/remove/force +sp_after_semi_for_empty = force # ignore/add/remove/force # Add or remove space before '[' (except '[]') -sp_before_square = remove # ignore/add/remove/force +sp_before_square = remove # ignore/add/remove/force # Add or remove space before '[]' -sp_before_squares = remove # ignore/add/remove/force +sp_before_squares = remove # ignore/add/remove/force # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # ignore/add/remove/force # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # ignore/add/remove/force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # ignore/add/remove/force # Add or remove space between 'operator' and operator sign -sp_after_operator = force # ignore/add/remove/force +sp_after_operator = force # ignore/add/remove/force # Add or remove space after cast -sp_after_cast = force # ignore/add/remove/force +sp_after_cast = force # ignore/add/remove/force # Add or remove spaces inside cast parens -sp_inside_paren_cast = remove # ignore/add/remove/force +sp_inside_paren_cast = remove # ignore/add/remove/force # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # ignore/add/remove/force # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # ignore/add/remove/force # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = force # ignore/add/remove/force +sp_inside_braces_enum = force # ignore/add/remove/force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = remove # ignore/add/remove/force +sp_inside_braces_struct = remove # ignore/add/remove/force # Add or remove space inside '{' and '}' -sp_inside_braces = force # ignore/add/remove/force +sp_inside_braces = force # ignore/add/remove/force # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # ignore/add/remove/force # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = remove # ignore/add/remove/force +sp_type_func = remove # ignore/add/remove/force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # ignore/add/remove/force # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # ignore/add/remove/force # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # ignore/add/remove/force # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # ignore/add/remove/force # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = remove # ignore/add/remove/force +sp_square_fparen = remove # ignore/add/remove/force # Add or remove space between ')' and '{' of function -sp_fparen_brace = remove # ignore/add/remove/force +sp_fparen_brace = remove # ignore/add/remove/force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # ignore/add/remove/force # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = ignore # ignore/add/remove/force +sp_func_class_paren = ignore # ignore/add/remove/force # Add or remove space between 'return' and '(' -sp_return_paren = force # ignore/add/remove/force +sp_return_paren = force # ignore/add/remove/force # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = force # ignore/add/remove/force +sp_attribute_paren = force # ignore/add/remove/force # Add or remove space between macro and value -sp_macro = force # ignore/add/remove/force +sp_macro = force # ignore/add/remove/force # Add or remove space between macro function ')' and value -sp_macro_func = force # ignore/add/remove/force +sp_macro_func = force # ignore/add/remove/force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = ignore # ignore/add/remove/force +sp_else_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # ignore/add/remove/force # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # ignore/add/remove/force # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # ignore/add/remove/force # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # ignore/add/remove/force # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # ignore/add/remove/force # Add or remove space before the '::' operator -sp_before_dc = remove # ignore/add/remove/force +sp_before_dc = remove # ignore/add/remove/force # Add or remove space after the '::' operator -sp_after_dc = remove # ignore/add/remove/force +sp_after_dc = remove # ignore/add/remove/force # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # ignore/add/remove/force # Add or remove space after the '!' (not) operator. -sp_not = remove # ignore/add/remove/force +sp_not = remove # ignore/add/remove/force # Add or remove space after the '~' (invert) operator. -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # ignore/add/remove/force # Add or remove space after the '&' (address-of) operator. # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # ignore/add/remove/force # Add or remove space around the '.' or '->' operators -sp_member = remove # ignore/add/remove/force +sp_member = remove # ignore/add/remove/force # Add or remove space after the '*' (dereference) operator. # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # ignore/add/remove/force # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7' -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # ignore/add/remove/force # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;' -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # ignore/add/remove/force # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force +sp_after_oc_scope = ignore # ignore/add/remove/force # Add or remove space after the colon in message specs # '-(int) f: (int) x;' vs '+(int) f : (int) x;' -sp_before_oc_colon = force # ignore/add/remove/force +sp_before_oc_colon = force # ignore/add/remove/force # Add or remove space after the (type) in message specs # '-(int) f: (int) x;' vs '+(int)f : (int)x;' -sp_after_oc_type = force # ignore/add/remove/force +sp_after_oc_type = force # ignore/add/remove/force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # false/true # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # false/true # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # false/true # Align variable definitions in prototypes and functions -align_func_params = true # false/true +align_func_params = true # false/true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 20 # number +align_var_def_span = 20 # number # How to align the star in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_star_style = 0 # number +align_var_def_star_style = 0 # number # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # number # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # number # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # false/true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = true # false/true +align_var_def_inline = true # false/true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 1 # number +align_assign_span = 1 # number # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 30 # number +align_assign_thresh = 30 # number # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 10 # number +align_enum_equ_span = 10 # number # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 12 # number +align_enum_equ_thresh = 12 # number # The span for aligning struct/union (0=don't align) -align_var_struct_span = 30 # number +align_var_struct_span = 30 # number # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 30 # number +align_var_struct_thresh = 30 # number # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 8 # number +align_struct_init_span = 8 # number # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 4 # number +align_typedef_gap = 4 # number # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 5 # number +align_typedef_span = 5 # number # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # number # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 2 # number +align_typedef_star_style = 2 # number # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typdef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 2 # number +align_typedef_amp_style = 2 # number # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 3 # number +align_right_cmt_span = 3 # number # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # false/true # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 3 # number +align_func_proto_span = 3 # number # The span for aligning function prototypes (0=don't align) -align_oc_msg_spec_span = 3 # number +align_oc_msg_spec_span = 3 # number # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = true # false/true +align_nl_cont = true # false/true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 2 # number +align_pp_define_gap = 2 # number # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 50 # number +align_pp_define_span = 50 # number # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # false/true # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = false # false/true +nl_assign_leave_one_liners = false # false/true # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = false # false/true +nl_class_leave_one_liners = false # false/true # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = false # false/true +nl_enum_leave_one_liners = false # false/true # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # false/true # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # false/true # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # false/true # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # ignore/add/remove/force # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # number # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # ignore/add/remove/force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # number # Add or remove newline between '=' and '{' -nl_assign_brace = force # ignore/add/remove/force +nl_assign_brace = force # ignore/add/remove/force # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # ignore/add/remove/force # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # ignore/add/remove/force # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # number # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = force # ignore/add/remove/force +nl_fcall_brace = force # ignore/add/remove/force # Add or remove newline between 'enum' and '{' -nl_enum_brace = add # ignore/add/remove/force +nl_enum_brace = add # ignore/add/remove/force # Add or remove newline between 'struct and '{' -nl_struct_brace = add # ignore/add/remove/force +nl_struct_brace = add # ignore/add/remove/force # Add or remove newline between 'union' and '{' -nl_union_brace = add # ignore/add/remove/force +nl_union_brace = add # ignore/add/remove/force # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # ignore/add/remove/force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = add # ignore/add/remove/force +nl_elseif_brace = add # ignore/add/remove/force # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'finally' -nl_brace_finally = ignore # ignore/add/remove/force +nl_brace_finally = ignore # ignore/add/remove/force # Add or remove newline between 'finally' and '{' -nl_finally_brace = ignore # ignore/add/remove/force +nl_finally_brace = ignore # ignore/add/remove/force # Add or remove newline between 'try' and '{' -nl_try_brace = ignore # ignore/add/remove/force +nl_try_brace = ignore # ignore/add/remove/force # Add or remove newline between get/set and '{' -nl_getset_brace = ignore # ignore/add/remove/force +nl_getset_brace = ignore # ignore/add/remove/force # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # ignore/add/remove/force # Add or remove newline between 'catch' and '{' -nl_catch_brace = ignore # ignore/add/remove/force +nl_catch_brace = ignore # ignore/add/remove/force # Add or remove newline between '}' and 'catch' -nl_brace_catch = ignore # ignore/add/remove/force +nl_brace_catch = ignore # ignore/add/remove/force # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # ignore/add/remove/force # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = add # ignore/add/remove/force +nl_brace_while = add # ignore/add/remove/force # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # ignore/add/remove/force # Add or remove newline when condition spans two or more lines -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # false/true # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = true # false/true +nl_multi_line_define = true # false/true # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # false/true # Whether to put a newline after 'case' statement -nl_after_case = false # false/true +nl_after_case = false # false/true # Newline between namespace and { -nl_namespace_brace = add # ignore/add/remove/force +nl_namespace_brace = add # ignore/add/remove/force # Add or remove newline between 'template<>' and 'class' -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # ignore/add/remove/force # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # ignore/add/remove/force # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in definition -nl_func_type_name = remove # ignore/add/remove/force +nl_func_type_name = remove # ignore/add/remove/force # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = remove # ignore/add/remove/force +nl_func_proto_type_name = remove # ignore/add/remove/force # Add or remove newline between a function name and the opening '(' -nl_func_paren = remove # ignore/add/remove/force +nl_func_paren = remove # ignore/add/remove/force # Add or remove newline after '(' in a function declaration -nl_func_decl_start = remove # ignore/add/remove/force +nl_func_decl_start = remove # ignore/add/remove/force # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # ignore/add/remove/force # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # ignore/add/remove/force # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # ignore/add/remove/force # Whether to put a newline after 'return' statement -nl_after_return = true # false/true +nl_after_return = true # false/true # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # false/true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = true # false/true +nl_after_brace_open = true # false/true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = true # false/true +nl_after_brace_open_cmt = true # false/true # Whether to put a newline after a virtual brace open. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = true # false/true +nl_after_vbrace_open = true # false/true # Whether to alter newlines in '#define' macros -nl_define_macro = true # false/true +nl_define_macro = true # false/true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true +nl_squeeze_ifdef = false # false/true # Add or remove newline before 'if' -nl_before_if = add # ignore/add/remove/force +nl_before_if = add # ignore/add/remove/force # Add or remove newline after 'if' -nl_after_if = add # ignore/add/remove/force +nl_after_if = add # ignore/add/remove/force # Add or remove newline before 'for' -nl_before_for = add # ignore/add/remove/force +nl_before_for = add # ignore/add/remove/force # Add or remove newline after 'for' -nl_after_for = add # ignore/add/remove/force +nl_after_for = add # ignore/add/remove/force # Add or remove newline before 'while' -nl_before_while = add # ignore/add/remove/force +nl_before_while = add # ignore/add/remove/force # Add or remove newline after 'while' -nl_after_while = add # ignore/add/remove/force +nl_after_while = add # ignore/add/remove/force # Add or remove newline before 'switch' -nl_before_switch = add # ignore/add/remove/force +nl_before_switch = add # ignore/add/remove/force # Add or remove newline after 'switch' -nl_after_switch = add # ignore/add/remove/force +nl_after_switch = add # ignore/add/remove/force # Add or remove newline before 'do' -nl_before_do = add # ignore/add/remove/force +nl_before_do = add # ignore/add/remove/force # Add or remove newline after 'do' -nl_after_do = add # ignore/add/remove/force +nl_after_do = add # ignore/add/remove/force # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = true # false/true +nl_ds_struct_enum_cmt = true # false/true # Whether to double-space before the close brace of a struct/union/enum -nl_ds_struct_enum_close_brace = true # false/true +nl_ds_struct_enum_close_brace = true # false/true # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # ignore/add/remove/force # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # false/true # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # false/true # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # false/true # # Positioning options # # The position of boolean operators in wrapped expressions -pos_bool = ignore # ignore/lead/trail +pos_bool = ignore # ignore/lead/trail # The position of the comma in wrapped expressions -pos_comma = trail # ignore/lead/trail +pos_comma = trail # ignore/lead/trail # The position of the comma in the constructor initialization list -pos_class_comma = ignore # ignore/lead/trail +pos_class_comma = ignore # ignore/lead/trail # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # ignore/lead/trail # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 80 # number +code_width = 80 # number # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = true # false/true +ls_for_split_full = true # false/true # Whether to fully split long function protos/calls at commas -ls_func_split_full = true # false/true +ls_func_split_full = true # false/true # # Blank line options # # The maximum consecutive newlines -nl_max = 3 # number +nl_max = 3 # number # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 1 # number +nl_after_func_proto = 1 # number # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 3 # number +nl_after_func_proto_group = 3 # number # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 5 # number +nl_after_func_body = 5 # number # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 5 # number +nl_after_func_body_one_liner = 5 # number # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 1 # number +nl_before_block_comment = 1 # number # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 1 # number +nl_before_c_comment = 1 # number # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 1 # number +nl_before_cpp_comment = 1 # number # Whether to force a newline after a mulit-line comment. -nl_after_multiline_comment = true # false/true +nl_after_multiline_comment = true # false/true # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 0 # number +nl_before_access_spec = 0 # number # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # number # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # false/true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = false # false/true +eat_blanks_before_close_brace = false # false/true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # ignore/add/remove/force # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # ignore/add/remove/force # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = add # ignore/add/remove/force +mod_full_brace_function = add # ignore/add/remove/force # Add or remove braces on single-line 'if' statement -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # ignore/add/remove/force # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 1 # number +mod_full_brace_nl = 1 # number # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # ignore/add/remove/force # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = remove # ignore/add/remove/force +mod_paren_on_return = remove # ignore/add/remove/force # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # false/true # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = false # false/true +mod_full_paren_if_bool = false # false/true # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = true # false/true +mod_remove_extra_semicolon = true # false/true # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 1 # number +mod_add_long_function_closebrace_comment = 1 # number # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 10 # number +mod_add_long_switch_closebrace_comment = 10 # number # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # false/true # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # false/true # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # false/true # # Comment modifications # # Try to wrap comments at cmt_witdth columns -cmt_width = 80 # number +cmt_width = 80 # number # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # false/true # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # false/true # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # false/true # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # false/true # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = true # false/true +cmt_cpp_to_c = true # false/true # Whether to put a star on subsequent comment lines -cmt_star_cont = true # false/true +cmt_star_cont = true # false/true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 1 # number +cmt_sp_before_star_cont = 1 # number # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # number # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitue $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # string # The filename that contains text to insert before a function implementation if the function isn't preceeded with a C/C++ comment. # Will substitue $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # string # The filename that contains text to insert before a class if the class isn't preceeded with a C/C++ comment. # Will substitue $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # string # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = remove # ignore/add/remove/force +pp_indent = remove # ignore/add/remove/force # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # false/true # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # ignore/add/remove/force # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # number # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # number # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # false/true # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # number # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true +pp_if_indent_code = false # false/true # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # false/true # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/align-1.cfg b/tests/config/align-1.cfg index 4b9becac90..b3fdf63c13 100644 --- a/tests/config/align-1.cfg +++ b/tests/config/align-1.cfg @@ -2,91 +2,91 @@ # My favorite format # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size -indent_columns = output_tab_size -indent_label = 2 # pos: absolute col, neg: relative column -indent_align_string = False # align broken strings -indent_brace = 0 +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 3 # new tab size +indent_columns = output_tab_size +indent_label = 2 # pos: absolute col, neg: relative column +indent_align_string = False # align broken strings +indent_brace = 0 -nl_assign_brace = add # "= {" vs "= \n {" -nl_enum_brace = add # "enum {" vs "enum \n {" -nl_union_brace = add # "union {" vs "union \n {" -nl_struct_brace = add # "struct {" vs "struct \n {" -nl_do_brace = add # "do {" vs "do \n {" -nl_if_brace = add # "if () {" vs "if () \n {" -nl_for_brace = add # "for () {" vs "for () \n {" -nl_else_brace = add # "else {" vs "else \n {" -nl_while_brace = add # "while () {" vs "while () \n {" -nl_switch_brace = add # "switch () {" vs "switch () \n {" -nl_func_var_def_blk = 1 -nl_before_case = 1 -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" -nl_after_return = TRUE -nl_brace_while = remove -nl_brace_else = add -nl_squeeze_ifdef = TRUE +nl_assign_brace = add # "= {" vs "= \n {" +nl_enum_brace = add # "enum {" vs "enum \n {" +nl_union_brace = add # "union {" vs "union \n {" +nl_struct_brace = add # "struct {" vs "struct \n {" +nl_do_brace = add # "do {" vs "do \n {" +nl_if_brace = add # "if () {" vs "if () \n {" +nl_for_brace = add # "for () {" vs "for () \n {" +nl_else_brace = add # "else {" vs "else \n {" +nl_while_brace = add # "while () {" vs "while () \n {" +nl_switch_brace = add # "switch () {" vs "switch () \n {" +nl_func_var_def_blk = 1 +nl_before_case = 1 +nl_fcall_brace = add # "foo() {" vs "foo()\n{" +nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_after_return = TRUE +nl_brace_while = remove +nl_brace_else = add +nl_squeeze_ifdef = TRUE -mod_paren_on_return = add # "return 1;" vs "return (1);" -mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" -mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" +mod_paren_on_return = add # "return 1;" vs "return (1);" +mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" +mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" +mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" +mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" -sp_before_byref = remove -sp_before_semi = remove -sp_paren_paren = remove # space between (( and )) -sp_return_paren = remove # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" -sp_inside_paren = remove -sp_inside_fparen = remove -sp_inside_sparen = remove -sp_inside_square = remove +sp_before_byref = remove +sp_before_semi = remove +sp_paren_paren = remove # space between (( and )) +sp_return_paren = remove # "return (1);" vs "return(1);" +sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" +sp_before_sparen = force # "if (" vs "if(" +sp_after_sparen = force # "if () {" vs "if (){" +sp_after_cast = remove # "(int) a" vs "(int)a" +sp_inside_braces = force # "{ 1 }" vs "{1}" +sp_inside_braces_struct = force # "{ 1 }" vs "{1}" +sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_inside_paren = remove +sp_inside_fparen = remove +sp_inside_sparen = remove +sp_inside_square = remove #sp_type_func = ignore -sp_assign = force -sp_arith = force -sp_bool = force -sp_compare = force -sp_assign = force -sp_after_comma = force -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_assign = force +sp_arith = force +sp_bool = force +sp_compare = force +sp_assign = force +sp_after_comma = force +sp_func_def_paren = remove # "int foo (){" vs "int foo(){" +sp_func_call_paren = remove # "foo (" vs "foo(" +sp_func_proto_paren = remove # "int foo ();" vs "int foo();" -align_with_tabs = FALSE # use tabs to align -align_on_tabstop = FALSE # align on tabstops +align_with_tabs = FALSE # use tabs to align +align_on_tabstop = FALSE # align on tabstops -align_enum_equ_span = 4 +align_enum_equ_span = 4 -align_nl_cont = TRUE +align_nl_cont = TRUE align_func_params = FALSE -align_var_def_span = 2 -align_var_def_thresh = 16 -align_var_def_inline = TRUE -align_var_def_star_style = 0 -align_var_def_colon = TRUE -align_assign_span = 2 -align_assign_thresh = 3 -align_struct_init_span = 3 -align_var_struct_span = 3 -align_var_struct_thresh = 16 -align_right_cmt_span = 3 -align_pp_define_span = 3 -align_pp_define_gap = 4 -align_number_right = TRUE -align_typedef_span = 5 -align_typedef_gap = 3 +align_var_def_span = 2 +align_var_def_thresh = 16 +align_var_def_inline = TRUE +align_var_def_star_style = 0 +align_var_def_colon = TRUE +align_assign_span = 2 +align_assign_thresh = 3 +align_struct_init_span = 3 +align_var_struct_span = 3 +align_var_struct_thresh = 16 +align_right_cmt_span = 3 +align_pp_define_span = 3 +align_pp_define_gap = 4 +align_number_right = TRUE +align_typedef_span = 5 +align_typedef_gap = 3 -cmt_star_cont = TRUE +cmt_star_cont = TRUE -eat_blanks_before_close_brace = TRUE -eat_blanks_after_open_brace = TRUE +eat_blanks_before_close_brace = TRUE +eat_blanks_after_open_brace = TRUE diff --git a/tests/config/align-2.cfg b/tests/config/align-2.cfg index 577ed45a79..1e7da238af 100644 --- a/tests/config/align-2.cfg +++ b/tests/config/align-2.cfg @@ -2,91 +2,91 @@ # My favorite format # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size -indent_columns = output_tab_size -indent_label = 2 # pos: absolute col, neg: relative column -indent_align_string = False # align broken strings -indent_brace = 0 +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 3 # new tab size +indent_columns = output_tab_size +indent_label = 2 # pos: absolute col, neg: relative column +indent_align_string = False # align broken strings +indent_brace = 0 -nl_assign_brace = add # "= {" vs "= \n {" -nl_enum_brace = add # "enum {" vs "enum \n {" -nl_union_brace = add # "union {" vs "union \n {" -nl_struct_brace = add # "struct {" vs "struct \n {" -nl_do_brace = add # "do {" vs "do \n {" -nl_if_brace = add # "if () {" vs "if () \n {" -nl_for_brace = add # "for () {" vs "for () \n {" -nl_else_brace = add # "else {" vs "else \n {" -nl_while_brace = add # "while () {" vs "while () \n {" -nl_switch_brace = add # "switch () {" vs "switch () \n {" -nl_func_var_def_blk = 1 -nl_before_case = 1 -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" -nl_after_return = TRUE -nl_brace_while = remove -nl_brace_else = add -nl_squeeze_ifdef = TRUE +nl_assign_brace = add # "= {" vs "= \n {" +nl_enum_brace = add # "enum {" vs "enum \n {" +nl_union_brace = add # "union {" vs "union \n {" +nl_struct_brace = add # "struct {" vs "struct \n {" +nl_do_brace = add # "do {" vs "do \n {" +nl_if_brace = add # "if () {" vs "if () \n {" +nl_for_brace = add # "for () {" vs "for () \n {" +nl_else_brace = add # "else {" vs "else \n {" +nl_while_brace = add # "while () {" vs "while () \n {" +nl_switch_brace = add # "switch () {" vs "switch () \n {" +nl_func_var_def_blk = 1 +nl_before_case = 1 +nl_fcall_brace = add # "foo() {" vs "foo()\n{" +nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_after_return = TRUE +nl_brace_while = remove +nl_brace_else = add +nl_squeeze_ifdef = TRUE -mod_paren_on_return = add # "return 1;" vs "return (1);" -mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" -mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" +mod_paren_on_return = add # "return 1;" vs "return (1);" +mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" +mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" +mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" +mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" -sp_before_byref = remove -sp_before_semi = remove -sp_paren_paren = remove # space between (( and )) -sp_return_paren = remove # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" -sp_inside_paren = remove -sp_inside_fparen = remove -sp_inside_sparen = remove -sp_inside_square = remove +sp_before_byref = remove +sp_before_semi = remove +sp_paren_paren = remove # space between (( and )) +sp_return_paren = remove # "return (1);" vs "return(1);" +sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" +sp_before_sparen = force # "if (" vs "if(" +sp_after_sparen = force # "if () {" vs "if (){" +sp_after_cast = remove # "(int) a" vs "(int)a" +sp_inside_braces = force # "{ 1 }" vs "{1}" +sp_inside_braces_struct = force # "{ 1 }" vs "{1}" +sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_inside_paren = remove +sp_inside_fparen = remove +sp_inside_sparen = remove +sp_inside_square = remove #sp_type_func = ignore -sp_assign = force -sp_arith = force -sp_bool = force -sp_compare = force -sp_assign = force -sp_after_comma = force -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_assign = force +sp_arith = force +sp_bool = force +sp_compare = force +sp_assign = force +sp_after_comma = force +sp_func_def_paren = remove # "int foo (){" vs "int foo(){" +sp_func_call_paren = remove # "foo (" vs "foo(" +sp_func_proto_paren = remove # "int foo ();" vs "int foo();" -align_with_tabs = FALSE # use tabs to align -align_on_tabstop = FALSE # align on tabstops +align_with_tabs = FALSE # use tabs to align +align_on_tabstop = FALSE # align on tabstops -align_enum_equ_span = 4 +align_enum_equ_span = 4 -align_nl_cont = TRUE +align_nl_cont = TRUE align_func_params = TRUE -align_var_def_span = 2 -align_var_def_thresh = 16 -align_var_def_inline = TRUE -align_var_def_star_style = 1 -align_var_def_colon = TRUE -align_assign_span = 2 -align_assign_thresh = 3 -align_struct_init_span = 3 -align_var_struct_span = 3 -align_var_struct_thresh = 3 -align_right_cmt_span = 3 -align_pp_define_span = 3 -align_pp_define_gap = 4 -align_number_right = TRUE -align_typedef_span = 5 -align_typedef_gap = 3 +align_var_def_span = 2 +align_var_def_thresh = 16 +align_var_def_inline = TRUE +align_var_def_star_style = 1 +align_var_def_colon = TRUE +align_assign_span = 2 +align_assign_thresh = 3 +align_struct_init_span = 3 +align_var_struct_span = 3 +align_var_struct_thresh = 3 +align_right_cmt_span = 3 +align_pp_define_span = 3 +align_pp_define_gap = 4 +align_number_right = TRUE +align_typedef_span = 5 +align_typedef_gap = 3 -cmt_star_cont = TRUE +cmt_star_cont = TRUE -eat_blanks_before_close_brace = TRUE -eat_blanks_after_open_brace = TRUE +eat_blanks_before_close_brace = TRUE +eat_blanks_after_open_brace = TRUE diff --git a/tests/config/align-3.cfg b/tests/config/align-3.cfg index 94ceeb4a66..60b0f17343 100644 --- a/tests/config/align-3.cfg +++ b/tests/config/align-3.cfg @@ -2,91 +2,91 @@ # My favorite format # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size -indent_columns = output_tab_size -indent_label = 2 # pos: absolute col, neg: relative column -indent_align_string = False # align broken strings -indent_brace = 0 +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 3 # new tab size +indent_columns = output_tab_size +indent_label = 2 # pos: absolute col, neg: relative column +indent_align_string = False # align broken strings +indent_brace = 0 -nl_assign_brace = add # "= {" vs "= \n {" -nl_enum_brace = add # "enum {" vs "enum \n {" -nl_union_brace = add # "union {" vs "union \n {" -nl_struct_brace = add # "struct {" vs "struct \n {" -nl_do_brace = add # "do {" vs "do \n {" -nl_if_brace = add # "if () {" vs "if () \n {" -nl_for_brace = add # "for () {" vs "for () \n {" -nl_else_brace = add # "else {" vs "else \n {" -nl_while_brace = add # "while () {" vs "while () \n {" -nl_switch_brace = add # "switch () {" vs "switch () \n {" -nl_func_var_def_blk = 1 -nl_before_case = 1 -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" -nl_after_return = TRUE -nl_brace_while = remove -nl_brace_else = add -nl_squeeze_ifdef = TRUE +nl_assign_brace = add # "= {" vs "= \n {" +nl_enum_brace = add # "enum {" vs "enum \n {" +nl_union_brace = add # "union {" vs "union \n {" +nl_struct_brace = add # "struct {" vs "struct \n {" +nl_do_brace = add # "do {" vs "do \n {" +nl_if_brace = add # "if () {" vs "if () \n {" +nl_for_brace = add # "for () {" vs "for () \n {" +nl_else_brace = add # "else {" vs "else \n {" +nl_while_brace = add # "while () {" vs "while () \n {" +nl_switch_brace = add # "switch () {" vs "switch () \n {" +nl_func_var_def_blk = 1 +nl_before_case = 1 +nl_fcall_brace = add # "foo() {" vs "foo()\n{" +nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_after_return = TRUE +nl_brace_while = remove +nl_brace_else = add +nl_squeeze_ifdef = TRUE -mod_paren_on_return = add # "return 1;" vs "return (1);" -mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" -mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" +mod_paren_on_return = add # "return 1;" vs "return (1);" +mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" +mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" +mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" +mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" -sp_before_byref = remove -sp_before_semi = remove -sp_paren_paren = remove # space between (( and )) -sp_return_paren = remove # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" -sp_inside_paren = remove -sp_inside_fparen = remove -sp_inside_sparen = remove -sp_inside_square = remove +sp_before_byref = remove +sp_before_semi = remove +sp_paren_paren = remove # space between (( and )) +sp_return_paren = remove # "return (1);" vs "return(1);" +sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" +sp_before_sparen = force # "if (" vs "if(" +sp_after_sparen = force # "if () {" vs "if (){" +sp_after_cast = remove # "(int) a" vs "(int)a" +sp_inside_braces = force # "{ 1 }" vs "{1}" +sp_inside_braces_struct = force # "{ 1 }" vs "{1}" +sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_inside_paren = remove +sp_inside_fparen = remove +sp_inside_sparen = remove +sp_inside_square = remove #sp_type_func = ignore -sp_assign = force -sp_arith = force -sp_bool = force -sp_compare = force -sp_assign = force -sp_after_comma = force -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_assign = force +sp_arith = force +sp_bool = force +sp_compare = force +sp_assign = force +sp_after_comma = force +sp_func_def_paren = remove # "int foo (){" vs "int foo(){" +sp_func_call_paren = remove # "foo (" vs "foo(" +sp_func_proto_paren = remove # "int foo ();" vs "int foo();" -align_with_tabs = FALSE # use tabs to align -align_on_tabstop = FALSE # align on tabstops +align_with_tabs = FALSE # use tabs to align +align_on_tabstop = FALSE # align on tabstops -align_enum_equ_span = 4 +align_enum_equ_span = 4 -align_nl_cont = TRUE +align_nl_cont = TRUE align_func_params = TRUE -align_var_def_span = 1 -align_var_def_thresh = 16 -align_var_def_inline = TRUE -align_var_def_star_style = 2 -align_var_def_colon = TRUE -align_assign_span = 2 -align_assign_thresh = 3 -align_struct_init_span = 3 -align_var_struct_span = 1 -align_var_struct_thresh = 3 -align_right_cmt_span = 3 -align_pp_define_span = 3 -align_pp_define_gap = 4 -align_number_right = TRUE -align_typedef_span = 5 -align_typedef_gap = 3 +align_var_def_span = 1 +align_var_def_thresh = 16 +align_var_def_inline = TRUE +align_var_def_star_style = 2 +align_var_def_colon = TRUE +align_assign_span = 2 +align_assign_thresh = 3 +align_struct_init_span = 3 +align_var_struct_span = 1 +align_var_struct_thresh = 3 +align_right_cmt_span = 3 +align_pp_define_span = 3 +align_pp_define_gap = 4 +align_number_right = TRUE +align_typedef_span = 5 +align_typedef_gap = 3 -cmt_star_cont = TRUE +cmt_star_cont = TRUE -eat_blanks_before_close_brace = TRUE -eat_blanks_after_open_brace = TRUE +eat_blanks_before_close_brace = TRUE +eat_blanks_after_open_brace = TRUE diff --git a/tests/config/align_attr.cfg b/tests/config/align_attr.cfg index 784c3b895d..8450376b5b 100644 --- a/tests/config/align_attr.cfg +++ b/tests/config/align_attr.cfg @@ -1,4 +1,4 @@ -align_var_def_span=2 -set attribute _PREPROCESSOR_SOMETHING -align_var_def_attribute = true +align_var_def_span = 2 +set attribute _PREPROCESSOR_SOMETHING +align_var_def_attribute = true diff --git a/tests/config/align_fcall-2.cfg b/tests/config/align_fcall-2.cfg index 65d849331a..521cb51ea9 100644 --- a/tests/config/align_fcall-2.cfg +++ b/tests/config/align_fcall-2.cfg @@ -1,5 +1,5 @@ -align_same_func_call_params = true -sp_after_comma = force -align_number_right = true +align_same_func_call_params = true +sp_after_comma = force +align_number_right = true diff --git a/tests/config/align_fcall.cfg b/tests/config/align_fcall.cfg index 70bd174351..bdd30556bf 100644 --- a/tests/config/align_fcall.cfg +++ b/tests/config/align_fcall.cfg @@ -1,4 +1,4 @@ -align_same_func_call_params = true -sp_after_comma = force +align_same_func_call_params = true +sp_after_comma = force diff --git a/tests/config/align_func_params.cfg b/tests/config/align_func_params.cfg index b74107fdd8..fa7bea5f52 100644 --- a/tests/config/align_func_params.cfg +++ b/tests/config/align_func_params.cfg @@ -1 +1 @@ -align_func_params = true +align_func_params = true diff --git a/tests/config/align_func_params_gap.cfg b/tests/config/align_func_params_gap.cfg index 40790c7163..5fb59c1f73 100644 --- a/tests/config/align_func_params_gap.cfg +++ b/tests/config/align_func_params_gap.cfg @@ -1,2 +1,2 @@ -align_func_params_span = 1 -align_func_params_gap = 3 +align_func_params_span = 1 +align_func_params_gap = 3 diff --git a/tests/config/align_func_params_span.cfg b/tests/config/align_func_params_span.cfg index 142dc8dc9b..daae937747 100644 --- a/tests/config/align_func_params_span.cfg +++ b/tests/config/align_func_params_span.cfg @@ -1 +1 @@ -align_func_params_span = 1 +align_func_params_span = 1 diff --git a/tests/config/align_func_params_thresh_1.cfg b/tests/config/align_func_params_thresh_1.cfg index 3a9db01827..47565b180d 100644 --- a/tests/config/align_func_params_thresh_1.cfg +++ b/tests/config/align_func_params_thresh_1.cfg @@ -1,2 +1,2 @@ -align_func_params_span = 1 -align_func_params_thresh = 4 +align_func_params_span = 1 +align_func_params_thresh = 4 diff --git a/tests/config/align_func_params_thresh_2.cfg b/tests/config/align_func_params_thresh_2.cfg index be298cde65..708169d245 100644 --- a/tests/config/align_func_params_thresh_2.cfg +++ b/tests/config/align_func_params_thresh_2.cfg @@ -1,2 +1,2 @@ -align_func_params_span = 1 -align_func_params_thresh = 8 +align_func_params_span = 1 +align_func_params_thresh = 8 diff --git a/tests/config/align_func_params_thresh_3.cfg b/tests/config/align_func_params_thresh_3.cfg index fce0830f10..a19f64a32d 100644 --- a/tests/config/align_func_params_thresh_3.cfg +++ b/tests/config/align_func_params_thresh_3.cfg @@ -1,2 +1,2 @@ -align_func_params_span = 2 -align_func_params_thresh = 4 +align_func_params_span = 2 +align_func_params_thresh = 4 diff --git a/tests/config/align_func_params_thresh_4.cfg b/tests/config/align_func_params_thresh_4.cfg index d82614b00d..ab9bb10b1d 100644 --- a/tests/config/align_func_params_thresh_4.cfg +++ b/tests/config/align_func_params_thresh_4.cfg @@ -1,2 +1,2 @@ -align_func_params_span = 2 -align_func_params_thresh = 8 +align_func_params_span = 2 +align_func_params_thresh = 8 diff --git a/tests/config/align_keep_extra.cfg b/tests/config/align_keep_extra.cfg index 6409f49ce1..daba8109f5 100644 --- a/tests/config/align_keep_extra.cfg +++ b/tests/config/align_keep_extra.cfg @@ -1,4 +1,4 @@ -align_var_def_span=1 -align_assign_span=1 -align_keep_extra_space=true -sp_after_type=ignore +align_var_def_span = 1 +align_assign_span = 1 +align_keep_extra_space = true +sp_after_type = ignore diff --git a/tests/config/align_left_shift.cfg b/tests/config/align_left_shift.cfg index d40df5d453..17a4b31b69 100644 --- a/tests/config/align_left_shift.cfg +++ b/tests/config/align_left_shift.cfg @@ -1,2 +1,2 @@ -align_left_shift = true +align_left_shift = true diff --git a/tests/config/align_right_cmt_gap-1.cfg b/tests/config/align_right_cmt_gap-1.cfg index a18b76df76..82367a635e 100644 --- a/tests/config/align_right_cmt_gap-1.cfg +++ b/tests/config/align_right_cmt_gap-1.cfg @@ -1,5 +1,5 @@ -indent_columns = 3 -indent_with_tabs = 0 -align_right_cmt_span = 8 -align_right_cmt_mix = false -align_right_cmt_gap = 0 +indent_columns = 3 +indent_with_tabs = 0 +align_right_cmt_span = 8 +align_right_cmt_mix = false +align_right_cmt_gap = 0 diff --git a/tests/config/align_right_cmt_gap-2.cfg b/tests/config/align_right_cmt_gap-2.cfg index fd2d3dd430..eee3cc3f69 100644 --- a/tests/config/align_right_cmt_gap-2.cfg +++ b/tests/config/align_right_cmt_gap-2.cfg @@ -1,5 +1,5 @@ -indent_columns = 3 -indent_with_tabs = 0 -align_right_cmt_span = 8 -align_right_cmt_mix = false -align_right_cmt_gap = 3 +indent_columns = 3 +indent_with_tabs = 0 +align_right_cmt_span = 8 +align_right_cmt_mix = false +align_right_cmt_gap = 3 diff --git a/tests/config/align_typedef_func-0.cfg b/tests/config/align_typedef_func-0.cfg index 45cbfcdd16..f05e92437a 100644 --- a/tests/config/align_typedef_func-0.cfg +++ b/tests/config/align_typedef_func-0.cfg @@ -1,6 +1,6 @@ -align_typedef_func = 0 -align_typedef_gap = 3 -align_typedef_span = 5 -align_typedef_star_style = 0 +align_typedef_func = 0 +align_typedef_gap = 3 +align_typedef_span = 5 +align_typedef_star_style = 0 diff --git a/tests/config/align_typedef_func-1.cfg b/tests/config/align_typedef_func-1.cfg index 1b0c2d518b..c7381980f7 100644 --- a/tests/config/align_typedef_func-1.cfg +++ b/tests/config/align_typedef_func-1.cfg @@ -1,6 +1,6 @@ -align_typedef_func = 1 -align_typedef_gap = 3 -align_typedef_span = 5 -align_typedef_star_style = 0 +align_typedef_func = 1 +align_typedef_gap = 3 +align_typedef_span = 5 +align_typedef_star_style = 0 diff --git a/tests/config/align_typedef_func-2.cfg b/tests/config/align_typedef_func-2.cfg index e2ef75f4f6..91b9178752 100644 --- a/tests/config/align_typedef_func-2.cfg +++ b/tests/config/align_typedef_func-2.cfg @@ -1,8 +1,8 @@ -align_typedef_func = 2 -align_typedef_gap = 3 -align_typedef_span = 5 -align_typedef_star_style = 2 +align_typedef_func = 2 +align_typedef_gap = 3 +align_typedef_span = 5 +align_typedef_star_style = 2 -sp_after_ptr_star = remove +sp_after_ptr_star = remove diff --git a/tests/config/align_var_class_span.cfg b/tests/config/align_var_class_span.cfg index 501a792973..d40da722f6 100644 --- a/tests/config/align_var_class_span.cfg +++ b/tests/config/align_var_class_span.cfg @@ -1 +1 @@ -align_var_class_span=1 +align_var_class_span = 1 diff --git a/tests/config/align_var_def_thresh_1.cfg b/tests/config/align_var_def_thresh_1.cfg index ebc89de70e..9fdfb93536 100644 --- a/tests/config/align_var_def_thresh_1.cfg +++ b/tests/config/align_var_def_thresh_1.cfg @@ -1,4 +1,4 @@ -align_var_def_span = 1 -align_var_def_thresh = 4 -align_var_def_star_style = 0 -align_var_def_amp_style = 0 +align_var_def_span = 1 +align_var_def_thresh = 4 +align_var_def_star_style = 0 +align_var_def_amp_style = 0 diff --git a/tests/config/align_var_def_thresh_2.cfg b/tests/config/align_var_def_thresh_2.cfg index bd339b29b7..01af4403ca 100644 --- a/tests/config/align_var_def_thresh_2.cfg +++ b/tests/config/align_var_def_thresh_2.cfg @@ -1,4 +1,4 @@ -align_var_def_span = 1 -align_var_def_thresh = 4 -align_var_def_star_style = 1 -align_var_def_amp_style = 1 +align_var_def_span = 1 +align_var_def_thresh = 4 +align_var_def_star_style = 1 +align_var_def_amp_style = 1 diff --git a/tests/config/align_var_def_thresh_3.cfg b/tests/config/align_var_def_thresh_3.cfg index d029764a53..01fe79960e 100644 --- a/tests/config/align_var_def_thresh_3.cfg +++ b/tests/config/align_var_def_thresh_3.cfg @@ -1,4 +1,4 @@ -align_var_def_span = 1 -align_var_def_thresh = 4 -align_var_def_star_style = 2 -align_var_def_amp_style = 2 +align_var_def_span = 1 +align_var_def_thresh = 4 +align_var_def_star_style = 2 +align_var_def_amp_style = 2 diff --git a/tests/config/amxmodx.cfg b/tests/config/amxmodx.cfg index d1fdd1d396..18c8a85475 100644 --- a/tests/config/amxmodx.cfg +++ b/tests/config/amxmodx.cfg @@ -6,30 +6,30 @@ # Basic Indenting Stuff # (a/i/r) comment notation for add/ignore/remove which is the actual setting -input_tab_size = 4 # tab size on input file: usually 8 -output_tab_size = 4 # tab size for output: usually 8 -indent_columns = 4 # ie 3 or 8 -indent_with_tabs = 2 # 1=only to the 'level' indent, 2=use tab indenting +input_tab_size = 4 # tab size on input file: usually 8 +output_tab_size = 4 # tab size for output: usually 8 +indent_columns = 4 # ie 3 or 8 +indent_with_tabs = 2 # 1=only to the 'level' indent, 2=use tab indenting #indent_paren_nl = 1 # indent-align under paren for open followed by nl -pp_indent = remove # indent preproc 1 space per level (a/i/r) -pp_space = remove # spaces between # and word (add/ignore/remove) +pp_indent = remove # indent preproc 1 space per level (a/i/r) +pp_space = remove # spaces between # and word (add/ignore/remove) -indent_switch_case = 2 # spaces to indent case from switch +indent_switch_case = 2 # spaces to indent case from switch #indent_case_brace = 0 # spaces to indent '{' from case # (usually 0 or indent_columns) #indent_brace = 0 # spaces to indent '{' from level (usually 0) -indent_braces = 0 # whether to indent the braces or not +indent_braces = 0 # whether to indent the braces or not #indent_label = 0 # 0=left >0=col from left (absolute column), # <0=sub from brace indent (relative column) -indent_align_string = false # True/False - indent align broken strings -indent_col1_comment = true # indent comments in column 1 -indent_func_call_param = true # indent continued function calls to indent_columns otherwise index_columns + spaces to align with open paren. +indent_align_string = false # True/False - indent align broken strings +indent_col1_comment = true # indent comments in column 1 +indent_func_call_param = true # indent continued function calls to indent_columns otherwise index_columns + spaces to align with open paren. -indent_namespace = true # indent stuff inside namespace braces -indent_class = true # indent stuff inside class braces +indent_namespace = true # indent stuff inside namespace braces +indent_class = true # indent stuff inside class braces ############################ @@ -37,94 +37,94 @@ indent_class = true # indent stuff inside class braces # Force,Ignore,Add,Remove # ignored by nl_*_brace = true -sp_paren_brace = force # space between ')' and '{' -sp_fparen_brace = force # space between ')' and '{' of function -sp_sparen_brace = force # space between ')' and '{' of if, while, etc +sp_paren_brace = force # space between ')' and '{' +sp_fparen_brace = force # space between ')' and '{' of function +sp_sparen_brace = force # space between ')' and '{' of if, while, etc -sp_after_cast = force # space after cast - "(int) a" vs "(int)a" +sp_after_cast = force # space after cast - "(int) a" vs "(int)a" -sp_before_byref = force # space before '&' of 'fcn(int& idx)' +sp_before_byref = force # space before '&' of 'fcn(int& idx)' -sp_inside_fparen = remove # space inside 'foo( xxx )' vs 'foo(xxx)' -sp_inside_fparens = remove # space inside 'foo( )' vs 'foo()' -sp_inside_paren = remove # space inside '+ ( xxx )' vs '+ (xxx)' -sp_inside_square = remove # space inside 'byte[ 5 ]' vs 'byte[5]' -sp_inside_sparen = remove # space inside 'if( xxx )' vs 'if(xxx)' -sp_inside_angle = ignore # space inside '<>', as in '' +sp_inside_fparen = remove # space inside 'foo( xxx )' vs 'foo(xxx)' +sp_inside_fparens = remove # space inside 'foo( )' vs 'foo()' +sp_inside_paren = remove # space inside '+ ( xxx )' vs '+ (xxx)' +sp_inside_square = remove # space inside 'byte[ 5 ]' vs 'byte[5]' +sp_inside_sparen = remove # space inside 'if( xxx )' vs 'if(xxx)' +sp_inside_angle = ignore # space inside '<>', as in '' -sp_before_sparen = force # space before '(' of 'if/for/while/switch' -sp_after_sparen = force # space after ')' of 'if/for/while/switch' +sp_before_sparen = force # space before '(' of 'if/for/while/switch' +sp_after_sparen = force # space after ')' of 'if/for/while/switch' # the do-while does not get set here -sp_before_angle = ignore # space before '<>', as in '' -sp_after_angle = ignore # space after '<>', as in '' +sp_before_angle = ignore # space before '<>', as in '' +sp_after_angle = ignore # space after '<>', as in '' -sp_before_square = ignore # space before single '[' -sp_before_squares = remove # space before '[]', as in 'byte []' +sp_before_square = ignore # space before single '[' +sp_before_squares = remove # space before '[]', as in 'byte []' -sp_paren_paren = remove # space between nested parens - '( (' vs '((' +sp_paren_paren = remove # space between nested parens - '( (' vs '((' -sp_return_paren = remove # space between 'return' and '(' -sp_sizeof_paren = remove # space between 'sizeof' and '(' +sp_return_paren = remove # space between 'return' and '(' +sp_sizeof_paren = remove # space between 'sizeof' and '(' -sp_after_comma = force # space after ',' +sp_after_comma = force # space after ',' -sp_arith = force # space around + - / * etc -sp_bool = force # space around || && -sp_compare = force # space around < > ==, etc -sp_assign = force # space around =, +=, etc +sp_arith = force # space around + - / * etc +sp_bool = force # space around || && +sp_compare = force # space around < > ==, etc +sp_assign = force # space around =, +=, etc -sp_func_def_paren = remove # space between 'func' and '(' - "foo (" vs "foo(" -sp_func_call_paren = remove # space between 'func' and '(' - "foo (" vs "foo(" -sp_func_proto_paren = remove # space between 'func' and '(' - "foo (" vs "foo(" -sp_func_class_paren = remove # space between ctor/dtor and '(' +sp_func_def_paren = remove # space between 'func' and '(' - "foo (" vs "foo(" +sp_func_call_paren = remove # space between 'func' and '(' - "foo (" vs "foo(" +sp_func_proto_paren = remove # space between 'func' and '(' - "foo (" vs "foo(" +sp_func_class_paren = remove # space between ctor/dtor and '(' #sp_type_func = 1 # space between return type and 'func' # a minimum of 1 is forced except for '*' -sp_special_semi = remove # space empty stmt ';' on while, if, for +sp_special_semi = remove # space empty stmt ';' on while, if, for # example "while (*p++ = ' ') ;" -sp_before_semi = remove # space before all ';' -sp_after_semi = force -sp_inside_braces = remove # space inside '{' and '}' - "{ 1, 2, 3 }" -sp_inside_braces_enum = remove # space inside enum '{' and '}' - "{ a, b, c }" -sp_inside_braces_struct = remove # space inside struct/union '{' and '}' +sp_before_semi = remove # space before all ';' +sp_after_semi = force +sp_inside_braces = remove # space inside '{' and '}' - "{ 1, 2, 3 }" +sp_inside_braces_enum = remove # space inside enum '{' and '}' - "{ a, b, c }" +sp_inside_braces_struct = remove # space inside struct/union '{' and '}' -sp_macro = force # space between macro and value, ie '#define a 6' -sp_macro_func = force # space between macro and value, ie '#define a 6' +sp_macro = force # space between macro and value, ie '#define a 6' +sp_macro_func = force # space between macro and value, ie '#define a 6' -sp_square_fparen = ignore # weird pawn stuff: native yark[rect](a[rect]) -sp_after_tag = remove # pawn: space after a tag colon +sp_square_fparen = ignore # weird pawn stuff: native yark[rect](a[rect]) +sp_after_tag = remove # pawn: space after a tag colon ################################ # Code Alignment # (not left column spaces/tabs) -align_with_tabs = true # use tabs for aligning (0/1) -align_keep_tabs = false # keep non-indenting tabs -align_on_tabstop = true # always align on tabstops -align_nl_cont = false # align the back-slash \n combo (macros) -align_enum_equ_span = 1 # align the '=' in enums -align_assign_span = 1 # align on '='. 0=don't align -align_assign_thresh = 0 # threshold for aligning on '='. 0=no limit -align_right_cmt_span = 8 # align comment that end lines. 0=don't align -align_var_def_span = 1 # align variable defs on variable (span for regular stuff) -align_var_def_thresh = 0 # align variable defs threshold -align_var_def_inline = true # also align inline struct/enum/union var defs -align_var_def_star_style = 1 # the star is part of the variable name -align_var_def_colon = false # align the colon in struct bit fields -align_var_struct_span = 1 # span for struct/union (0=don't align) -align_pp_define_span = 1 # align bodies in #define statements -align_pp_define_gap = 1 # min space between define label and value "#define a <---> 16" - -align_struct_init_span = 1 # align structure initializer values -align_func_proto_span = 1 # align function prototypes -align_number_right = false # right-align numbers (not fully supported, yet) -align_typedef_span = 1 # align single-line typedefs -align_typedef_gap = 1 # minimum spacing -align_typedef_star_style = 1 # Start aligning style +align_with_tabs = true # use tabs for aligning (0/1) +align_keep_tabs = false # keep non-indenting tabs +align_on_tabstop = true # always align on tabstops +align_nl_cont = false # align the back-slash \n combo (macros) +align_enum_equ_span = 1 # align the '=' in enums +align_assign_span = 1 # align on '='. 0=don't align +align_assign_thresh = 0 # threshold for aligning on '='. 0=no limit +align_right_cmt_span = 8 # align comment that end lines. 0=don't align +align_var_def_span = 1 # align variable defs on variable (span for regular stuff) +align_var_def_thresh = 0 # align variable defs threshold +align_var_def_inline = true # also align inline struct/enum/union var defs +align_var_def_star_style = 1 # the star is part of the variable name +align_var_def_colon = false # align the colon in struct bit fields +align_var_struct_span = 1 # span for struct/union (0=don't align) +align_pp_define_span = 1 # align bodies in #define statements +align_pp_define_gap = 1 # min space between define label and value "#define a <---> 16" + +align_struct_init_span = 1 # align structure initializer values +align_func_proto_span = 1 # align function prototypes +align_number_right = false # right-align numbers (not fully supported, yet) +align_typedef_span = 1 # align single-line typedefs +align_typedef_gap = 1 # minimum spacing +align_typedef_star_style = 1 # Start aligning style # 0: '*' not part of type # 1: '*' part of the type - no space # 2: '*' part of type, dangling @@ -134,79 +134,79 @@ align_typedef_star_style = 1 # Start aligning style # Newline Adding and Removing Options # Add/Remove/Ignore -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" -nl_func_decl_start = ignore # newline after the '(' in a function decl -nl_func_decl_args = ignore # newline after each ',' in a function decl -nl_func_decl_end = ignore # newline before the ')' in a function decl -nl_func_type_name = ignore # newline between return type and func name in def -nl_func_var_def_blk = 0 # newline after a block of variable defs -nl_before_case = true # newline before 'case' statement -nl_after_return = false # newline after return statement -nl_after_case = true # disallow nested "case 1: a=3;" -nl_fcall_brace = add # newline between function call and open brace -nl_squeeze_ifdef = false # no blanks after #ifxx, #elxx, or before #endif TRUE/F -nl_enum_brace = ignore # nl between enum and brace -nl_struct_brace = ignore # nl between struct and brace -nl_union_brace = ignore # nl between union and brace -nl_assign_brace = ignore # nl between '=' and brace -nl_class_brace = ignore # nl between class name and brace -nl_namespace_brace = ignore # nl between namespace name and brace - -nl_do_brace = add # nl between do and { -nl_if_brace = add # nl between if and { -nl_for_brace = add # nl between for and { -nl_else_brace = add # nl between else and { -nl_while_brace = add # nl between while and { -nl_switch_brace = add # nl between switch and { -nl_brace_else = add # nl between } and else -nl_brace_while = add # nl between } and while of do stmt - -nl_elseif_brace = add # nl between close paren and open brace in 'else if () {' - -nl_define_macro = 0 # alter newlines in #define macros -nl_start_of_file = ignore # alter newlines at the start of file -nl_start_of_file_min = 0 # min number of newlines at the start of the file -nl_end_of_file = ignore # alter newlines at the end of file -nl_end_of_file_min = 0 # min number of newlines at the end of the file - -pos_bool = lead # end=move &&/|| to EOL ignore=gnore, start=move to SOL +nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_func_decl_start = ignore # newline after the '(' in a function decl +nl_func_decl_args = ignore # newline after each ',' in a function decl +nl_func_decl_end = ignore # newline before the ')' in a function decl +nl_func_type_name = ignore # newline between return type and func name in def +nl_func_var_def_blk = 0 # newline after a block of variable defs +nl_before_case = true # newline before 'case' statement +nl_after_return = false # newline after return statement +nl_after_case = true # disallow nested "case 1: a=3;" +nl_fcall_brace = add # newline between function call and open brace +nl_squeeze_ifdef = false # no blanks after #ifxx, #elxx, or before #endif TRUE/F +nl_enum_brace = ignore # nl between enum and brace +nl_struct_brace = ignore # nl between struct and brace +nl_union_brace = ignore # nl between union and brace +nl_assign_brace = ignore # nl between '=' and brace +nl_class_brace = ignore # nl between class name and brace +nl_namespace_brace = ignore # nl between namespace name and brace + +nl_do_brace = add # nl between do and { +nl_if_brace = add # nl between if and { +nl_for_brace = add # nl between for and { +nl_else_brace = add # nl between else and { +nl_while_brace = add # nl between while and { +nl_switch_brace = add # nl between switch and { +nl_brace_else = add # nl between } and else +nl_brace_while = add # nl between } and while of do stmt + +nl_elseif_brace = add # nl between close paren and open brace in 'else if () {' + +nl_define_macro = 0 # alter newlines in #define macros +nl_start_of_file = ignore # alter newlines at the start of file +nl_start_of_file_min = 0 # min number of newlines at the start of the file +nl_end_of_file = ignore # alter newlines at the end of file +nl_end_of_file_min = 0 # min number of newlines at the end of the file + +pos_bool = lead # end=move &&/|| to EOL ignore=gnore, start=move to SOL ##################### # Blank Line Options -nl_before_block_comment = 2 # before a block comment (stand-alone +nl_before_block_comment = 2 # before a block comment (stand-alone # comment-multi), except after brace open -nl_after_func_body = 2 # after the closing brace of a function body -nl_after_func_proto = 2 # after each prototype -nl_after_func_proto_group = 2 # after a block of prototypes -nl_max = 2 # maximum consecutive newlines (3=2 lines) +nl_after_func_body = 2 # after the closing brace of a function body +nl_after_func_proto = 2 # after each prototype +nl_after_func_proto_group = 2 # after a block of prototypes +nl_max = 2 # maximum consecutive newlines (3=2 lines) -eat_blanks_after_open_brace = true # remove blank lines after { -eat_blanks_before_close_brace = true # remove blank lines before } +eat_blanks_after_open_brace = true # remove blank lines after { +eat_blanks_before_close_brace = true # remove blank lines before } ######################## # Code Modifying Options # (non-whitespace) -mod_paren_on_return = remove # add or remove paren on return -mod_full_brace_nl = 1 # max number of newlines to span w/o braces -mod_full_brace_if = add # add or remove braces on if -mod_full_brace_for = add # add or remove braces on for -mod_full_brace_do = add # add or remove braces on do -mod_full_brace_while = add # add or remove braces on while -mod_pawn_semicolon = True # add optional semicolons -mod_full_brace_function = add # add optional braces on Pawn functions +mod_paren_on_return = remove # add or remove paren on return +mod_full_brace_nl = 1 # max number of newlines to span w/o braces +mod_full_brace_if = add # add or remove braces on if +mod_full_brace_for = add # add or remove braces on for +mod_full_brace_do = add # add or remove braces on do +mod_full_brace_while = add # add or remove braces on while +mod_pawn_semicolon = True # add optional semicolons +mod_full_brace_function = add # add optional braces on Pawn functions ####################### # Comment Modifications -cmt_star_cont = false # put a star on subsequent comment lines -cmt_cpp_to_c = false # convert CPP comments to C comments -cmt_cpp_group = false # if UO_cmt_cpp_to_c, try to group in one big C comment -cmt_cpp_nl_start = false # put a blank /* at the start of a converted group -cmt_cpp_nl_end = false # put a nl before the */ in a converted group +cmt_star_cont = false # put a star on subsequent comment lines +cmt_cpp_to_c = false # convert CPP comments to C comments +cmt_cpp_group = false # if UO_cmt_cpp_to_c, try to group in one big C comment +cmt_cpp_nl_start = false # put a blank /* at the start of a converted group +cmt_cpp_nl_end = false # put a nl before the */ in a converted group -string_escape_char=94 -string_escape_char2=92 +string_escape_char = 94 +string_escape_char2 = 92 diff --git a/tests/config/annot-after.cfg b/tests/config/annot-after.cfg index d15d4c3b77..ea238988ed 100644 --- a/tests/config/annot-after.cfg +++ b/tests/config/annot-after.cfg @@ -1,3 +1,3 @@ -nl_remove_extra_newlines = 2 -nl_after_annotation = force -nl_between_annotation = remove +nl_remove_extra_newlines = 2 +nl_after_annotation = force +nl_between_annotation = remove diff --git a/tests/config/annot-between.cfg b/tests/config/annot-between.cfg index 6c66513f92..c457006725 100644 --- a/tests/config/annot-between.cfg +++ b/tests/config/annot-between.cfg @@ -1,3 +1,3 @@ -nl_remove_extra_newlines = 2 -nl_after_annotation = remove -nl_between_annotation = force +nl_remove_extra_newlines = 2 +nl_after_annotation = remove +nl_between_annotation = force diff --git a/tests/config/annot-both.cfg b/tests/config/annot-both.cfg index d80bea44be..9788f95423 100644 --- a/tests/config/annot-both.cfg +++ b/tests/config/annot-both.cfg @@ -1,3 +1,3 @@ -nl_remove_extra_newlines = 2 -nl_after_annotation = force -nl_between_annotation = force +nl_remove_extra_newlines = 2 +nl_after_annotation = force +nl_between_annotation = force diff --git a/tests/config/annot-none.cfg b/tests/config/annot-none.cfg index c2aff1a4b1..4ffe0d3ada 100644 --- a/tests/config/annot-none.cfg +++ b/tests/config/annot-none.cfg @@ -1,3 +1,3 @@ -nl_remove_extra_newlines = 2 -nl_after_annotation = remove -nl_between_annotation = remove +nl_remove_extra_newlines = 2 +nl_after_annotation = remove +nl_between_annotation = remove diff --git a/tests/config/annotation.cfg b/tests/config/annotation.cfg index e847af8493..5834e55abb 100644 --- a/tests/config/annotation.cfg +++ b/tests/config/annotation.cfg @@ -1,4 +1,4 @@ # -nl_after_annotation = force -nl_between_annotation = force -sp_annotation_paren = remove +nl_after_annotation = force +nl_between_annotation = force +sp_annotation_paren = remove diff --git a/tests/config/avalon.cfg b/tests/config/avalon.cfg index 845a6b416d..04f88f2320 100644 --- a/tests/config/avalon.cfg +++ b/tests/config/avalon.cfg @@ -1,60 +1,60 @@ # Sets the line endings for the output file -newlines = AUTO # AUTO/LF/CRLF/CR +newlines = AUTO # AUTO/LF/CRLF/CR # The original tab space value. # Used to determine what was already aligned. (TODO) -input_tab_size = 2 # number +input_tab_size = 2 # number # Size of tabs in the output. # Only important if indent_with_tabs=2. -output_tab_size = 2 # number +output_tab_size = 2 # number # The number of columns to indent. # Usually 2, 3, 4, or 8. -indent_columns = 2 # number +indent_columns = 2 # number # How to use tabs when indenting code. # 0 = Use spaces only # 1 = Use tabs to the brace-level indent (very portable) # 2 = Use tabs whenever possible -indent_with_tabs = 0 # number +indent_with_tabs = 0 # number # If an open paren is followed by a newline, indent the next line # so that it lines up after the open paren. # Not recommended. -indent_paren_nl = false # bool +indent_paren_nl = false # bool # Changes the space between # and, say, define. -pp_space = ignore # IARF +pp_space = ignore # IARF # Changes the indent of preprocessors. -pp_indent = ignore # IARF +pp_indent = ignore # IARF # Spaces to indent case from switch (usually 0 or indent_columns). -indent_switch_case = 2 # number * REVISIT: make TRUE/FALSE? * +indent_switch_case = 2 # number * REVISIT: make TRUE/FALSE? * # Spaces to indent '{' from level (usually 0). For GNU style, set to 2. -indent_brace = 0 # number +indent_brace = 0 # number # Whether braces are indented to the body level or not. -indent_braces = false # bool +indent_braces = false # bool -indent_class = false -indent_namespace = false +indent_class = false +indent_namespace = false # How to indent goto labels. # > 0 : Absolute column (1=leftmost column) # <= 0 : Subtract from brace indent -indent_label = -2 # number +indent_label = -2 # number # Whether to indent broken strings so that they line up. -indent_align_string = false # bool +indent_align_string = false # bool # Whether to indent comments found in column 1. -indent_col1_comment = false # bool +indent_col1_comment = false # bool # If true, indent continued function call parameters one indent level. -indent_func_call_param = false # bool +indent_func_call_param = false # bool @@ -63,97 +63,97 @@ indent_func_call_param = false # bool # # Space between ')' and '{' -sp_paren_brace = force # IARF +sp_paren_brace = force # IARF # Space after cast - "(int) a" vs "(int)a" -sp_after_cast = remove # IARF +sp_after_cast = remove # IARF # Space before & in function definition param: -sp_before_byref = remove # IARF +sp_before_byref = remove # IARF # Space inside 'foo( xxx )' vs 'foo(xxx)' -sp_inside_fparen = remove # IARF +sp_inside_fparen = remove # IARF # space inside '+ ( xxx )' vs '+ (xxx)' -sp_inside_paren = remove # IARF +sp_inside_paren = remove # IARF # space inside 'byte[ 5 ]' vs 'byte[5]' -sp_inside_square = remove # IARF +sp_inside_square = remove # IARF # Space inside 'if( xxx )' vs 'if(xxx)' -sp_inside_sparen = remove # IARF +sp_inside_sparen = remove # IARF # Space inside '<>' -sp_inside_angle = remove # IARF +sp_inside_angle = remove # IARF # Space before '(' of 'if/for/while/switch'. -sp_before_sparen = force # IARF +sp_before_sparen = force # IARF # Space after ')' of 'if/for/while/switch' -sp_after_sparen = force # IARF +sp_after_sparen = force # IARF # Space before '<>' -sp_before_angle = remove # IARF +sp_before_angle = remove # IARF # Space after '<>' -sp_after_angle = remove # IARF +sp_after_angle = remove # IARF # space before all '[', except '[]' -sp_before_square = force # IARF +sp_before_square = force # IARF # space before '[]' -sp_before_squares = remove # IARF +sp_before_squares = remove # IARF # space between nested parens - '( (' vs '((' -sp_paren_paren = remove # IARF +sp_paren_paren = remove # IARF # space between 'return' and '(' -sp_return_paren = force # IARF +sp_return_paren = force # IARF # space between 'sizeof' and '(' -sp_sizeof_paren = remove # IARF +sp_sizeof_paren = remove # IARF # space after ',' -sp_after_comma = force # IARF +sp_after_comma = force # IARF # space around + - / * etc -sp_arith = force # IARF +sp_arith = force # IARF # space around || && -sp_bool = force # IARF +sp_bool = force # IARF # space around < > ==, etc -sp_compare = force # IARF +sp_compare = force # IARF # space around =, +=, etc -sp_assign = force # IARF +sp_assign = force # IARF # space between 'func' and '(' - "foo (" vs "foo(" -sp_func_def_paren = remove # IARF +sp_func_def_paren = remove # IARF # space between 'func' and '(' - "foo (" vs "foo(" -sp_func_call_paren = remove # IARF +sp_func_call_paren = remove # IARF # space between 'func' and '(' - "foo (" vs "foo(" -sp_func_proto_paren = remove # IARF +sp_func_proto_paren = remove # IARF # Space between return type and 'func' #sp_type_func = force # IARF # Space empty stmt ';' on while, if, for -sp_special_semi = force # IARF +sp_special_semi = force # IARF # Space before all ';' -sp_before_semi = remove # IARF +sp_before_semi = remove # IARF # Space inside '{' and '}' - "{ 1, 2, 3 }" -sp_inside_braces = remove # IARF +sp_inside_braces = remove # IARF # Space inside enum '{' and '}' - "{ a, b, c }" -sp_inside_braces_enum = remove # IARF +sp_inside_braces_enum = remove # IARF # Space inside struct/union '{' and '}' -sp_inside_braces_struct = remove # IARF +sp_inside_braces_struct = remove # IARF @@ -162,52 +162,52 @@ sp_inside_braces_struct = remove # IARF # # Use tabs for aligning. -align_with_tabs = false # bool +align_with_tabs = false # bool # Keep non-indenting tabs. -align_keep_tabs = false # bool +align_keep_tabs = false # bool # When aligning, bump out to the next tabstop. -align_on_tabstop = false # bool +align_on_tabstop = false # bool # Align the back-slash \n combo (macros) -align_nl_cont = true # bool +align_nl_cont = true # bool # Align the '=' in enums -align_enum_equ_span = 0 # bool +align_enum_equ_span = 0 # bool # The span for aligning on '=' in assignments. 0=don't align -align_assign_span = 0 # number +align_assign_span = 0 # number # Span for aligning comments that end lines. 0=don't align -align_right_cmt_span = 0 # number +align_right_cmt_span = 0 # number # Span for aligning variable definitions -align_var_def_span = 0 # number +align_var_def_span = 0 # number # Whether to align inline struct/enum/union var defs -align_var_def_inline = 0 # bool +align_var_def_inline = 0 # bool # Whether the star is part of the variable name or not. -align_var_def_star_style = 2 # bool +align_var_def_star_style = 2 # bool # Align the colon in struct bit fields -align_var_def_colon = false # bool +align_var_def_colon = false # bool # Span for struct/union (0=don't align) -align_var_struct_span = 0 # number +align_var_struct_span = 0 # number # align bodies in #define statements -align_pp_define_span = 0 # number +align_pp_define_span = 0 # number # Min space between define label and value "#define a <---> 16" -align_pp_define_gap = 1 # number +align_pp_define_gap = 1 # number # Align structure initializer values -align_struct_init_span = 0 # number +align_struct_init_span = 0 # number # Align function prototypes -align_func_proto_span = 0 # number +align_func_proto_span = 0 # number # right-align numbers #align_number_right: bool * a little buggy * @@ -222,7 +222,7 @@ align_func_proto_span = 0 # number # 0: '*' not part of type # 1: '*' part of the type - no space # 2: '*' part of type, dangling -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # number @@ -231,93 +231,93 @@ align_typedef_star_style = 0 # number # # "int foo() {" vs "int foo()\n{" -nl_fdef_brace = force # IARF +nl_fdef_brace = force # IARF # Newline after '(' in a function decl -nl_func_decl_start = remove # IARF +nl_func_decl_start = remove # IARF # Newline after each ',' in a function decl -nl_func_decl_args = remove # IARF +nl_func_decl_args = remove # IARF # Newline before the ')' in a function decl -nl_func_decl_end = remove # IARF +nl_func_decl_end = remove # IARF # Newline between return type and func name in def -nl_func_type_name = remove # IARF +nl_func_type_name = remove # IARF # Newline after a block of variable defs -nl_func_var_def_blk = 0 # number +nl_func_var_def_blk = 0 # number # newline before 'case' statement -nl_before_case = false # bool +nl_before_case = false # bool # newline after return statement -nl_after_return = true # bool +nl_after_return = true # bool # Disallow nested "case 1: a=3;" -nl_after_case = true # bool +nl_after_case = true # bool # newline between function call and open brace -nl_fcall_brace = remove # IARF +nl_fcall_brace = remove # IARF # No blanks after #ifxx, #elxx, or before #endif -nl_squeeze_ifdef = false # bool +nl_squeeze_ifdef = false # bool # nl between enum and brace -nl_enum_brace = remove # IARF +nl_enum_brace = remove # IARF # nl between struct and brace -nl_struct_brace = remove # IARF +nl_struct_brace = remove # IARF # nl between union and brace -nl_union_brace = remove # IARF +nl_union_brace = remove # IARF # nl between = and { -nl_assign_brace = remove # IARF +nl_assign_brace = remove # IARF # nl between do and { -nl_do_brace = remove # IARF +nl_do_brace = remove # IARF # nl between if and { -nl_if_brace = remove # IARF +nl_if_brace = remove # IARF # nl between for and { -nl_for_brace = remove # IARF +nl_for_brace = remove # IARF # nl between else and { -nl_else_brace = remove # IARF +nl_else_brace = remove # IARF # nl between while and { -nl_while_brace = remove # IARF +nl_while_brace = remove # IARF # nl between switch and { -nl_switch_brace = remove # IARF +nl_switch_brace = remove # IARF # nl between } and else -nl_brace_else = remove # IARF +nl_brace_else = remove # IARF # nl between } and while of do stmt -nl_brace_while = remove # IARF +nl_brace_while = remove # IARF # Alter newlines in #define macros -nl_define_macro = false # bool +nl_define_macro = false # bool # Add or remove newlines at the start of the file -nl_start_of_file = remove # IARF +nl_start_of_file = remove # IARF # Number of newlines at the start of the file. Only used if nl_start_of_file is Add or Force #nl_start_of_file_min: number # Add or remove newlines at the end of the file -nl_end_of_file = force # IARF +nl_end_of_file = force # IARF # Number of newlines at the end of the file. Only used if nl_end_of_file is Add or Force -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # number # -1: boolean ops are at the end of the line # 0: do not move boolean ops (default) # 1: boolean ops are at the start of the line -pos_bool = Trail # position (Trail, None, Lead) +pos_bool = Trail # position (Trail, None, Lead) @@ -327,25 +327,25 @@ pos_bool = Trail # position (Trail, None, Lead) # # Minimum number of newlines before a multi-line comment. -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # number # Newlines after the closing brace of a function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # number # Newlines after a single function prototype. -nl_after_func_proto = 1 # number +nl_after_func_proto = 1 # number # Newlines after a prototype, if not followed by another prototype. -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # number # The maximum consecutive newlines. -nl_max = 4 # number +nl_max = 4 # number # Remove blank lines after { -eat_blanks_after_open_brace = true # bool +eat_blanks_after_open_brace = true # bool # Remove blank lines before } -eat_blanks_before_close_brace = true # bool +eat_blanks_before_close_brace = true # bool @@ -354,19 +354,19 @@ eat_blanks_before_close_brace = true # bool # # Add or remove unecessary paren on return. -mod_paren_on_return = remove # IARF +mod_paren_on_return = remove # IARF # add or remove braces on single-statement if -mod_full_brace_if = add # IARF +mod_full_brace_if = add # IARF # add or remove braces on single-statement for -mod_full_brace_for = add # IARF +mod_full_brace_for = add # IARF # add or remove braces on single-statement do -mod_full_brace_do = add # IARF +mod_full_brace_do = add # IARF # add or remove braces on single-statement while -mod_full_brace_while = add # IARF +mod_full_brace_while = add # IARF # don't remove braces around statements that span X newlines #mod_full_brace_nl: number diff --git a/tests/config/avalon2.cfg b/tests/config/avalon2.cfg index b990a28586..5025752390 100644 --- a/tests/config/avalon2.cfg +++ b/tests/config/avalon2.cfg @@ -1,60 +1,60 @@ # Sets the line endings for the output file -newlines = AUTO # AUTO/LF/CRLF/CR +newlines = AUTO # AUTO/LF/CRLF/CR # The original tab space value. # Used to determine what was already aligned. (TODO) -input_tab_size = 2 # number +input_tab_size = 2 # number # Size of tabs in the output. # Only important if indent_with_tabs=2. -output_tab_size = 2 # number +output_tab_size = 2 # number # The number of columns to indent. # Usually 2, 3, 4, or 8. -indent_columns = 2 # number +indent_columns = 2 # number # How to use tabs when indenting code. # 0 = Use spaces only # 1 = Use tabs to the brace-level indent (very portable) # 2 = Use tabs whenever possible -indent_with_tabs = 0 # number +indent_with_tabs = 0 # number # If an open paren is followed by a newline, indent the next line # so that it lines up after the open paren. # Not recommended. -indent_paren_nl = false # bool +indent_paren_nl = false # bool # Changes the space between # and, say, define. -pp_space = ignore # IARF +pp_space = ignore # IARF # Changes the indent of preprocessors. -pp_indent = ignore # IARF +pp_indent = ignore # IARF # Spaces to indent case from switch (usually 0 or indent_columns). -indent_switch_case = 2 # number * REVISIT: make TRUE/FALSE? * +indent_switch_case = 2 # number * REVISIT: make TRUE/FALSE? * # Spaces to indent '{' from level (usually 0). For GNU style, set to 2. -indent_brace = 0 # number +indent_brace = 0 # number # Whether braces are indented to the body level or not. -indent_braces = false # bool +indent_braces = false # bool -indent_class = false -indent_namespace = false +indent_class = false +indent_namespace = false # How to indent goto labels. # > 0 : Absolute column (1=leftmost column) # <= 0 : Subtract from brace indent -indent_label = -2 # number +indent_label = -2 # number # Whether to indent broken strings so that they line up. -indent_align_string = false # bool +indent_align_string = false # bool # Whether to indent comments found in column 1. -indent_col1_comment = false # bool +indent_col1_comment = false # bool # If true, indent continued function call parameters one indent level. -indent_func_call_param = false # bool +indent_func_call_param = false # bool @@ -63,100 +63,100 @@ indent_func_call_param = false # bool # # Space between ')' and '{' -sp_paren_brace = force # IARF +sp_paren_brace = force # IARF # Space after cast - "(int) a" vs "(int)a" -sp_after_cast = remove # IARF +sp_after_cast = remove # IARF # Space before & in function definition param: -sp_before_byref = remove # IARF +sp_before_byref = remove # IARF # Space inside 'foo( xxx )' vs 'foo(xxx)' -sp_inside_fparen = remove # IARF +sp_inside_fparen = remove # IARF # space inside '+ ( xxx )' vs '+ (xxx)' -sp_inside_paren = remove # IARF +sp_inside_paren = remove # IARF # space inside 'byte[ 5 ]' vs 'byte[5]' -sp_inside_square = remove # IARF +sp_inside_square = remove # IARF # Space inside 'if( xxx )' vs 'if(xxx)' -sp_inside_sparen = remove # IARF +sp_inside_sparen = remove # IARF # Space inside '<>' -sp_inside_angle = remove # IARF +sp_inside_angle = remove # IARF # Space before '(' of 'if/for/while/switch'. -sp_before_sparen = force # IARF +sp_before_sparen = force # IARF # Space after ')' of 'if/for/while/switch' -sp_after_sparen = force # IARF +sp_after_sparen = force # IARF # Space before '<>' -sp_before_angle = remove # IARF +sp_before_angle = remove # IARF # Space after '<>' -sp_after_angle = remove # IARF -sp_angle_paren = remove # IARF -sp_angle_paren_empty = remove -sp_angle_word = force # IARF +sp_after_angle = remove # IARF +sp_angle_paren = remove # IARF +sp_angle_paren_empty = remove +sp_angle_word = force # IARF # space before all '[', except '[]' -sp_before_square = force # IARF +sp_before_square = force # IARF # space before '[]' -sp_before_squares = remove # IARF +sp_before_squares = remove # IARF # space between nested parens - '( (' vs '((' -sp_paren_paren = remove # IARF +sp_paren_paren = remove # IARF # space between 'return' and '(' -sp_return_paren = force # IARF +sp_return_paren = force # IARF # space between 'sizeof' and '(' -sp_sizeof_paren = remove # IARF +sp_sizeof_paren = remove # IARF # space after ',' -sp_after_comma = force # IARF +sp_after_comma = force # IARF # space around + - / * etc -sp_arith = force # IARF +sp_arith = force # IARF # space around || && -sp_bool = force # IARF +sp_bool = force # IARF # space around < > ==, etc -sp_compare = force # IARF +sp_compare = force # IARF # space around =, +=, etc -sp_assign = force # IARF +sp_assign = force # IARF # space between 'func' and '(' - "foo (" vs "foo(" -sp_func_def_paren = remove # IARF +sp_func_def_paren = remove # IARF # space between 'func' and '(' - "foo (" vs "foo(" -sp_func_call_paren = remove # IARF +sp_func_call_paren = remove # IARF # space between 'func' and '(' - "foo (" vs "foo(" -sp_func_proto_paren = remove # IARF +sp_func_proto_paren = remove # IARF # Space between return type and 'func' #sp_type_func = force # IARF # Space empty stmt ';' on while, if, for -sp_special_semi = force # IARF +sp_special_semi = force # IARF # Space before all ';' -sp_before_semi = remove # IARF +sp_before_semi = remove # IARF # Space inside '{' and '}' - "{ 1, 2, 3 }" -sp_inside_braces = remove # IARF +sp_inside_braces = remove # IARF # Space inside enum '{' and '}' - "{ a, b, c }" -sp_inside_braces_enum = remove # IARF +sp_inside_braces_enum = remove # IARF # Space inside struct/union '{' and '}' -sp_inside_braces_struct = remove # IARF +sp_inside_braces_struct = remove # IARF @@ -165,52 +165,52 @@ sp_inside_braces_struct = remove # IARF # # Use tabs for aligning. -align_with_tabs = false # bool +align_with_tabs = false # bool # Keep non-indenting tabs. -align_keep_tabs = false # bool +align_keep_tabs = false # bool # When aligning, bump out to the next tabstop. -align_on_tabstop = false # bool +align_on_tabstop = false # bool # Align the back-slash \n combo (macros) -align_nl_cont = true # bool +align_nl_cont = true # bool # Align the '=' in enums -align_enum_equ_span = 0 # bool +align_enum_equ_span = 0 # bool # The span for aligning on '=' in assignments. 0=don't align -align_assign_span = 0 # number +align_assign_span = 0 # number # Span for aligning comments that end lines. 0=don't align -align_right_cmt_span = 0 # number +align_right_cmt_span = 0 # number # Span for aligning variable definitions -align_var_def_span = 0 # number +align_var_def_span = 0 # number # Whether to align inline struct/enum/union var defs -align_var_def_inline = 0 # bool +align_var_def_inline = 0 # bool # Whether the star is part of the variable name or not. -align_var_def_star_style = 2 # bool +align_var_def_star_style = 2 # bool # Align the colon in struct bit fields -align_var_def_colon = false # bool +align_var_def_colon = false # bool # Span for struct/union (0=don't align) -align_var_struct_span = 0 # number +align_var_struct_span = 0 # number # align bodies in #define statements -align_pp_define_span = 0 # number +align_pp_define_span = 0 # number # Min space between define label and value "#define a <---> 16" -align_pp_define_gap = 1 # number +align_pp_define_gap = 1 # number # Align structure initializer values -align_struct_init_span = 0 # number +align_struct_init_span = 0 # number # Align function prototypes -align_func_proto_span = 0 # number +align_func_proto_span = 0 # number # right-align numbers #align_number_right: bool * a little buggy * @@ -225,7 +225,7 @@ align_func_proto_span = 0 # number # 0: '*' not part of type # 1: '*' part of the type - no space # 2: '*' part of type, dangling -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # number @@ -234,96 +234,96 @@ align_typedef_star_style = 0 # number # # "int foo() {" vs "int foo()\n{" -nl_fdef_brace = force # IARF +nl_fdef_brace = force # IARF # Newline after '(' in a function decl -nl_func_decl_start = remove # IARF +nl_func_decl_start = remove # IARF # Newline after each ',' in a function decl -nl_func_decl_args = remove # IARF +nl_func_decl_args = remove # IARF # Newline before the ')' in a function decl -nl_func_decl_end = remove # IARF +nl_func_decl_end = remove # IARF # Newline between return type and func name in def -nl_func_type_name = remove # IARF +nl_func_type_name = remove # IARF # Newline after a block of variable defs -nl_func_var_def_blk = 0 # number +nl_func_var_def_blk = 0 # number # newline before 'case' statement -nl_before_case = false # bool +nl_before_case = false # bool # newline after return statement -nl_after_return = true # bool +nl_after_return = true # bool # Disallow nested "case 1: a=3;" -nl_after_case = true # bool +nl_after_case = true # bool # newline between function call and open brace -nl_fcall_brace = remove # IARF +nl_fcall_brace = remove # IARF # No blanks after #ifxx, #elxx, or before #endif -nl_squeeze_ifdef = false # bool +nl_squeeze_ifdef = false # bool # nl between enum and brace -nl_enum_brace = remove # IARF +nl_enum_brace = remove # IARF # nl between struct and brace -nl_struct_brace = remove # IARF +nl_struct_brace = remove # IARF # nl between union and brace -nl_union_brace = remove # IARF +nl_union_brace = remove # IARF # nl between = and { -nl_assign_brace = remove # IARF +nl_assign_brace = remove # IARF # nl between do and { -nl_do_brace = remove # IARF +nl_do_brace = remove # IARF # nl between if and { -nl_if_brace = remove # IARF +nl_if_brace = remove # IARF # nl between for and { -nl_for_brace = remove # IARF +nl_for_brace = remove # IARF # nl between else and { -nl_else_brace = remove # IARF +nl_else_brace = remove # IARF # nl between while and { -nl_while_brace = remove # IARF +nl_while_brace = remove # IARF # nl between switch and { -nl_switch_brace = remove # IARF +nl_switch_brace = remove # IARF # nl between } and else -nl_brace_else = remove # IARF +nl_brace_else = remove # IARF # nl between } and while of do stmt -nl_brace_while = remove # IARF +nl_brace_while = remove # IARF # Alter newlines in #define macros -nl_define_macro = false # bool +nl_define_macro = false # bool # Add or remove newlines at the start of the file -nl_start_of_file = remove # IARF +nl_start_of_file = remove # IARF # Number of newlines at the start of the file. Only used if nl_start_of_file is Add or Force #nl_start_of_file_min: number # Add or remove newlines at the end of the file -nl_end_of_file = force # IARF +nl_end_of_file = force # IARF # Number of newlines at the end of the file. Only used if nl_end_of_file is Add or Force -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # number # -1: boolean ops are at the end of the line # 0: do not move boolean ops (default) # 1: boolean ops are at the start of the line -pos_bool = Trail # position (Trail, None, Lead) +pos_bool = Trail # position (Trail, None, Lead) -sp_before_byref = remove -sp_before_ptr_star = remove +sp_before_byref = remove +sp_before_ptr_star = remove # # Blank line options @@ -331,25 +331,25 @@ sp_before_ptr_star = remove # # Minimum number of newlines before a multi-line comment. -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # number # Newlines after the closing brace of a function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # number # Newlines after a single function prototype. -nl_after_func_proto = 1 # number +nl_after_func_proto = 1 # number # Newlines after a prototype, if not followed by another prototype. -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # number # The maximum consecutive newlines. -nl_max = 4 # number +nl_max = 4 # number # Remove blank lines after { -eat_blanks_after_open_brace = true # bool +eat_blanks_after_open_brace = true # bool # Remove blank lines before } -eat_blanks_before_close_brace = true # bool +eat_blanks_before_close_brace = true # bool @@ -358,19 +358,19 @@ eat_blanks_before_close_brace = true # bool # # Add or remove unecessary paren on return. -mod_paren_on_return = remove # IARF +mod_paren_on_return = remove # IARF # add or remove braces on single-statement if -mod_full_brace_if = add # IARF +mod_full_brace_if = add # IARF # add or remove braces on single-statement for -mod_full_brace_for = add # IARF +mod_full_brace_for = add # IARF # add or remove braces on single-statement do -mod_full_brace_do = add # IARF +mod_full_brace_do = add # IARF # add or remove braces on single-statement while -mod_full_brace_while = add # IARF +mod_full_brace_while = add # IARF # don't remove braces around statements that span X newlines #mod_full_brace_nl: number diff --git a/tests/config/avalon3.cfg b/tests/config/avalon3.cfg index c5a84c133e..9c23d13c1d 100644 --- a/tests/config/avalon3.cfg +++ b/tests/config/avalon3.cfg @@ -4,504 +4,504 @@ # # The type of line endings -newlines = lf # auto/lf/crlf/cr +newlines = lf # auto/lf/crlf/cr # The original size of tabs in the input -input_tab_size = 2 # number +input_tab_size = 2 # number # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 2 # number +output_tab_size = 2 # number # The ascii value of the string escape char, usually 92 (\). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # number # # Indenting # # The number of columns to indent per level (usually 2, 3, 4, or 8) -indent_columns = 2 # number +indent_columns = 2 # number # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # number # Whether to indent strings broken by '\' so that they line up -indent_align_string = false # false/true +indent_align_string = false # false/true # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # number # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # false/true # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # false/true # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # false/true # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # false/true # Whether to indent the stuff after a leading class colon -indent_class_colon = true # false/true +indent_class_colon = true # false/true # Whether to indent continued function call parameters one indent level (true) or aligns instead of indent (false) -indent_func_call_param = true # false/true +indent_func_call_param = true # false/true # The number of spaces to indent a continued '->' or '.' # Usually set to indent_columns. -indent_member = 0 # number +indent_member = 0 # number # Spaces to indent 'case' from 'switch' -indent_switch_case = 2 # number +indent_switch_case = 2 # number # Spaces to indent '{' from 'case' -indent_case_brace = 0 # number +indent_case_brace = 0 # number # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # false/true # How to indent goto labels (>0=absolute column where 1 is the leftmost column, <=0=subtract from brace indent) -indent_label = -2 # number +indent_label = -2 # number # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # false/true # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # false/true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # ignore/add/remove/force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # ignore/add/remove/force # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # ignore/add/remove/force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # ignore/add/remove/force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # ignore/add/remove/force # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # ignore/add/remove/force # Add or remove space between ')' and '{' -sp_paren_brace = force # ignore/add/remove/force +sp_paren_brace = force # ignore/add/remove/force # Add or remove space before pointer star '*' -sp_before_ptr_star = remove # ignore/add/remove/force +sp_before_ptr_star = remove # ignore/add/remove/force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # ignore/add/remove/force # Add or remove space after pointer star '*' -sp_after_ptr_star = force # ignore/add/remove/force +sp_after_ptr_star = force # ignore/add/remove/force # Add or remove space before reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # ignore/add/remove/force # Add or remove space after reference sign '&' -sp_after_byref = force # ignore/add/remove/force +sp_after_byref = force # ignore/add/remove/force # Add or remove space before '<>' -sp_before_angle = remove # ignore/add/remove/force +sp_before_angle = remove # ignore/add/remove/force # Add or remove space after '<>' -sp_after_angle = remove # ignore/add/remove/force +sp_after_angle = remove # ignore/add/remove/force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # ignore/add/remove/force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # ignore/add/remove/force # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # ignore/add/remove/force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = force # ignore/add/remove/force +sp_sparen_brace = force # ignore/add/remove/force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = force # ignore/add/remove/force +sp_special_semi = force # ignore/add/remove/force # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # ignore/add/remove/force # Add or remove space before '[' (except '[]') -sp_before_square = remove # ignore/add/remove/force +sp_before_square = remove # ignore/add/remove/force # Add or remove space before '[]' -sp_before_squares = remove # ignore/add/remove/force +sp_before_squares = remove # ignore/add/remove/force # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # ignore/add/remove/force # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # ignore/add/remove/force # Add or remove space between 'operator' and operator sign -sp_after_operator = remove # ignore/add/remove/force +sp_after_operator = remove # ignore/add/remove/force # Add or remove space after cast -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # ignore/add/remove/force # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # ignore/add/remove/force # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # ignore/add/remove/force # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = remove # ignore/add/remove/force +sp_inside_braces_enum = remove # ignore/add/remove/force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = remove # ignore/add/remove/force +sp_inside_braces_struct = remove # ignore/add/remove/force # Add or remove space inside '{' and '}' -sp_inside_braces = remove # ignore/add/remove/force +sp_inside_braces = remove # ignore/add/remove/force # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force -sp_angle_word = force -sp_angle_paren = remove -sp_angle_paren_empty = remove +sp_inside_angle = remove # ignore/add/remove/force +sp_angle_word = force +sp_angle_paren = remove +sp_angle_paren_empty = remove # Add or remove space between return type and function name (a minimum of 1 is forced except for pointer return types) -sp_type_func = ignore # ignore/add/remove/force +sp_type_func = ignore # ignore/add/remove/force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # ignore/add/remove/force # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # ignore/add/remove/force # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # ignore/add/remove/force # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # ignore/add/remove/force # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # ignore/add/remove/force # Add or remove space between ')' and '{' of function -sp_fparen_brace = force # ignore/add/remove/force +sp_fparen_brace = force # ignore/add/remove/force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # ignore/add/remove/force # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # ignore/add/remove/force # Add or remove space between 'return' and '(' -sp_return_paren = force # ignore/add/remove/force +sp_return_paren = force # ignore/add/remove/force # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # ignore/add/remove/force # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # ignore/add/remove/force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = force # ignore/add/remove/force +sp_else_brace = force # ignore/add/remove/force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = force # ignore/add/remove/force +sp_brace_else = force # ignore/add/remove/force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # false/true # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # false/true # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # false/true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 0 # number +align_var_def_span = 0 # number # Whether the pointer star is part of the variable name or not -align_var_def_star_style = 2 # false/true +align_var_def_star_style = 2 # false/true # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # number # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # false/true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = false # false/true +align_var_def_inline = false # false/true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 0 # number +align_assign_span = 0 # number # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 # number # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 0 # number +align_enum_equ_span = 0 # number # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # number # The span for aligning struct/union (0=don't align) -align_var_struct_span = 0 # number +align_var_struct_span = 0 # number # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 0 # number +align_struct_init_span = 0 # number # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number +align_typedef_gap = 0 # number # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 0 # number +align_typedef_span = 0 # number # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type: typedef int * pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # number # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 0 # number +align_right_cmt_span = 0 # number # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # number # Whether to align macros wrapped with a backslash and a newline -align_nl_cont = true # false/true +align_nl_cont = true # false/true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 1 # number +align_pp_define_gap = 1 # number # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 0 # number +align_pp_define_span = 0 # number # # Newline adding and removing options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # number # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = true # false/true +nl_collapse_empty_body = true # false/true # Don't touch one-line function bodies inside a class xx { } body -nl_class_leave_one_liners = false # false/true +nl_class_leave_one_liners = false # false/true # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # ignore/add/remove/force # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # number # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # ignore/add/remove/force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 2 # number +nl_end_of_file_min = 2 # number # Add or remove newline between '=' and '{' -nl_assign_brace = remove # ignore/add/remove/force +nl_assign_brace = remove # ignore/add/remove/force # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 0 # number +nl_func_var_def_blk = 0 # number # Add or remove newline between function call and '(' -nl_fcall_brace = remove # ignore/add/remove/force +nl_fcall_brace = remove # ignore/add/remove/force # Add or remove newline between 'enum' and '{' -nl_enum_brace = remove # ignore/add/remove/force +nl_enum_brace = remove # ignore/add/remove/force # Add or remove newline between 'struct and '{' -nl_struct_brace = remove # ignore/add/remove/force +nl_struct_brace = remove # ignore/add/remove/force # Add or remove newline between 'union' and '{' -nl_union_brace = remove # ignore/add/remove/force +nl_union_brace = remove # ignore/add/remove/force # Add or remove newline between 'if' and '{' -nl_if_brace = remove # ignore/add/remove/force +nl_if_brace = remove # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = remove # ignore/add/remove/force +nl_brace_else = remove # ignore/add/remove/force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = remove # ignore/add/remove/force +nl_elseif_brace = remove # ignore/add/remove/force # Add or remove newline between 'else' and '{' -nl_else_brace = remove # ignore/add/remove/force +nl_else_brace = remove # ignore/add/remove/force # Add or remove newline between 'for' and '{' -nl_for_brace = remove # ignore/add/remove/force +nl_for_brace = remove # ignore/add/remove/force # Add or remove newline between 'while' and '{' -nl_while_brace = remove # ignore/add/remove/force +nl_while_brace = remove # ignore/add/remove/force # Add or remove newline between 'do' and '{' -nl_do_brace = remove # ignore/add/remove/force +nl_do_brace = remove # ignore/add/remove/force # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # ignore/add/remove/force # Add or remove newline between 'switch' and '{' -nl_switch_brace = remove # ignore/add/remove/force +nl_switch_brace = remove # ignore/add/remove/force # Whether to put a newline before 'case' statement -nl_before_case = false # false/true +nl_before_case = false # false/true # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # false/true # Newline between namespace and { -nl_namespace_brace = remove # ignore/add/remove/force +nl_namespace_brace = remove # ignore/add/remove/force # Add or remove newline between 'template<>' and 'class' -nl_template_class = force # ignore/add/remove/force +nl_template_class = force # ignore/add/remove/force # Add or remove newline between 'class' and '{' -nl_class_brace = force # ignore/add/remove/force +nl_class_brace = force # ignore/add/remove/force # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = force # ignore/add/remove/force +nl_class_init_args = force # ignore/add/remove/force # Add or remove newline between return type and function name in definition -nl_func_type_name = remove # ignore/add/remove/force +nl_func_type_name = remove # ignore/add/remove/force # Add or remove newline after '(' in a function declaration -nl_func_decl_start = remove # ignore/add/remove/force +nl_func_decl_start = remove # ignore/add/remove/force # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = remove # ignore/add/remove/force +nl_func_decl_args = remove # ignore/add/remove/force # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = remove # ignore/add/remove/force +nl_func_decl_end = remove # ignore/add/remove/force # Add or remove newline between function signature and '{' -nl_fdef_brace = force # ignore/add/remove/force +nl_fdef_brace = force # ignore/add/remove/force # Whether to put a newline after 'return' statement -nl_after_return = false # false/true +nl_after_return = false # false/true # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = false # false/true +nl_after_semicolon = false # false/true # Whether to put a newline after brace open -nl_after_brace_open = true # false/true +nl_after_brace_open = true # false/true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # false/true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true +nl_squeeze_ifdef = false # false/true # # Positioning options # # The position of boolean operators in wrapped expressions -pos_bool = ignore # ignore/lead/trail +pos_bool = ignore # ignore/lead/trail # The position of colons between constructor and member initialization -pos_class_colon = lead # ignore/lead/trail +pos_class_colon = lead # ignore/lead/trail # # Blank line options # # The maximum consecutive newlines -nl_max = 3 # number +nl_max = 3 # number # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 1 # number +nl_after_func_proto = 1 # number # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # number # The number of newlines after '}' of the function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # number # The minimum number of newlines before a multi-line comment (doesn't apply if after a brace open) -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # number # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # false/true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = false # false/true +eat_blanks_before_close_brace = false # false/true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = ignore # ignore/add/remove/force +mod_full_brace_do = ignore # ignore/add/remove/force # Add or remove braces on single-line 'for' statement -mod_full_brace_for = ignore # ignore/add/remove/force +mod_full_brace_for = ignore # ignore/add/remove/force # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # ignore/add/remove/force # Add or remove braces on single-line 'if' statement -mod_full_brace_if = ignore # ignore/add/remove/force +mod_full_brace_if = ignore # ignore/add/remove/force # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # number # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # ignore/add/remove/force # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = remove # ignore/add/remove/force +mod_paren_on_return = remove # ignore/add/remove/force # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = true # false/true +mod_pawn_semicolon = true # false/true # # Comment modifications # # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # false/true # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # false/true # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # false/true # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # false/true # # Preprocessor options # # Add or remove indent of preprocessor directives -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # ignore/add/remove/force # Add or remove space between # and, say, define -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # ignore/add/remove/force diff --git a/tests/config/avalon4.cfg b/tests/config/avalon4.cfg index a18cda75f3..0474f21e17 100644 --- a/tests/config/avalon4.cfg +++ b/tests/config/avalon4.cfg @@ -4,19 +4,19 @@ # # The type of line endings -newlines = lf # auto/lf/crlf/cr +newlines = lf # auto/lf/crlf/cr # The original size of tabs in the input -input_tab_size = 2 # number +input_tab_size = 2 # number # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 2 # number +output_tab_size = 2 # number # The ascii value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # number # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # number # # Indenting @@ -24,642 +24,642 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 2 # number +indent_columns = 2 # number # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # number # Whether to indent strings broken by '\' so that they line up -indent_align_string = false # false/true +indent_align_string = false # false/true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # number # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # number # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # false/true # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # false/true # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # false/true # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # false/true # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # false/true # Whether to indent the stuff after a leading class colon -indent_class_colon = true # false/true +indent_class_colon = true # false/true # Whether to indent continued function call parameters one indent level (true) or aligns instead of indent (false) -indent_func_call_param = true # false/true +indent_func_call_param = true # false/true # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 0 # number +indent_member = 0 # number # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # number # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 2 # number +indent_switch_case = 2 # number # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # number # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 0 # number +indent_case_brace = 0 # number # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # false/true # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # number # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # number # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # false/true # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # false/true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # ignore/add/remove/force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # ignore/add/remove/force # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # ignore/add/remove/force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # ignore/add/remove/force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # ignore/add/remove/force # Add or remove space between nested parens -sp_paren_paren = ignore # ignore/add/remove/force +sp_paren_paren = ignore # ignore/add/remove/force # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # false/true # Add or remove space between ')' and '{' -sp_paren_brace = force # ignore/add/remove/force +sp_paren_brace = force # ignore/add/remove/force # Add or remove space before pointer star '*' -sp_before_ptr_star = remove # ignore/add/remove/force +sp_before_ptr_star = remove # ignore/add/remove/force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # ignore/add/remove/force # Add or remove space after pointer star '*' -sp_after_ptr_star = force # ignore/add/remove/force +sp_after_ptr_star = force # ignore/add/remove/force # Add or remove space before reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # ignore/add/remove/force # Add or remove space after reference sign '&' -sp_after_byref = force # ignore/add/remove/force +sp_after_byref = force # ignore/add/remove/force # Add or remove space before '<>' -sp_before_angle = remove # ignore/add/remove/force +sp_before_angle = remove # ignore/add/remove/force # Add or remove space after '<>' -sp_after_angle = ignore # ignore/add/remove/force +sp_after_angle = ignore # ignore/add/remove/force # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = remove # ignore/add/remove/force -sp_angle_paren_empty = remove +sp_angle_paren = remove # ignore/add/remove/force +sp_angle_paren_empty = remove # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = force # ignore/add/remove/force +sp_angle_word = force # ignore/add/remove/force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # ignore/add/remove/force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # ignore/add/remove/force # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # ignore/add/remove/force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = force # ignore/add/remove/force +sp_sparen_brace = force # ignore/add/remove/force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = force # ignore/add/remove/force +sp_special_semi = force # ignore/add/remove/force # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # ignore/add/remove/force # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = remove # ignore/add/remove/force +sp_before_semi_for = remove # ignore/add/remove/force # Add or remove space before a semicolon of an empty part of a for statement. -sp_before_semi_for_empty = ignore # ignore/add/remove/force +sp_before_semi_for_empty = ignore # ignore/add/remove/force # Add or remove space before '[' (except '[]') -sp_before_square = remove # ignore/add/remove/force +sp_before_square = remove # ignore/add/remove/force # Add or remove space before '[]' -sp_before_squares = remove # ignore/add/remove/force +sp_before_squares = remove # ignore/add/remove/force # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # ignore/add/remove/force # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # ignore/add/remove/force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # ignore/add/remove/force # Add or remove space between 'operator' and operator sign -sp_after_operator = remove # ignore/add/remove/force +sp_after_operator = remove # ignore/add/remove/force # Add or remove space after cast -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # ignore/add/remove/force # Add or remove spaces inside cast parens -sp_inside_paren_cast = remove # ignore/add/remove/force +sp_inside_paren_cast = remove # ignore/add/remove/force # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # ignore/add/remove/force # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # ignore/add/remove/force # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = remove # ignore/add/remove/force +sp_inside_braces_enum = remove # ignore/add/remove/force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = remove # ignore/add/remove/force +sp_inside_braces_struct = remove # ignore/add/remove/force # Add or remove space inside '{' and '}' -sp_inside_braces = remove # ignore/add/remove/force +sp_inside_braces = remove # ignore/add/remove/force # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # ignore/add/remove/force # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = force # ignore/add/remove/force +sp_type_func = force # ignore/add/remove/force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # ignore/add/remove/force # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # ignore/add/remove/force # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # ignore/add/remove/force # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # ignore/add/remove/force # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # ignore/add/remove/force # Add or remove space between ')' and '{' of function -sp_fparen_brace = force # ignore/add/remove/force +sp_fparen_brace = force # ignore/add/remove/force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # ignore/add/remove/force # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # ignore/add/remove/force # Add or remove space between 'return' and '(' -sp_return_paren = force # ignore/add/remove/force +sp_return_paren = force # ignore/add/remove/force # Add or remove space between macro and value -sp_macro = force # ignore/add/remove/force +sp_macro = force # ignore/add/remove/force # Add or remove space between macro function ')' and value -sp_macro_func = force # ignore/add/remove/force +sp_macro_func = force # ignore/add/remove/force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = force # ignore/add/remove/force +sp_else_brace = force # ignore/add/remove/force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = force # ignore/add/remove/force +sp_brace_else = force # ignore/add/remove/force # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = force # ignore/add/remove/force +sp_catch_brace = force # ignore/add/remove/force # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = force # ignore/add/remove/force +sp_brace_catch = force # ignore/add/remove/force # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = force # ignore/add/remove/force +sp_finally_brace = force # ignore/add/remove/force # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = force # ignore/add/remove/force +sp_brace_finally = force # ignore/add/remove/force # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = force # ignore/add/remove/force +sp_try_brace = force # ignore/add/remove/force # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = force # ignore/add/remove/force +sp_getset_brace = force # ignore/add/remove/force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # false/true # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # false/true # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # false/true # Align variable definitions in prototypes and functions -align_func_params = false # false/true +align_func_params = false # false/true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 0 # number +align_var_def_span = 0 # number # How to align the star in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_star_style = 0 # number +align_var_def_star_style = 0 # number # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # number # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # false/true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = false # false/true +align_var_def_inline = false # false/true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 0 # number +align_assign_span = 0 # number # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 # number # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 0 # number +align_enum_equ_span = 0 # number # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # number # The span for aligning struct/union (0=don't align) -align_var_struct_span = 0 # number +align_var_struct_span = 0 # number # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 0 # number +align_struct_init_span = 0 # number # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number +align_typedef_gap = 0 # number # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 0 # number +align_typedef_span = 0 # number # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # number # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 0 # number +align_right_cmt_span = 0 # number # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # number # Whether to align macros wrapped with a backslash and a newline -align_nl_cont = true # false/true +align_nl_cont = true # false/true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 1 # number +align_pp_define_gap = 1 # number # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 0 # number +align_pp_define_span = 0 # number # # Newline adding and removing options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # number # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = true # false/true +nl_collapse_empty_body = true # false/true # Don't touch one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = false # false/true +nl_assign_leave_one_liners = false # false/true # Don't touch one-line function bodies inside a class xx { } body -nl_class_leave_one_liners = false # false/true +nl_class_leave_one_liners = false # false/true # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # ignore/add/remove/force # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # number # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # ignore/add/remove/force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # number # Add or remove newline between '=' and '{' -nl_assign_brace = remove # ignore/add/remove/force +nl_assign_brace = remove # ignore/add/remove/force # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 0 # number +nl_func_var_def_blk = 0 # number # Add or remove newline between function call and '(' -nl_fcall_brace = remove # ignore/add/remove/force +nl_fcall_brace = remove # ignore/add/remove/force # Add or remove newline between 'enum' and '{' -nl_enum_brace = remove # ignore/add/remove/force +nl_enum_brace = remove # ignore/add/remove/force # Add or remove newline between 'struct and '{' -nl_struct_brace = remove # ignore/add/remove/force +nl_struct_brace = remove # ignore/add/remove/force # Add or remove newline between 'union' and '{' -nl_union_brace = remove # ignore/add/remove/force +nl_union_brace = remove # ignore/add/remove/force # Add or remove newline between 'if' and '{' -nl_if_brace = remove # ignore/add/remove/force +nl_if_brace = remove # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = remove # ignore/add/remove/force +nl_brace_else = remove # ignore/add/remove/force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = remove # ignore/add/remove/force +nl_elseif_brace = remove # ignore/add/remove/force # Add or remove newline between 'else' and '{' -nl_else_brace = remove # ignore/add/remove/force +nl_else_brace = remove # ignore/add/remove/force # Add or remove newline between '}' and 'finally' -nl_brace_finally = remove # ignore/add/remove/force +nl_brace_finally = remove # ignore/add/remove/force # Add or remove newline between 'finally' and '{' -nl_finally_brace = remove # ignore/add/remove/force +nl_finally_brace = remove # ignore/add/remove/force # Add or remove newline between 'try' and '{' -nl_try_brace = remove # ignore/add/remove/force +nl_try_brace = remove # ignore/add/remove/force # Add or remove newline between get/set and '{' -nl_getset_brace = remove # ignore/add/remove/force +nl_getset_brace = remove # ignore/add/remove/force # Add or remove newline between 'for' and '{' -nl_for_brace = remove # ignore/add/remove/force +nl_for_brace = remove # ignore/add/remove/force # Add or remove newline between 'catch' and '{' -nl_catch_brace = remove # ignore/add/remove/force +nl_catch_brace = remove # ignore/add/remove/force # Add or remove newline between '}' and 'catch' -nl_brace_catch = remove # ignore/add/remove/force +nl_brace_catch = remove # ignore/add/remove/force # Add or remove newline between 'while' and '{' -nl_while_brace = remove # ignore/add/remove/force +nl_while_brace = remove # ignore/add/remove/force # Add or remove newline between 'do' and '{' -nl_do_brace = remove # ignore/add/remove/force +nl_do_brace = remove # ignore/add/remove/force # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # ignore/add/remove/force # Add or remove newline between 'switch' and '{' -nl_switch_brace = remove # ignore/add/remove/force +nl_switch_brace = remove # ignore/add/remove/force # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # false/true # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # false/true # Newline between namespace and { -nl_namespace_brace = remove # ignore/add/remove/force +nl_namespace_brace = remove # ignore/add/remove/force # Add or remove newline between 'template<>' and 'class' -nl_template_class = force # ignore/add/remove/force +nl_template_class = force # ignore/add/remove/force # Add or remove newline between 'class' and '{' -nl_class_brace = force # ignore/add/remove/force +nl_class_brace = force # ignore/add/remove/force # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = force # ignore/add/remove/force +nl_class_init_args = force # ignore/add/remove/force # Add or remove newline between return type and function name in definition -nl_func_type_name = remove # ignore/add/remove/force +nl_func_type_name = remove # ignore/add/remove/force # Add or remove newline after '(' in a function declaration -nl_func_decl_start = remove # ignore/add/remove/force +nl_func_decl_start = remove # ignore/add/remove/force # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = remove # ignore/add/remove/force +nl_func_decl_args = remove # ignore/add/remove/force # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = remove # ignore/add/remove/force +nl_func_decl_end = remove # ignore/add/remove/force # Add or remove newline between function signature and '{' -nl_fdef_brace = force # ignore/add/remove/force +nl_fdef_brace = force # ignore/add/remove/force # Whether to put a newline after 'return' statement -nl_after_return = false # false/true +nl_after_return = false # false/true # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # false/true # Whether to put a newline after brace open -nl_after_brace_open = true # false/true +nl_after_brace_open = true # false/true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # false/true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = true # false/true +nl_squeeze_ifdef = true # false/true # Add or remove newline before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # ignore/add/remove/force # Add or remove newline after 'if' -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # ignore/add/remove/force # Add or remove newline before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # ignore/add/remove/force # Add or remove newline after 'for' -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # ignore/add/remove/force # Add or remove newline before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # ignore/add/remove/force # Add or remove newline after 'while' -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # ignore/add/remove/force # Add or remove newline before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # ignore/add/remove/force # Add or remove newline after 'switch' -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # ignore/add/remove/force # Add or remove newline before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # ignore/add/remove/force # Add or remove newline after 'do' -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # ignore/add/remove/force # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = true # false/true +nl_ds_struct_enum_cmt = true # false/true # # Positioning options # # The position of boolean operators in wrapped expressions -pos_bool = ignore # ignore/lead/trail +pos_bool = ignore # ignore/lead/trail # The position of the comma in wrapped expressions -pos_comma = trail # ignore/lead/trail -pos_class_comma = trail # ignore/lead/trail +pos_comma = trail # ignore/lead/trail +pos_class_comma = trail # ignore/lead/trail # The position of colons between constructor and member initialization -pos_class_colon = lead # ignore/lead/trail +pos_class_colon = lead # ignore/lead/trail # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true +ls_for_split_full = false # false/true # Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true +ls_func_split_full = false # false/true # # Blank line options # # The maximum consecutive newlines -nl_max = 3 # number +nl_max = 3 # number # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 1 # number +nl_after_func_proto = 1 # number # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # number # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # number # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 1 # number +nl_after_func_body_one_liner = 1 # number # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # number # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # number # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # number # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = false # false/true +eat_blanks_after_open_brace = false # false/true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = false # false/true +eat_blanks_before_close_brace = false # false/true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # ignore/add/remove/force # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # ignore/add/remove/force # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # ignore/add/remove/force # Add or remove braces on single-line 'if' statement -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # ignore/add/remove/force # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # number # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # ignore/add/remove/force # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = remove # ignore/add/remove/force +mod_paren_on_return = remove # ignore/add/remove/force # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = true # false/true +mod_pawn_semicolon = true # false/true # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = false # false/true +mod_full_paren_if_bool = false # false/true # # Comment modifications # # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # false/true # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # false/true # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # false/true # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # false/true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # number # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # number # # Preprocessor options # # Add or remove indent of preprocessor directives -pp_indent = remove # ignore/add/remove/force +pp_indent = remove # ignore/add/remove/force # Add or remove space between # and, say, define -pp_space = remove # ignore/add/remove/force +pp_space = remove # ignore/add/remove/force # You can force a token to be a type with the 'type' option. # Example: @@ -672,6 +672,6 @@ pp_space = remove # ignore/add/remove/force # macro-open BEGIN_MESSAGE_MAP # macro-close END_MESSAGE_MAP -sp_after_dc = remove -sp_before_dc = remove +sp_after_dc = remove +sp_before_dc = remove diff --git a/tests/config/ben.cfg b/tests/config/ben.cfg index a797d7dacb..d5522f6d39 100644 --- a/tests/config/ben.cfg +++ b/tests/config/ben.cfg @@ -1,222 +1,222 @@ -newlines = auto -input_tab_size = 8 -output_tab_size = 3 -string_escape_char = 92 -indent_columns = 3 -indent_with_tabs = 0 -indent_align_string = false -indent_xml_string = 0 -indent_brace = 0 -indent_braces = false -indent_braces_no_func = false -indent_brace_parent = false -indent_namespace = false -indent_class = true -indent_class_colon = false -indent_func_call_param = false -indent_member = 3 -indent_sing_line_comments = 0 -indent_switch_case = 0 -indent_case_brace = 0 -indent_col1_comment = false -indent_label = 2 -indent_access_spec = 2 -indent_paren_nl = false -indent_square_nl = false -sp_arith = force -sp_assign = force -sp_assign_default = remove -sp_bool = force -sp_compare = force -sp_inside_paren = remove -sp_paren_paren = remove -sp_balance_nested_parens = false -sp_paren_brace = ignore -sp_before_ptr_star = force -sp_between_ptr_star = remove -sp_after_ptr_star = remove -sp_before_byref = remove -sp_after_byref = ignore -sp_before_angle = remove -sp_after_angle = force -sp_angle_paren = remove -sp_angle_paren_empty = remove -sp_angle_word = force -sp_before_sparen = force -sp_inside_sparen = remove -sp_after_sparen = force -sp_sparen_brace = ignore -sp_special_semi = ignore -sp_before_semi = remove -sp_before_semi_for = ignore -sp_after_semi_for = ignore -sp_after_semi_for_empty = force -sp_before_square = ignore -sp_before_squares = ignore -sp_inside_square = remove -sp_after_comma = force -sp_before_comma = remove -sp_after_operator = ignore -sp_after_cast = remove -sp_sizeof_paren = remove -sp_after_tag = ignore -sp_inside_braces_enum = force -sp_inside_braces_struct = force -sp_inside_braces = force -sp_inside_angle = remove -sp_type_func = ignore -sp_func_proto_paren = remove -sp_func_def_paren = remove -sp_inside_fparens = ignore -sp_inside_fparen = remove -sp_square_fparen = ignore -sp_fparen_brace = ignore -sp_func_call_paren = remove -sp_func_class_paren = ignore -sp_return_paren = remove -sp_macro = ignore -sp_before_semi_for_empty = force +newlines = auto +input_tab_size = 8 +output_tab_size = 3 +string_escape_char = 92 +indent_columns = 3 +indent_with_tabs = 0 +indent_align_string = false +indent_xml_string = 0 +indent_brace = 0 +indent_braces = false +indent_braces_no_func = false +indent_brace_parent = false +indent_namespace = false +indent_class = true +indent_class_colon = false +indent_func_call_param = false +indent_member = 3 +indent_sing_line_comments = 0 +indent_switch_case = 0 +indent_case_brace = 0 +indent_col1_comment = false +indent_label = 2 +indent_access_spec = 2 +indent_paren_nl = false +indent_square_nl = false +sp_arith = force +sp_assign = force +sp_assign_default = remove +sp_bool = force +sp_compare = force +sp_inside_paren = remove +sp_paren_paren = remove +sp_balance_nested_parens = false +sp_paren_brace = ignore +sp_before_ptr_star = force +sp_between_ptr_star = remove +sp_after_ptr_star = remove +sp_before_byref = remove +sp_after_byref = ignore +sp_before_angle = remove +sp_after_angle = force +sp_angle_paren = remove +sp_angle_paren_empty = remove +sp_angle_word = force +sp_before_sparen = force +sp_inside_sparen = remove +sp_after_sparen = force +sp_sparen_brace = ignore +sp_special_semi = ignore +sp_before_semi = remove +sp_before_semi_for = ignore +sp_after_semi_for = ignore +sp_after_semi_for_empty = force +sp_before_square = ignore +sp_before_squares = ignore +sp_inside_square = remove +sp_after_comma = force +sp_before_comma = remove +sp_after_operator = ignore +sp_after_cast = remove +sp_sizeof_paren = remove +sp_after_tag = ignore +sp_inside_braces_enum = force +sp_inside_braces_struct = force +sp_inside_braces = force +sp_inside_angle = remove +sp_type_func = ignore +sp_func_proto_paren = remove +sp_func_def_paren = remove +sp_inside_fparens = ignore +sp_inside_fparen = remove +sp_square_fparen = ignore +sp_fparen_brace = ignore +sp_func_call_paren = remove +sp_func_class_paren = ignore +sp_return_paren = remove +sp_macro = ignore +sp_before_semi_for_empty = force -sp_macro_func = ignore -sp_else_brace = ignore -sp_brace_else = ignore -sp_catch_brace = ignore -sp_brace_catch = ignore -sp_finally_brace = ignore -sp_brace_finally = ignore -sp_try_brace = ignore -sp_getset_brace = ignore -align_keep_tabs = false -align_with_tabs = false -align_on_tabstop = false -align_number_right = true -align_asm_colon = true -align_func_params = true -align_var_def_span = 2 -align_var_class_span = 2 -align_var_def_star_style = 1 -align_var_def_thresh = 0 -align_var_def_colon = true -align_var_def_inline = true -align_assign_span = 1 -align_assign_thresh = 0 -align_enum_equ_span = 4 -align_enum_equ_thresh = 0 -align_var_struct_span = 3 -align_struct_init_span = 3 -align_typedef_gap = 3 -align_typedef_span = 5 -align_typedef_star_style = 0 -align_right_cmt_span = 3 -align_func_proto_span = 0 -align_nl_cont = true -align_pp_define_gap = 4 -align_pp_define_span = 3 -code_width = 0 -nl_collapse_empty_body = false -nl_class_leave_one_liners = true -nl_assign_leave_one_liners = true -nl_start_of_file = ignore -nl_start_of_file_min = 0 -nl_end_of_file = ignore -nl_end_of_file_min = 0 -nl_assign_brace = add -nl_func_var_def_blk = 1 -nl_fcall_brace = add -nl_enum_brace = add -nl_struct_brace = add -nl_union_brace = add -nl_if_brace = add -nl_brace_else = add -nl_elseif_brace = ignore -nl_else_brace = add -nl_brace_finally = ignore -nl_finally_brace = add -nl_try_brace = add -nl_getset_brace = ignore -nl_for_brace = add -nl_catch_brace = add -nl_brace_catch = ignore -nl_while_brace = add -nl_do_brace = add -nl_brace_while = remove -nl_switch_brace = add -nl_before_case = true -nl_after_case = false -nl_namespace_brace = ignore -nl_template_class = ignore -nl_class_brace = ignore -nl_class_init_args = ignore -nl_func_type_name = ignore -nl_func_decl_start = ignore -nl_func_decl_args = ignore -nl_func_decl_end = ignore -nl_fdef_brace = add -nl_after_return = true -nl_after_semicolon = true -nl_after_brace_open = true -nl_after_vbrace_open = true -nl_after_access_spec = 1 -nl_assign_leave_one_liners = true -nl_class_leave_one_liners = true -nl_enum_leave_one_liners = true -nl_getset_leave_one_liners = true -nl_define_macro = false -nl_squeeze_ifdef = true -nl_before_if = ignore -nl_after_if = ignore -nl_before_for = ignore -nl_after_for = ignore -nl_before_while = ignore -nl_after_while = ignore -nl_before_switch = ignore -nl_after_switch = ignore -nl_before_do = ignore -nl_after_do = ignore -nl_ds_struct_enum_cmt = false -pos_bool = ignore -pos_class_colon = ignore -ls_for_split_full = false -ls_func_split_full = false -nl_max = 0 -nl_after_func_proto = 0 -nl_after_func_proto_group = 0 -nl_after_func_body = 0 -nl_after_func_body_one_liner = 0 -nl_before_block_comment = 0 -nl_before_c_comment = 0 -nl_before_cpp_comment = 0 -eat_blanks_after_open_brace = true -eat_blanks_before_close_brace = true -mod_full_brace_do = add -mod_full_brace_for = add -mod_full_brace_function = ignore -mod_full_brace_if = add -mod_full_brace_nl = 0 -mod_full_brace_while = add -mod_paren_on_return = add -mod_pawn_semicolon = false -mod_full_paren_if_bool = false -cmt_cpp_group = false -cmt_cpp_nl_start = false -cmt_cpp_nl_end = false -cmt_cpp_to_c = false -cmt_star_cont = true -cmt_sp_before_star_cont = 0 -cmt_sp_after_star_cont = 0 -pp_indent = remove -pp_space = remove -sp_after_dc = remove -sp_before_dc = remove -sp_attribute_paren = remove -sp_defined_paren = force +sp_macro_func = ignore +sp_else_brace = ignore +sp_brace_else = ignore +sp_catch_brace = ignore +sp_brace_catch = ignore +sp_finally_brace = ignore +sp_brace_finally = ignore +sp_try_brace = ignore +sp_getset_brace = ignore +align_keep_tabs = false +align_with_tabs = false +align_on_tabstop = false +align_number_right = true +align_asm_colon = true +align_func_params = true +align_var_def_span = 2 +align_var_class_span = 2 +align_var_def_star_style = 1 +align_var_def_thresh = 0 +align_var_def_colon = true +align_var_def_inline = true +align_assign_span = 1 +align_assign_thresh = 0 +align_enum_equ_span = 4 +align_enum_equ_thresh = 0 +align_var_struct_span = 3 +align_struct_init_span = 3 +align_typedef_gap = 3 +align_typedef_span = 5 +align_typedef_star_style = 0 +align_right_cmt_span = 3 +align_func_proto_span = 0 +align_nl_cont = true +align_pp_define_gap = 4 +align_pp_define_span = 3 +code_width = 0 +nl_collapse_empty_body = false +nl_class_leave_one_liners = true +nl_assign_leave_one_liners = true +nl_start_of_file = ignore +nl_start_of_file_min = 0 +nl_end_of_file = ignore +nl_end_of_file_min = 0 +nl_assign_brace = add +nl_func_var_def_blk = 1 +nl_fcall_brace = add +nl_enum_brace = add +nl_struct_brace = add +nl_union_brace = add +nl_if_brace = add +nl_brace_else = add +nl_elseif_brace = ignore +nl_else_brace = add +nl_brace_finally = ignore +nl_finally_brace = add +nl_try_brace = add +nl_getset_brace = ignore +nl_for_brace = add +nl_catch_brace = add +nl_brace_catch = ignore +nl_while_brace = add +nl_do_brace = add +nl_brace_while = remove +nl_switch_brace = add +nl_before_case = true +nl_after_case = false +nl_namespace_brace = ignore +nl_template_class = ignore +nl_class_brace = ignore +nl_class_init_args = ignore +nl_func_type_name = ignore +nl_func_decl_start = ignore +nl_func_decl_args = ignore +nl_func_decl_end = ignore +nl_fdef_brace = add +nl_after_return = true +nl_after_semicolon = true +nl_after_brace_open = true +nl_after_vbrace_open = true +nl_after_access_spec = 1 +nl_assign_leave_one_liners = true +nl_class_leave_one_liners = true +nl_enum_leave_one_liners = true +nl_getset_leave_one_liners = true +nl_define_macro = false +nl_squeeze_ifdef = true +nl_before_if = ignore +nl_after_if = ignore +nl_before_for = ignore +nl_after_for = ignore +nl_before_while = ignore +nl_after_while = ignore +nl_before_switch = ignore +nl_after_switch = ignore +nl_before_do = ignore +nl_after_do = ignore +nl_ds_struct_enum_cmt = false +pos_bool = ignore +pos_class_colon = ignore +ls_for_split_full = false +ls_func_split_full = false +nl_max = 0 +nl_after_func_proto = 0 +nl_after_func_proto_group = 0 +nl_after_func_body = 0 +nl_after_func_body_one_liner = 0 +nl_before_block_comment = 0 +nl_before_c_comment = 0 +nl_before_cpp_comment = 0 +eat_blanks_after_open_brace = true +eat_blanks_before_close_brace = true +mod_full_brace_do = add +mod_full_brace_for = add +mod_full_brace_function = ignore +mod_full_brace_if = add +mod_full_brace_nl = 0 +mod_full_brace_while = add +mod_paren_on_return = add +mod_pawn_semicolon = false +mod_full_paren_if_bool = false +cmt_cpp_group = false +cmt_cpp_nl_start = false +cmt_cpp_nl_end = false +cmt_cpp_to_c = false +cmt_star_cont = true +cmt_sp_before_star_cont = 0 +cmt_sp_after_star_cont = 0 +pp_indent = remove +pp_space = remove +sp_after_dc = remove +sp_before_dc = remove +sp_attribute_paren = remove +sp_defined_paren = force mod_add_long_function_closebrace_comment = 40 -mod_add_long_switch_closebrace_comment = 40 -mod_remove_extra_semicolon = TRUE +mod_add_long_switch_closebrace_comment = 40 +mod_remove_extra_semicolon = TRUE -sp_brace_typedef = force -nl_after_brace_close = TRUE -sp_before_ellipsis = remove -tok_split_gte = true -sp_after_tparen_close = remove +sp_brace_typedef = force +nl_after_brace_close = TRUE +sp_before_ellipsis = remove +tok_split_gte = true +sp_after_tparen_close = remove diff --git a/tests/config/ben2.cfg b/tests/config/ben2.cfg index 1788500778..a814298deb 100644 --- a/tests/config/ben2.cfg +++ b/tests/config/ben2.cfg @@ -1,409 +1,409 @@ # Uncrustify 0.58 -newlines = auto -input_tab_size = 8 -output_tab_size = 8 -string_escape_char = 92 -string_escape_char2 = 0 -tok_split_gte = true -utf8_byte = true -indent_columns = 3 -indent_continue = 0 -indent_with_tabs = 0 -indent_cmt_with_tabs = false -indent_align_string = false -indent_xml_string = 0 -indent_brace = 0 -indent_braces = false -indent_braces_no_func = false -indent_braces_no_class = false -indent_braces_no_struct = false -indent_brace_parent = false -indent_namespace = false -indent_namespace_level = 0 -indent_namespace_limit = 0 -indent_extern = false -indent_class = true -indent_class_colon = false -indent_else_if = false -indent_var_def_blk = 0 -indent_var_def_cont = false -indent_func_call_param = false -indent_func_def_param = false -indent_func_proto_param = false -indent_func_class_param = false -indent_func_ctor_var_param = false -indent_template_param = false -indent_func_param_double = false -indent_func_const = 0 -indent_func_throw = 0 -indent_member = 3 -indent_sing_line_comments = 0 -indent_relative_single_line_comments = false -indent_switch_case = 0 -indent_case_shift = 0 -indent_case_brace = 0 -indent_col1_comment = false -indent_label = 2 -indent_access_spec = 2 -indent_access_spec_body = false -indent_paren_nl = false -indent_paren_close = 0 -indent_comma_paren = false -indent_bool_paren = false -indent_first_bool_expr = false -indent_square_nl = false -indent_preserve_sql = false -indent_align_assign = true -sp_arith = force -sp_assign = force -sp_assign_default = remove -sp_before_assign = ignore -sp_after_assign = ignore -sp_enum_assign = ignore -sp_enum_before_assign = ignore -sp_enum_after_assign = ignore -sp_pp_concat = add -sp_pp_stringify = add -sp_bool = force -sp_compare = force -sp_inside_paren = remove -sp_paren_paren = remove -sp_balance_nested_parens = false -sp_paren_brace = ignore -sp_before_ptr_star = force -sp_before_unnamed_ptr_star = ignore -sp_between_ptr_star = remove -sp_after_ptr_star = remove -sp_after_ptr_star_func = ignore -sp_before_ptr_star_func = ignore -sp_before_byref = remove -sp_before_unnamed_byref = ignore -sp_after_byref = ignore -sp_after_byref_func = ignore -sp_before_byref_func = ignore -sp_after_type = force -sp_template_angle = ignore -sp_before_angle = remove -sp_inside_angle = remove -sp_after_angle = force -sp_angle_paren = remove -sp_angle_paren_empty = remove -sp_angle_word = force -sp_angle_shift = add -sp_before_sparen = force -sp_inside_sparen = remove -sp_inside_sparen_close = ignore -sp_after_sparen = force -sp_sparen_brace = ignore -sp_invariant_paren = ignore -sp_after_invariant_paren = ignore -sp_special_semi = ignore -sp_before_semi = remove -sp_before_semi_for = ignore -sp_before_semi_for_empty = force -sp_after_semi = add -sp_after_semi_for = force -sp_after_semi_for_empty = ignore -sp_before_square = ignore -sp_before_squares = ignore -sp_inside_square = remove -sp_after_comma = force -sp_before_comma = remove -sp_paren_comma = force -sp_before_ellipsis = remove -sp_after_class_colon = ignore -sp_before_class_colon = ignore -sp_before_case_colon = remove -sp_after_operator = ignore -sp_after_operator_sym = ignore -sp_after_cast = remove -sp_inside_paren_cast = ignore -sp_cpp_cast_paren = ignore -sp_sizeof_paren = remove -sp_after_tag = ignore -sp_inside_braces_enum = force -sp_inside_braces_struct = force -sp_inside_braces = force -sp_inside_braces_empty = ignore -sp_type_func = ignore -sp_func_proto_paren = remove -sp_func_def_paren = remove -sp_inside_fparens = ignore -sp_inside_fparen = remove -sp_square_fparen = ignore -sp_fparen_brace = ignore -sp_func_call_paren = remove -sp_func_call_paren_empty = ignore -sp_func_call_user_paren = ignore -sp_func_class_paren = ignore -sp_return_paren = remove -sp_attribute_paren = remove -sp_defined_paren = force -sp_throw_paren = ignore -sp_catch_paren = ignore -sp_version_paren = ignore -sp_scope_paren = ignore -sp_macro = ignore -sp_macro_func = ignore -sp_else_brace = ignore -sp_brace_else = ignore -sp_brace_typedef = force -sp_catch_brace = ignore -sp_brace_catch = ignore -sp_finally_brace = ignore -sp_brace_finally = ignore -sp_try_brace = ignore -sp_getset_brace = ignore -sp_before_dc = remove -sp_after_dc = remove -sp_d_array_colon = ignore -sp_not = remove -sp_inv = remove -sp_addr = remove -sp_member = remove -sp_deref = remove -sp_sign = remove -sp_incdec = remove -sp_before_nl_cont = add -sp_after_oc_scope = ignore -sp_after_oc_colon = ignore -sp_before_oc_colon = ignore -sp_after_send_oc_colon = ignore -sp_before_send_oc_colon = ignore -sp_after_oc_type = ignore -sp_after_oc_return_type = ignore -sp_after_oc_at_sel = ignore -sp_after_oc_at_sel_parens = ignore -sp_inside_oc_at_sel_parens = ignore -sp_before_oc_block_caret = ignore -sp_after_oc_block_caret = ignore -sp_cond_colon = ignore -sp_cond_question = ignore -sp_case_label = ignore -sp_range = ignore -sp_cmt_cpp_start = ignore -sp_endif_cmt = ignore -sp_after_new = ignore -align_keep_tabs = false -align_with_tabs = false -align_on_tabstop = false -align_number_right = true -align_func_params = true -align_same_func_call_params = false -align_var_def_span = 2 -align_var_def_star_style = 1 -align_var_def_amp_style = 0 -align_var_def_thresh = 0 -align_var_def_gap = 0 -align_var_def_colon = true -align_var_def_attribute = false -align_var_def_inline = true -align_assign_span = 1 -align_assign_thresh = 0 -align_enum_equ_span = 4 -align_enum_equ_thresh = 0 -align_var_struct_span = 3 -align_var_struct_thresh = 0 -align_var_struct_gap = 0 -align_struct_init_span = 3 -align_typedef_gap = 3 -align_typedef_span = 5 -align_typedef_func = 0 -align_typedef_star_style = 0 -align_typedef_amp_style = 0 -align_right_cmt_span = 3 -align_right_cmt_mix = false -align_right_cmt_gap = 0 -align_right_cmt_at_col = 0 -align_func_proto_span = 0 -align_func_proto_gap = 0 -align_on_operator = false -align_mix_var_proto = false -align_single_line_func = false -align_single_line_brace = false -align_single_line_brace_gap = 0 -align_oc_msg_spec_span = 0 -align_nl_cont = true -align_pp_define_gap = 4 -align_pp_define_span = 3 -align_left_shift = true -align_oc_msg_colon_span = 0 -align_oc_decl_colon = false -nl_collapse_empty_body = false -nl_assign_leave_one_liners = true -nl_class_leave_one_liners = true -nl_enum_leave_one_liners = true -nl_getset_leave_one_liners = true -nl_func_leave_one_liners = false -nl_if_leave_one_liners = false -nl_start_of_file = ignore -nl_start_of_file_min = 0 -nl_end_of_file = ignore -nl_end_of_file_min = 0 -nl_assign_brace = add -nl_assign_square = ignore -nl_after_square_assign = ignore -nl_func_var_def_blk = 1 -nl_fcall_brace = add -nl_enum_brace = add -nl_struct_brace = add -nl_union_brace = add -nl_if_brace = add -nl_brace_else = add -nl_elseif_brace = ignore -nl_else_brace = add -nl_else_if = ignore -nl_brace_finally = ignore -nl_finally_brace = add -nl_try_brace = add -nl_getset_brace = ignore -nl_for_brace = add -nl_catch_brace = add -nl_brace_catch = ignore -nl_while_brace = add -nl_using_brace = ignore -nl_brace_brace = ignore -nl_do_brace = add -nl_brace_while = remove -nl_switch_brace = add -nl_multi_line_cond = false -nl_multi_line_define = false -nl_before_case = true -nl_before_throw = ignore -nl_after_case = false -nl_namespace_brace = ignore -nl_template_class = ignore -nl_class_brace = ignore -nl_class_init_args = ignore -nl_func_type_name = ignore -nl_func_type_name_class = ignore -nl_func_scope_name = ignore -nl_func_proto_type_name = ignore -nl_func_paren = ignore -nl_func_def_paren = ignore -nl_func_decl_start = ignore -nl_func_def_start = ignore -nl_func_decl_start_single = ignore -nl_func_def_start_single = ignore -nl_func_decl_args = ignore -nl_func_def_args = ignore -nl_func_decl_end = ignore -nl_func_def_end = ignore -nl_func_decl_end_single = ignore -nl_func_def_end_single = ignore -nl_func_decl_empty = ignore -nl_func_def_empty = ignore -nl_fdef_brace = add -nl_after_return = true -nl_return_expr = ignore -nl_after_semicolon = true -nl_after_brace_open = true -nl_after_brace_open_cmt = false -nl_after_vbrace_open = true -nl_after_vbrace_open_empty = false -nl_after_brace_close = true -nl_after_vbrace_close = false -nl_define_macro = false -nl_squeeze_ifdef = true -nl_before_if = ignore -nl_after_if = ignore -nl_before_for = ignore -nl_after_for = ignore -nl_before_while = ignore -nl_after_while = ignore -nl_before_switch = ignore -nl_after_switch = ignore -nl_before_do = ignore -nl_after_do = ignore -nl_ds_struct_enum_cmt = false -nl_ds_struct_enum_close_brace = false -nl_class_colon = ignore -nl_create_if_one_liner = false -nl_create_for_one_liner = false -nl_create_while_one_liner = false -pos_arith = ignore -pos_assign = ignore -pos_bool = ignore -pos_compare = ignore -pos_conditional = ignore -pos_comma = ignore -pos_class_comma = ignore -pos_class_colon = ignore -code_width = 0 -ls_for_split_full = false -ls_func_split_full = false -nl_max = 0 -nl_after_func_proto = 0 -nl_after_func_proto_group = 0 -nl_after_func_body = 0 -nl_after_func_body_class = 0 -nl_after_func_body_one_liner = 0 -nl_before_block_comment = 0 -nl_before_c_comment = 0 -nl_before_cpp_comment = 0 -nl_after_multiline_comment = false -nl_after_struct = 0 -nl_after_class = 0 -nl_before_access_spec = 0 -nl_after_access_spec = 1 -nl_comment_func_def = 0 -nl_after_try_catch_finally = 0 -nl_around_cs_property = 0 -nl_between_get_set = 0 -nl_property_brace = ignore -eat_blanks_after_open_brace = true -eat_blanks_before_close_brace = true -mod_full_brace_do = add -mod_full_brace_for = add -mod_full_brace_function = ignore -mod_full_brace_if = add -mod_full_brace_if_chain = false -mod_full_brace_nl = 0 -mod_full_brace_while = add -mod_full_brace_using = ignore -mod_paren_on_return = add -mod_pawn_semicolon = false -mod_full_paren_if_bool = false -mod_remove_extra_semicolon = true +newlines = auto +input_tab_size = 8 +output_tab_size = 8 +string_escape_char = 92 +string_escape_char2 = 0 +tok_split_gte = true +utf8_byte = true +indent_columns = 3 +indent_continue = 0 +indent_with_tabs = 0 +indent_cmt_with_tabs = false +indent_align_string = false +indent_xml_string = 0 +indent_brace = 0 +indent_braces = false +indent_braces_no_func = false +indent_braces_no_class = false +indent_braces_no_struct = false +indent_brace_parent = false +indent_namespace = false +indent_namespace_level = 0 +indent_namespace_limit = 0 +indent_extern = false +indent_class = true +indent_class_colon = false +indent_else_if = false +indent_var_def_blk = 0 +indent_var_def_cont = false +indent_func_call_param = false +indent_func_def_param = false +indent_func_proto_param = false +indent_func_class_param = false +indent_func_ctor_var_param = false +indent_template_param = false +indent_func_param_double = false +indent_func_const = 0 +indent_func_throw = 0 +indent_member = 3 +indent_sing_line_comments = 0 +indent_relative_single_line_comments = false +indent_switch_case = 0 +indent_case_shift = 0 +indent_case_brace = 0 +indent_col1_comment = false +indent_label = 2 +indent_access_spec = 2 +indent_access_spec_body = false +indent_paren_nl = false +indent_paren_close = 0 +indent_comma_paren = false +indent_bool_paren = false +indent_first_bool_expr = false +indent_square_nl = false +indent_preserve_sql = false +indent_align_assign = true +sp_arith = force +sp_assign = force +sp_assign_default = remove +sp_before_assign = ignore +sp_after_assign = ignore +sp_enum_assign = ignore +sp_enum_before_assign = ignore +sp_enum_after_assign = ignore +sp_pp_concat = add +sp_pp_stringify = add +sp_bool = force +sp_compare = force +sp_inside_paren = remove +sp_paren_paren = remove +sp_balance_nested_parens = false +sp_paren_brace = ignore +sp_before_ptr_star = force +sp_before_unnamed_ptr_star = ignore +sp_between_ptr_star = remove +sp_after_ptr_star = remove +sp_after_ptr_star_func = ignore +sp_before_ptr_star_func = ignore +sp_before_byref = remove +sp_before_unnamed_byref = ignore +sp_after_byref = ignore +sp_after_byref_func = ignore +sp_before_byref_func = ignore +sp_after_type = force +sp_template_angle = ignore +sp_before_angle = remove +sp_inside_angle = remove +sp_after_angle = force +sp_angle_paren = remove +sp_angle_paren_empty = remove +sp_angle_word = force +sp_angle_shift = add +sp_before_sparen = force +sp_inside_sparen = remove +sp_inside_sparen_close = ignore +sp_after_sparen = force +sp_sparen_brace = ignore +sp_invariant_paren = ignore +sp_after_invariant_paren = ignore +sp_special_semi = ignore +sp_before_semi = remove +sp_before_semi_for = ignore +sp_before_semi_for_empty = force +sp_after_semi = add +sp_after_semi_for = force +sp_after_semi_for_empty = ignore +sp_before_square = ignore +sp_before_squares = ignore +sp_inside_square = remove +sp_after_comma = force +sp_before_comma = remove +sp_paren_comma = force +sp_before_ellipsis = remove +sp_after_class_colon = ignore +sp_before_class_colon = ignore +sp_before_case_colon = remove +sp_after_operator = ignore +sp_after_operator_sym = ignore +sp_after_cast = remove +sp_inside_paren_cast = ignore +sp_cpp_cast_paren = ignore +sp_sizeof_paren = remove +sp_after_tag = ignore +sp_inside_braces_enum = force +sp_inside_braces_struct = force +sp_inside_braces = force +sp_inside_braces_empty = ignore +sp_type_func = ignore +sp_func_proto_paren = remove +sp_func_def_paren = remove +sp_inside_fparens = ignore +sp_inside_fparen = remove +sp_square_fparen = ignore +sp_fparen_brace = ignore +sp_func_call_paren = remove +sp_func_call_paren_empty = ignore +sp_func_call_user_paren = ignore +sp_func_class_paren = ignore +sp_return_paren = remove +sp_attribute_paren = remove +sp_defined_paren = force +sp_throw_paren = ignore +sp_catch_paren = ignore +sp_version_paren = ignore +sp_scope_paren = ignore +sp_macro = ignore +sp_macro_func = ignore +sp_else_brace = ignore +sp_brace_else = ignore +sp_brace_typedef = force +sp_catch_brace = ignore +sp_brace_catch = ignore +sp_finally_brace = ignore +sp_brace_finally = ignore +sp_try_brace = ignore +sp_getset_brace = ignore +sp_before_dc = remove +sp_after_dc = remove +sp_d_array_colon = ignore +sp_not = remove +sp_inv = remove +sp_addr = remove +sp_member = remove +sp_deref = remove +sp_sign = remove +sp_incdec = remove +sp_before_nl_cont = add +sp_after_oc_scope = ignore +sp_after_oc_colon = ignore +sp_before_oc_colon = ignore +sp_after_send_oc_colon = ignore +sp_before_send_oc_colon = ignore +sp_after_oc_type = ignore +sp_after_oc_return_type = ignore +sp_after_oc_at_sel = ignore +sp_after_oc_at_sel_parens = ignore +sp_inside_oc_at_sel_parens = ignore +sp_before_oc_block_caret = ignore +sp_after_oc_block_caret = ignore +sp_cond_colon = ignore +sp_cond_question = ignore +sp_case_label = ignore +sp_range = ignore +sp_cmt_cpp_start = ignore +sp_endif_cmt = ignore +sp_after_new = ignore +align_keep_tabs = false +align_with_tabs = false +align_on_tabstop = false +align_number_right = true +align_func_params = true +align_same_func_call_params = false +align_var_def_span = 2 +align_var_def_star_style = 1 +align_var_def_amp_style = 0 +align_var_def_thresh = 0 +align_var_def_gap = 0 +align_var_def_colon = true +align_var_def_attribute = false +align_var_def_inline = true +align_assign_span = 1 +align_assign_thresh = 0 +align_enum_equ_span = 4 +align_enum_equ_thresh = 0 +align_var_struct_span = 3 +align_var_struct_thresh = 0 +align_var_struct_gap = 0 +align_struct_init_span = 3 +align_typedef_gap = 3 +align_typedef_span = 5 +align_typedef_func = 0 +align_typedef_star_style = 0 +align_typedef_amp_style = 0 +align_right_cmt_span = 3 +align_right_cmt_mix = false +align_right_cmt_gap = 0 +align_right_cmt_at_col = 0 +align_func_proto_span = 0 +align_func_proto_gap = 0 +align_on_operator = false +align_mix_var_proto = false +align_single_line_func = false +align_single_line_brace = false +align_single_line_brace_gap = 0 +align_oc_msg_spec_span = 0 +align_nl_cont = true +align_pp_define_gap = 4 +align_pp_define_span = 3 +align_left_shift = true +align_oc_msg_colon_span = 0 +align_oc_decl_colon = false +nl_collapse_empty_body = false +nl_assign_leave_one_liners = true +nl_class_leave_one_liners = true +nl_enum_leave_one_liners = true +nl_getset_leave_one_liners = true +nl_func_leave_one_liners = false +nl_if_leave_one_liners = false +nl_start_of_file = ignore +nl_start_of_file_min = 0 +nl_end_of_file = ignore +nl_end_of_file_min = 0 +nl_assign_brace = add +nl_assign_square = ignore +nl_after_square_assign = ignore +nl_func_var_def_blk = 1 +nl_fcall_brace = add +nl_enum_brace = add +nl_struct_brace = add +nl_union_brace = add +nl_if_brace = add +nl_brace_else = add +nl_elseif_brace = ignore +nl_else_brace = add +nl_else_if = ignore +nl_brace_finally = ignore +nl_finally_brace = add +nl_try_brace = add +nl_getset_brace = ignore +nl_for_brace = add +nl_catch_brace = add +nl_brace_catch = ignore +nl_while_brace = add +nl_using_brace = ignore +nl_brace_brace = ignore +nl_do_brace = add +nl_brace_while = remove +nl_switch_brace = add +nl_multi_line_cond = false +nl_multi_line_define = false +nl_before_case = true +nl_before_throw = ignore +nl_after_case = false +nl_namespace_brace = ignore +nl_template_class = ignore +nl_class_brace = ignore +nl_class_init_args = ignore +nl_func_type_name = ignore +nl_func_type_name_class = ignore +nl_func_scope_name = ignore +nl_func_proto_type_name = ignore +nl_func_paren = ignore +nl_func_def_paren = ignore +nl_func_decl_start = ignore +nl_func_def_start = ignore +nl_func_decl_start_single = ignore +nl_func_def_start_single = ignore +nl_func_decl_args = ignore +nl_func_def_args = ignore +nl_func_decl_end = ignore +nl_func_def_end = ignore +nl_func_decl_end_single = ignore +nl_func_def_end_single = ignore +nl_func_decl_empty = ignore +nl_func_def_empty = ignore +nl_fdef_brace = add +nl_after_return = true +nl_return_expr = ignore +nl_after_semicolon = true +nl_after_brace_open = true +nl_after_brace_open_cmt = false +nl_after_vbrace_open = true +nl_after_vbrace_open_empty = false +nl_after_brace_close = true +nl_after_vbrace_close = false +nl_define_macro = false +nl_squeeze_ifdef = true +nl_before_if = ignore +nl_after_if = ignore +nl_before_for = ignore +nl_after_for = ignore +nl_before_while = ignore +nl_after_while = ignore +nl_before_switch = ignore +nl_after_switch = ignore +nl_before_do = ignore +nl_after_do = ignore +nl_ds_struct_enum_cmt = false +nl_ds_struct_enum_close_brace = false +nl_class_colon = ignore +nl_create_if_one_liner = false +nl_create_for_one_liner = false +nl_create_while_one_liner = false +pos_arith = ignore +pos_assign = ignore +pos_bool = ignore +pos_compare = ignore +pos_conditional = ignore +pos_comma = ignore +pos_class_comma = ignore +pos_class_colon = ignore +code_width = 0 +ls_for_split_full = false +ls_func_split_full = false +nl_max = 0 +nl_after_func_proto = 0 +nl_after_func_proto_group = 0 +nl_after_func_body = 0 +nl_after_func_body_class = 0 +nl_after_func_body_one_liner = 0 +nl_before_block_comment = 0 +nl_before_c_comment = 0 +nl_before_cpp_comment = 0 +nl_after_multiline_comment = false +nl_after_struct = 0 +nl_after_class = 0 +nl_before_access_spec = 0 +nl_after_access_spec = 1 +nl_comment_func_def = 0 +nl_after_try_catch_finally = 0 +nl_around_cs_property = 0 +nl_between_get_set = 0 +nl_property_brace = ignore +eat_blanks_after_open_brace = true +eat_blanks_before_close_brace = true +mod_full_brace_do = add +mod_full_brace_for = add +mod_full_brace_function = ignore +mod_full_brace_if = add +mod_full_brace_if_chain = false +mod_full_brace_nl = 0 +mod_full_brace_while = add +mod_full_brace_using = ignore +mod_paren_on_return = add +mod_pawn_semicolon = false +mod_full_paren_if_bool = false +mod_remove_extra_semicolon = true mod_add_long_function_closebrace_comment = 40 -mod_add_long_switch_closebrace_comment = 40 -mod_add_long_ifdef_endif_comment = 0 -mod_add_long_ifdef_else_comment = 0 -mod_sort_import = false -mod_sort_using = false -mod_sort_include = false -mod_move_case_break = false -mod_case_brace = ignore -mod_remove_empty_return = false -cmt_width = 0 -cmt_reflow_mode = 0 -cmt_indent_multi = true -cmt_convert_tab_to_spaces = true -cmt_c_group = false -cmt_c_nl_start = false -cmt_c_nl_end = false -cmt_cpp_group = false -cmt_cpp_nl_start = false -cmt_cpp_nl_end = false -cmt_cpp_to_c = false -cmt_star_cont = true -cmt_sp_before_star_cont = 0 -cmt_sp_after_star_cont = 0 -cmt_multi_check_last = true -cmt_insert_file_header = "" -cmt_insert_file_footer = "" -cmt_insert_func_header = "" -cmt_insert_class_header = "" -cmt_insert_oc_msg_header = "" -cmt_insert_before_preproc = false -pp_indent = remove -pp_indent_at_level = false -pp_indent_count = 1 -pp_space = remove -pp_space_count = 0 -pp_indent_region = 0 -pp_region_indent_code = false -pp_indent_if = 0 -pp_if_indent_code = false -pp_define_at_level = false -sp_after_tparen_close = remove +mod_add_long_switch_closebrace_comment = 40 +mod_add_long_ifdef_endif_comment = 0 +mod_add_long_ifdef_else_comment = 0 +mod_sort_import = false +mod_sort_using = false +mod_sort_include = false +mod_move_case_break = false +mod_case_brace = ignore +mod_remove_empty_return = false +cmt_width = 0 +cmt_reflow_mode = 0 +cmt_indent_multi = true +cmt_convert_tab_to_spaces = true +cmt_c_group = false +cmt_c_nl_start = false +cmt_c_nl_end = false +cmt_cpp_group = false +cmt_cpp_nl_start = false +cmt_cpp_nl_end = false +cmt_cpp_to_c = false +cmt_star_cont = true +cmt_sp_before_star_cont = 0 +cmt_sp_after_star_cont = 0 +cmt_multi_check_last = true +cmt_insert_file_header = "" +cmt_insert_file_footer = "" +cmt_insert_func_header = "" +cmt_insert_class_header = "" +cmt_insert_oc_msg_header = "" +cmt_insert_before_preproc = false +pp_indent = remove +pp_indent_at_level = false +pp_indent_count = 1 +pp_space = remove +pp_space_count = 0 +pp_indent_region = 0 +pp_region_indent_code = false +pp_indent_if = 0 +pp_if_indent_code = false +pp_define_at_level = false +sp_after_tparen_close = remove diff --git a/tests/config/blc-1.cfg b/tests/config/blc-1.cfg index 3c758f6a6f..f8fd034d0a 100644 --- a/tests/config/blc-1.cfg +++ b/tests/config/blc-1.cfg @@ -2,18 +2,18 @@ # Blank Line Count test 1 # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 3 # new tab size +indent_columns = output_tab_size -nl_max = 4 -nl_before_block_comment = 2 -nl_after_func_body = 2 -nl_after_func_proto_group = 2 +nl_max = 4 +nl_before_block_comment = 2 +nl_after_func_body = 2 +nl_after_func_proto_group = 2 -nl_start_of_file = Remove -nl_end_of_file = Force -nl_end_of_file_min = 1 +nl_start_of_file = Remove +nl_end_of_file = Force +nl_end_of_file_min = 1 diff --git a/tests/config/bool-pos-eol-break.cfg b/tests/config/bool-pos-eol-break.cfg index 1951629cec..87f4682953 100644 --- a/tests/config/bool-pos-eol-break.cfg +++ b/tests/config/bool-pos-eol-break.cfg @@ -4,15 +4,15 @@ # $Id: bool-pos-eol.cfg 803 2007-07-25 00:36:25Z bengardner $ # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 3 # new tab size +indent_columns = output_tab_size -pos_bool = trail_break -pos_comma = Trail_break -pos_class_comma = trail_break -sp_after_comma = force +pos_bool = trail_break +pos_comma = Trail_break +pos_class_comma = trail_break +sp_after_comma = force -align_right_cmt_span = 2 +align_right_cmt_span = 2 diff --git a/tests/config/bool-pos-eol-force.cfg b/tests/config/bool-pos-eol-force.cfg index 6a0478806e..033149b548 100644 --- a/tests/config/bool-pos-eol-force.cfg +++ b/tests/config/bool-pos-eol-force.cfg @@ -4,15 +4,15 @@ # $Id: bool-pos-eol.cfg 803 2007-07-25 00:36:25Z bengardner $ # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 3 # new tab size +indent_columns = output_tab_size -pos_bool = trail_force -pos_comma = Trail_force -pos_class_comma = trail_force -sp_after_comma = force +pos_bool = trail_force +pos_comma = Trail_force +pos_class_comma = trail_force +sp_after_comma = force -align_right_cmt_span = 2 +align_right_cmt_span = 2 diff --git a/tests/config/bool-pos-eol.cfg b/tests/config/bool-pos-eol.cfg index 2a769b3b5d..951be6033e 100644 --- a/tests/config/bool-pos-eol.cfg +++ b/tests/config/bool-pos-eol.cfg @@ -2,15 +2,15 @@ # moves boolean ops to the end of line # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 3 # new tab size +indent_columns = output_tab_size -pos_bool = Trail -pos_comma = Trail -pos_class_comma = trail -sp_after_comma = force +pos_bool = Trail +pos_comma = Trail +pos_class_comma = trail +sp_after_comma = force -align_right_cmt_span = 2 +align_right_cmt_span = 2 diff --git a/tests/config/bool-pos-sol-break.cfg b/tests/config/bool-pos-sol-break.cfg index 4c8670ad50..79b226d016 100644 --- a/tests/config/bool-pos-sol-break.cfg +++ b/tests/config/bool-pos-sol-break.cfg @@ -4,15 +4,15 @@ # $Id: bool-pos-sol.cfg 803 2007-07-25 00:36:25Z bengardner $ # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 3 # new tab size +indent_columns = output_tab_size -pos_bool = Lead_break -pos_comma = Lead_break -pos_class_comma = Lead_break -sp_after_comma = force +pos_bool = Lead_break +pos_comma = Lead_break +pos_class_comma = Lead_break +sp_after_comma = force -align_right_cmt_span = 2 +align_right_cmt_span = 2 diff --git a/tests/config/bool-pos-sol-force.cfg b/tests/config/bool-pos-sol-force.cfg index 05d34a6bd4..eaf5bde000 100644 --- a/tests/config/bool-pos-sol-force.cfg +++ b/tests/config/bool-pos-sol-force.cfg @@ -4,15 +4,15 @@ # $Id: bool-pos-sol.cfg 803 2007-07-25 00:36:25Z bengardner $ # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 3 # new tab size +indent_columns = output_tab_size -pos_bool = Lead_force -pos_comma = Lead_force -pos_class_comma = Lead_force -sp_after_comma = force +pos_bool = Lead_force +pos_comma = Lead_force +pos_class_comma = Lead_force +sp_after_comma = force -align_right_cmt_span = 2 +align_right_cmt_span = 2 diff --git a/tests/config/bool-pos-sol.cfg b/tests/config/bool-pos-sol.cfg index c428ded3e4..dc7db0d38a 100644 --- a/tests/config/bool-pos-sol.cfg +++ b/tests/config/bool-pos-sol.cfg @@ -2,15 +2,15 @@ # moves boolean ops to the end of line # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 3 # new tab size +indent_columns = output_tab_size -pos_bool = Lead -pos_comma = Lead -pos_class_comma = Lead -sp_after_comma = force +pos_bool = Lead +pos_comma = Lead +pos_class_comma = Lead +sp_after_comma = force -align_right_cmt_span = 2 +align_right_cmt_span = 2 diff --git a/tests/config/brace-allman.cfg b/tests/config/brace-allman.cfg index ce13ce4e42..bb1c512010 100644 --- a/tests/config/brace-allman.cfg +++ b/tests/config/brace-allman.cfg @@ -2,24 +2,24 @@ # Allman style # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 8 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 8 # new tab size +indent_columns = output_tab_size # brace settings -nl_assign_brace = add # "= {" vs "= \n {" -nl_enum_brace = add # "enum {" vs "enum \n {" -nl_union_brace = add # "union {" vs "union \n {" -nl_struct_brace = add # "struct {" vs "struct \n {" -nl_do_brace = add # "do {" vs "do \n {" -nl_if_brace = add # "if () {" vs "if () \n {" -nl_for_brace = add # "for () {" vs "for () \n {" -nl_else_brace = add # "else {" vs "else \n {" -nl_while_brace = add # "while () {" vs "while () \n {" -nl_switch_brace = add # "switch () {" vs "switch () \n {" -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" -nl_brace_while = remove -nl_brace_else = add +nl_assign_brace = add # "= {" vs "= \n {" +nl_enum_brace = add # "enum {" vs "enum \n {" +nl_union_brace = add # "union {" vs "union \n {" +nl_struct_brace = add # "struct {" vs "struct \n {" +nl_do_brace = add # "do {" vs "do \n {" +nl_if_brace = add # "if () {" vs "if () \n {" +nl_for_brace = add # "for () {" vs "for () \n {" +nl_else_brace = add # "else {" vs "else \n {" +nl_while_brace = add # "while () {" vs "while () \n {" +nl_switch_brace = add # "switch () {" vs "switch () \n {" +nl_fcall_brace = add # "foo() {" vs "foo()\n{" +nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_brace_while = remove +nl_brace_else = add diff --git a/tests/config/brace-banner.cfg b/tests/config/brace-banner.cfg index f2d5ec2c48..dbe8f64fba 100644 --- a/tests/config/brace-banner.cfg +++ b/tests/config/brace-banner.cfg @@ -2,37 +2,37 @@ # Banner style # -indent_with_tabs = 1 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 2 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 1 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 2 # new tab size +indent_columns = output_tab_size -indent_braces = TRUE -indent_braces_no_func = TRUE +indent_braces = TRUE +indent_braces_no_func = TRUE # brace settings -nl_assign_brace = remove # "= {" vs "= \n {" -nl_enum_brace = remove # "enum {" vs "enum \n {" -nl_union_brace = remove # "union {" vs "union \n {" -nl_struct_brace = remove # "struct {" vs "struct \n {" -nl_do_brace = remove # "do {" vs "do \n {" -nl_if_brace = remove # "if () {" vs "if () \n {" -nl_for_brace = remove # "for () {" vs "for () \n {" -nl_else_brace = remove # "else {" vs "else \n {" -nl_while_brace = remove # "while () {" vs "while () \n {" -nl_switch_brace = remove # "switch () {" vs "switch () \n {" -nl_fcall_brace = remove # "foo() {" vs "foo()\n{" -nl_fdef_brace = remove # "int foo() {" vs "int foo()\n{" -nl_brace_while = add -nl_brace_else = add +nl_assign_brace = remove # "= {" vs "= \n {" +nl_enum_brace = remove # "enum {" vs "enum \n {" +nl_union_brace = remove # "union {" vs "union \n {" +nl_struct_brace = remove # "struct {" vs "struct \n {" +nl_do_brace = remove # "do {" vs "do \n {" +nl_if_brace = remove # "if () {" vs "if () \n {" +nl_for_brace = remove # "for () {" vs "for () \n {" +nl_else_brace = remove # "else {" vs "else \n {" +nl_while_brace = remove # "while () {" vs "while () \n {" +nl_switch_brace = remove # "switch () {" vs "switch () \n {" +nl_fcall_brace = remove # "foo() {" vs "foo()\n{" +nl_fdef_brace = remove # "int foo() {" vs "int foo()\n{" +nl_brace_while = add +nl_brace_else = add # spaces around braces -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_assign = add -sp_fparen_brace = add +sp_before_sparen = force # "if (" vs "if(" +sp_after_sparen = force # "if () {" vs "if (){" +sp_assign = add +sp_fparen_brace = add -eat_blanks_after_open_brace = True +eat_blanks_after_open_brace = True -sp_else_brace = force +sp_else_brace = force diff --git a/tests/config/brace-banner.rerun.cfg b/tests/config/brace-banner.rerun.cfg index ab2b705e51..df289545ca 100644 --- a/tests/config/brace-banner.rerun.cfg +++ b/tests/config/brace-banner.rerun.cfg @@ -1,3 +1,3 @@ -include "brace-banner.cfg" +include "brace-banner.cfg" -input_tab_size = output_tab_size +input_tab_size = output_tab_size diff --git a/tests/config/brace-gnu.cfg b/tests/config/brace-gnu.cfg index 0a678434ec..53db33769e 100644 --- a/tests/config/brace-gnu.cfg +++ b/tests/config/brace-gnu.cfg @@ -2,35 +2,35 @@ # GNU style # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 2 # new tab size -indent_columns = 2 +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 2 # new tab size +indent_columns = 2 # indent extra 2 spaces per brace pair -indent_brace = 2 +indent_brace = 2 # brace placement # nl_assign_brace = add # "= {" vs "= \n {" # nl_enum_brace = add # "enum {" vs "enum \n {" # nl_union_brace = add # "union {" vs "union \n {" # nl_struct_brace = add # "struct {" vs "struct \n {" -nl_do_brace = add # "do {" vs "do \n {" -nl_if_brace = add # "if () {" vs "if () \n {" -nl_for_brace = add # "for () {" vs "for () \n {" -nl_else_brace = add # "else {" vs "else \n {" -nl_while_brace = add # "while () {" vs "while () \n {" -nl_switch_brace = add # "switch () {" vs "switch () \n {" -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" -nl_brace_while = add -nl_brace_else = add +nl_do_brace = add # "do {" vs "do \n {" +nl_if_brace = add # "if () {" vs "if () \n {" +nl_for_brace = add # "for () {" vs "for () \n {" +nl_else_brace = add # "else {" vs "else \n {" +nl_while_brace = add # "while () {" vs "while () \n {" +nl_switch_brace = add # "switch () {" vs "switch () \n {" +nl_fcall_brace = add # "foo() {" vs "foo()\n{" +nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_brace_while = add +nl_brace_else = add # spaces around braces -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_assign = add -sp_else_brace = force +sp_before_sparen = force # "if (" vs "if(" +sp_after_sparen = force # "if () {" vs "if (){" +sp_assign = add +sp_else_brace = force # nl_squeeze_ifdef = TRUE # nl_func_var_def_blk = 1 diff --git a/tests/config/brace-kr-br.cfg b/tests/config/brace-kr-br.cfg index 21bc75dd09..4b221ee9df 100644 --- a/tests/config/brace-kr-br.cfg +++ b/tests/config/brace-kr-br.cfg @@ -4,40 +4,40 @@ # $Id: brace-kr.cfg 803 2007-07-25 00:36:25Z bengardner $ # -indent_with_tabs = 1 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 8 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 1 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 8 # new tab size +indent_columns = output_tab_size # brace placement -nl_assign_brace = remove # "= {" vs "= \n {" -nl_enum_brace = remove # "enum {" vs "enum \n {" -nl_union_brace = remove # "union {" vs "union \n {" -nl_struct_brace = remove # "struct {" vs "struct \n {" -nl_do_brace = remove # "do {" vs "do \n {" -nl_if_brace = remove # "if () {" vs "if () \n {" -nl_for_brace = remove # "for () {" vs "for () \n {" -nl_else_brace = remove # "else {" vs "else \n {" -nl_while_brace = remove # "while () {" vs "while () \n {" -nl_switch_brace = remove # "switch () {" vs "switch () \n {" -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" -nl_brace_while = remove -nl_brace_else = remove +nl_assign_brace = remove # "= {" vs "= \n {" +nl_enum_brace = remove # "enum {" vs "enum \n {" +nl_union_brace = remove # "union {" vs "union \n {" +nl_struct_brace = remove # "struct {" vs "struct \n {" +nl_do_brace = remove # "do {" vs "do \n {" +nl_if_brace = remove # "if () {" vs "if () \n {" +nl_for_brace = remove # "for () {" vs "for () \n {" +nl_else_brace = remove # "else {" vs "else \n {" +nl_while_brace = remove # "while () {" vs "while () \n {" +nl_switch_brace = remove # "switch () {" vs "switch () \n {" +nl_fcall_brace = add # "foo() {" vs "foo()\n{" +nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_brace_while = remove +nl_brace_else = remove # spaces around braces -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_assign = add -sp_else_brace = force +sp_before_sparen = force # "if (" vs "if(" +sp_after_sparen = force # "if () {" vs "if (){" +sp_assign = add +sp_else_brace = force # nl_squeeze_ifdef = TRUE # nl_func_var_def_blk = 1 # nl_before_case = 1 # nl_after_return = TRUE -nl_after_brace_open = true -mod_full_brace_do = add -mod_full_brace_for = add -mod_full_brace_if = add +nl_after_brace_open = true +mod_full_brace_do = add +mod_full_brace_for = add +mod_full_brace_if = add diff --git a/tests/config/brace-kr-nobr.cfg b/tests/config/brace-kr-nobr.cfg index ad7a4bb011..eca4de2510 100644 --- a/tests/config/brace-kr-nobr.cfg +++ b/tests/config/brace-kr-nobr.cfg @@ -2,41 +2,41 @@ # K&R style # -indent_with_tabs = 1 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 8 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 1 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 8 # new tab size +indent_columns = output_tab_size # brace placement -nl_assign_brace = remove # "= {" vs "= \n {" -nl_enum_brace = remove # "enum {" vs "enum \n {" -nl_union_brace = remove # "union {" vs "union \n {" -nl_struct_brace = remove # "struct {" vs "struct \n {" -nl_do_brace = remove # "do {" vs "do \n {" -nl_if_brace = remove # "if () {" vs "if () \n {" -nl_for_brace = remove # "for () {" vs "for () \n {" -nl_else_brace = remove # "else {" vs "else \n {" -nl_while_brace = remove # "while () {" vs "while () \n {" -nl_switch_brace = remove # "switch () {" vs "switch () \n {" -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" -nl_brace_while = remove -nl_brace_else = remove +nl_assign_brace = remove # "= {" vs "= \n {" +nl_enum_brace = remove # "enum {" vs "enum \n {" +nl_union_brace = remove # "union {" vs "union \n {" +nl_struct_brace = remove # "struct {" vs "struct \n {" +nl_do_brace = remove # "do {" vs "do \n {" +nl_if_brace = remove # "if () {" vs "if () \n {" +nl_for_brace = remove # "for () {" vs "for () \n {" +nl_else_brace = remove # "else {" vs "else \n {" +nl_while_brace = remove # "while () {" vs "while () \n {" +nl_switch_brace = remove # "switch () {" vs "switch () \n {" +nl_fcall_brace = add # "foo() {" vs "foo()\n{" +nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_brace_while = remove +nl_brace_else = remove # spaces around braces -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_assign = add -sp_else_brace = force +sp_before_sparen = force # "if (" vs "if(" +sp_after_sparen = force # "if () {" vs "if (){" +sp_assign = add +sp_else_brace = force # nl_squeeze_ifdef = TRUE # nl_func_var_def_blk = 1 # nl_before_case = 1 # nl_after_return = TRUE -nl_after_brace_open = false -nl_remove_extra_newlines = 2 -mod_full_brace_do = add -mod_full_brace_for = add -mod_full_brace_if = add +nl_after_brace_open = false +nl_remove_extra_newlines = 2 +mod_full_brace_do = add +mod_full_brace_for = add +mod_full_brace_if = add diff --git a/tests/config/brace-kr.cfg b/tests/config/brace-kr.cfg index a7f0ff3909..381f9b5c5e 100644 --- a/tests/config/brace-kr.cfg +++ b/tests/config/brace-kr.cfg @@ -2,37 +2,37 @@ # K&R style # -indent_with_tabs = 1 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 8 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 1 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 8 # new tab size +indent_columns = output_tab_size # brace placement -nl_assign_brace = remove # "= {" vs "= \n {" -nl_enum_brace = remove # "enum {" vs "enum \n {" -nl_union_brace = remove # "union {" vs "union \n {" -nl_struct_brace = remove # "struct {" vs "struct \n {" -nl_do_brace = remove # "do {" vs "do \n {" -nl_if_brace = remove # "if () {" vs "if () \n {" -nl_for_brace = remove # "for () {" vs "for () \n {" -nl_else_brace = remove # "else {" vs "else \n {" -nl_while_brace = remove # "while () {" vs "while () \n {" -nl_switch_brace = remove # "switch () {" vs "switch () \n {" -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" -nl_brace_while = remove -nl_brace_else = remove +nl_assign_brace = remove # "= {" vs "= \n {" +nl_enum_brace = remove # "enum {" vs "enum \n {" +nl_union_brace = remove # "union {" vs "union \n {" +nl_struct_brace = remove # "struct {" vs "struct \n {" +nl_do_brace = remove # "do {" vs "do \n {" +nl_if_brace = remove # "if () {" vs "if () \n {" +nl_for_brace = remove # "for () {" vs "for () \n {" +nl_else_brace = remove # "else {" vs "else \n {" +nl_while_brace = remove # "while () {" vs "while () \n {" +nl_switch_brace = remove # "switch () {" vs "switch () \n {" +nl_fcall_brace = add # "foo() {" vs "foo()\n{" +nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_brace_while = remove +nl_brace_else = remove # spaces around braces -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_assign = add -sp_else_brace = force +sp_before_sparen = force # "if (" vs "if(" +sp_after_sparen = force # "if () {" vs "if (){" +sp_assign = add +sp_else_brace = force # nl_squeeze_ifdef = TRUE # nl_func_var_def_blk = 1 # nl_before_case = 1 # nl_after_return = TRUE -sp_brace_else = force +sp_brace_else = force diff --git a/tests/config/brace-remove-2.cfg b/tests/config/brace-remove-2.cfg index e693d6da42..d010c558cf 100644 --- a/tests/config/brace-remove-2.cfg +++ b/tests/config/brace-remove-2.cfg @@ -3,10 +3,10 @@ # -mod_paren_on_return = remove # "return 1;" vs "return (1);" -mod_full_brace_if = remove # "if (a) a--;" vs "if (a) { a--; }" -mod_full_brace_for = remove # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = remove # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = remove # "while (a) a--;" vs "while (a) { a--; }" -mod_full_brace_nl = 2 # don't remove if more than 3 newlines +mod_paren_on_return = remove # "return 1;" vs "return (1);" +mod_full_brace_if = remove # "if (a) a--;" vs "if (a) { a--; }" +mod_full_brace_for = remove # "for () a--;" vs "for () { a--; }" +mod_full_brace_do = remove # "do a--; while ();" vs "do { a--; } while ();" +mod_full_brace_while = remove # "while (a) a--;" vs "while (a) { a--; }" +mod_full_brace_nl = 2 # don't remove if more than 3 newlines diff --git a/tests/config/brace-remove-all.cfg b/tests/config/brace-remove-all.cfg index 07a86efb13..6135a7ecd3 100644 --- a/tests/config/brace-remove-all.cfg +++ b/tests/config/brace-remove-all.cfg @@ -3,11 +3,11 @@ # -mod_paren_on_return = remove # "return 1;" vs "return (1);" -mod_full_brace_if = remove # "if (a) a--;" vs "if (a) { a--; }" -mod_full_brace_for = remove # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = remove # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = remove # "while (a) a--;" vs "while (a) { a--; }" +mod_paren_on_return = remove # "return 1;" vs "return (1);" +mod_full_brace_if = remove # "if (a) a--;" vs "if (a) { a--; }" +mod_full_brace_for = remove # "for () a--;" vs "for () { a--; }" +mod_full_brace_do = remove # "do a--; while ();" vs "do { a--; } while ();" +mod_full_brace_while = remove # "while (a) a--;" vs "while (a) { a--; }" -nl_else_if = remove +nl_else_if = remove diff --git a/tests/config/brace-ws.cfg b/tests/config/brace-ws.cfg index 7327fdce25..d21da04dd3 100644 --- a/tests/config/brace-ws.cfg +++ b/tests/config/brace-ws.cfg @@ -2,26 +2,26 @@ # Whitesmith style # -indent_with_tabs = 1 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 8 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 1 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 8 # new tab size +indent_columns = output_tab_size -indent_braces = TRUE +indent_braces = TRUE # brace settings -nl_assign_brace = add # "= {" vs "= \n {" -nl_enum_brace = add # "enum {" vs "enum \n {" -nl_union_brace = add # "union {" vs "union \n {" -nl_struct_brace = add # "struct {" vs "struct \n {" -nl_do_brace = add # "do {" vs "do \n {" -nl_if_brace = add # "if () {" vs "if () \n {" -nl_for_brace = add # "for () {" vs "for () \n {" -nl_else_brace = add # "else {" vs "else \n {" -nl_while_brace = add # "while () {" vs "while () \n {" -nl_switch_brace = add # "switch () {" vs "switch () \n {" -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" -nl_brace_while = add -nl_brace_else = add +nl_assign_brace = add # "= {" vs "= \n {" +nl_enum_brace = add # "enum {" vs "enum \n {" +nl_union_brace = add # "union {" vs "union \n {" +nl_struct_brace = add # "struct {" vs "struct \n {" +nl_do_brace = add # "do {" vs "do \n {" +nl_if_brace = add # "if () {" vs "if () \n {" +nl_for_brace = add # "for () {" vs "for () \n {" +nl_else_brace = add # "else {" vs "else \n {" +nl_while_brace = add # "while () {" vs "while () \n {" +nl_switch_brace = add # "switch () {" vs "switch () \n {" +nl_fcall_brace = add # "foo() {" vs "foo()\n{" +nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_brace_while = add +nl_brace_else = add diff --git a/tests/config/brace-ws2.cfg b/tests/config/brace-ws2.cfg index effd391245..699bed5b31 100644 --- a/tests/config/brace-ws2.cfg +++ b/tests/config/brace-ws2.cfg @@ -2,27 +2,27 @@ # Whitesmith style # -indent_with_tabs = 1 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 8 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 1 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 8 # new tab size +indent_columns = output_tab_size -indent_braces = TRUE -indent_braces_no_func = TRUE +indent_braces = TRUE +indent_braces_no_func = TRUE # brace settings -nl_assign_brace = add # "= {" vs "= \n {" -nl_enum_brace = add # "enum {" vs "enum \n {" -nl_union_brace = add # "union {" vs "union \n {" -nl_struct_brace = add # "struct {" vs "struct \n {" -nl_do_brace = add # "do {" vs "do \n {" -nl_if_brace = add # "if () {" vs "if () \n {" -nl_for_brace = add # "for () {" vs "for () \n {" -nl_else_brace = add # "else {" vs "else \n {" -nl_while_brace = add # "while () {" vs "while () \n {" -nl_switch_brace = add # "switch () {" vs "switch () \n {" -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" -nl_brace_while = add -nl_brace_else = add +nl_assign_brace = add # "= {" vs "= \n {" +nl_enum_brace = add # "enum {" vs "enum \n {" +nl_union_brace = add # "union {" vs "union \n {" +nl_struct_brace = add # "struct {" vs "struct \n {" +nl_do_brace = add # "do {" vs "do \n {" +nl_if_brace = add # "if () {" vs "if () \n {" +nl_for_brace = add # "for () {" vs "for () \n {" +nl_else_brace = add # "else {" vs "else \n {" +nl_while_brace = add # "while () {" vs "while () \n {" +nl_switch_brace = add # "switch () {" vs "switch () \n {" +nl_fcall_brace = add # "foo() {" vs "foo()\n{" +nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_brace_while = add +nl_brace_else = add diff --git a/tests/config/braces_empty.cfg b/tests/config/braces_empty.cfg index b81753a9bc..af004abb33 100644 --- a/tests/config/braces_empty.cfg +++ b/tests/config/braces_empty.cfg @@ -1,2 +1,2 @@ # Add or remove space inside '{}' -sp_inside_braces_empty = remove +sp_inside_braces_empty = remove diff --git a/tests/config/bug_1001.cfg b/tests/config/bug_1001.cfg index 1ee0d71505..18976fa349 100644 --- a/tests/config/bug_1001.cfg +++ b/tests/config/bug_1001.cfg @@ -1,3 +1,3 @@ -sp_angle_colon = force -sp_after_angle = remove -sp_before_class_colon = force +sp_angle_colon = force +sp_after_angle = remove +sp_before_class_colon = force diff --git a/tests/config/bug_1002-r.cfg b/tests/config/bug_1002-r.cfg index 9397fe177b..92de722534 100644 --- a/tests/config/bug_1002-r.cfg +++ b/tests/config/bug_1002-r.cfg @@ -1,3 +1,3 @@ -sp_bool = remove -sp_before_byref = force -sp_after_byref = force +sp_bool = remove +sp_before_byref = force +sp_after_byref = force diff --git a/tests/config/bug_1002.cfg b/tests/config/bug_1002.cfg index 9a172aa73c..d72350d6be 100644 --- a/tests/config/bug_1002.cfg +++ b/tests/config/bug_1002.cfg @@ -1,3 +1,3 @@ -sp_bool = force -sp_before_byref = remove -sp_after_byref = remove +sp_bool = force +sp_before_byref = remove +sp_after_byref = remove diff --git a/tests/config/bug_1005.cfg b/tests/config/bug_1005.cfg index 1f57a3495b..626f43b9aa 100644 --- a/tests/config/bug_1005.cfg +++ b/tests/config/bug_1005.cfg @@ -1,2 +1,2 @@ -sp_before_dc = remove -sp_angle_paren_empty = remove +sp_before_dc = remove +sp_angle_paren_empty = remove diff --git a/tests/config/bug_1041.cfg b/tests/config/bug_1041.cfg index 087272b95e..b7eaf9710f 100644 --- a/tests/config/bug_1041.cfg +++ b/tests/config/bug_1041.cfg @@ -1 +1 @@ -sp_func_call_paren = remove +sp_func_call_paren = remove diff --git a/tests/config/bug_1068.cfg b/tests/config/bug_1068.cfg index cb1a0139ef..9b7c5d7e03 100644 --- a/tests/config/bug_1068.cfg +++ b/tests/config/bug_1068.cfg @@ -1,2 +1,2 @@ -nl_after_if = force +nl_after_if = force #nl_after_if = remove diff --git a/tests/config/bug_1108.cfg b/tests/config/bug_1108.cfg index f9982c0727..91e5bfc6d8 100644 --- a/tests/config/bug_1108.cfg +++ b/tests/config/bug_1108.cfg @@ -1,5 +1,5 @@ -indent_with_tabs = 0 -input_tab_size = 3 -output_tab_size = 3 -indent_columns = 3 -indent_braces = TRUE +indent_with_tabs = 0 +input_tab_size = 3 +output_tab_size = 3 +indent_columns = 3 +indent_braces = TRUE diff --git a/tests/config/bug_1112.cfg b/tests/config/bug_1112.cfg index 1186249900..263a1c0170 100644 --- a/tests/config/bug_1112.cfg +++ b/tests/config/bug_1112.cfg @@ -1,3 +1,3 @@ -sp_arith = force -sp_before_byref = remove -sp_after_byref = force +sp_arith = force +sp_before_byref = remove +sp_after_byref = force diff --git a/tests/config/bug_1139-f.cfg b/tests/config/bug_1139-f.cfg index 2674758970..fabba94158 100644 --- a/tests/config/bug_1139-f.cfg +++ b/tests/config/bug_1139-f.cfg @@ -3,4 +3,4 @@ #indent_with_tabs = 0 #sp_before_sparen = force -nl_before_if_closing_paren = force +nl_before_if_closing_paren = force diff --git a/tests/config/bug_1139-r.cfg b/tests/config/bug_1139-r.cfg index 8f0d79a6b0..13d1de8b64 100644 --- a/tests/config/bug_1139-r.cfg +++ b/tests/config/bug_1139-r.cfg @@ -3,4 +3,4 @@ #indent_with_tabs = 0 #sp_before_sparen = force -nl_before_if_closing_paren = remove +nl_before_if_closing_paren = remove diff --git a/tests/config/bug_1170.cfg b/tests/config/bug_1170.cfg index c5a5967e06..28dc8f4f83 100644 --- a/tests/config/bug_1170.cfg +++ b/tests/config/bug_1170.cfg @@ -1,5 +1,5 @@ -code_width = 140 -indent_continue = 6 -indent_columns = 3 -indent_with_tabs = 0 -indent_class = true +code_width = 140 +indent_continue = 6 +indent_columns = 3 +indent_with_tabs = 0 +indent_class = true diff --git a/tests/config/bug_1235.cfg b/tests/config/bug_1235.cfg index 40953381f1..88be028619 100644 --- a/tests/config/bug_1235.cfg +++ b/tests/config/bug_1235.cfg @@ -144,14 +144,14 @@ mod_remove_empty_return = true pp_ignore_define_body = true use_options_overriding_for_qt_macros = false warn_level_tabs_found_in_verbatim_string_literals = 1 -set MACRO_FUNC ATTRIBUTE_ALIGN -set PROTO_WRAP FAKE_FUNCTION -set COMMENT F_STDCALL -set COMMENT PLATFORM_EXCEPTION_SAFEGUARD_PROLOG -set COMMENT WINAPI -set COMMENT __cdecl -set COMMENT __clrcall -set COMMENT __fastcall -set COMMENT __stdcall -set COMMENT __thiscall -set COMMENT __vectorcall +set MACRO_FUNC ATTRIBUTE_ALIGN +set PROTO_WRAP FAKE_FUNCTION +set COMMENT F_STDCALL +set COMMENT PLATFORM_EXCEPTION_SAFEGUARD_PROLOG +set COMMENT WINAPI +set COMMENT __cdecl +set COMMENT __clrcall +set COMMENT __fastcall +set COMMENT __stdcall +set COMMENT __thiscall +set COMMENT __vectorcall diff --git a/tests/config/bug_1236.cfg b/tests/config/bug_1236.cfg index abea2b4c84..d39651becd 100644 --- a/tests/config/bug_1236.cfg +++ b/tests/config/bug_1236.cfg @@ -1,4 +1,4 @@ -indent_ignore_asm_block=true +indent_ignore_asm_block = true # Uncrustify-0.65-86-360a8f0 input_tab_size = 4 string_replace_tab_chars = true @@ -145,15 +145,15 @@ mod_remove_empty_return = true pp_ignore_define_body = true use_options_overriding_for_qt_macros = false warn_level_tabs_found_in_verbatim_string_literals = 1 -set MACRO_FUNC ATTRIBUTE_ALIGN -set PROTO_WRAP FAKE_FUNCTION -set COMMENT F_STDCALL -set COMMENT PLATFORM_EXCEPTION_SAFEGUARD_PROLOG -set COMMENT WINAPI -set COMMENT __cdecl -set COMMENT __clrcall -set COMMENT __fastcall -set COMMENT __stdcall -set COMMENT __thiscall -set COMMENT __vectorcall +set MACRO_FUNC ATTRIBUTE_ALIGN +set PROTO_WRAP FAKE_FUNCTION +set COMMENT F_STDCALL +set COMMENT PLATFORM_EXCEPTION_SAFEGUARD_PROLOG +set COMMENT WINAPI +set COMMENT __cdecl +set COMMENT __clrcall +set COMMENT __fastcall +set COMMENT __stdcall +set COMMENT __thiscall +set COMMENT __vectorcall # option(s) with 'not default' value: 145 diff --git a/tests/config/bug_1249.cfg b/tests/config/bug_1249.cfg index 5f935566f7..b25cb78517 100644 --- a/tests/config/bug_1249.cfg +++ b/tests/config/bug_1249.cfg @@ -1,2 +1,2 @@ -sp_after_dc=remove -sp_before_dc=remove +sp_after_dc = remove +sp_before_dc = remove diff --git a/tests/config/bug_1315.cfg b/tests/config/bug_1315.cfg index 77565f38b6..76bac30c7b 100644 --- a/tests/config/bug_1315.cfg +++ b/tests/config/bug_1315.cfg @@ -1,4 +1,4 @@ -sp_assign = force -indent_with_tabs = 0 +sp_assign = force +indent_with_tabs = 0 #(516)Align lines that start with '<<' with previous '<<'. Default=True. #align_left_shift = false diff --git a/tests/config/bug_1324.cfg b/tests/config/bug_1324.cfg index c5cec67c24..004e692e1d 100644 --- a/tests/config/bug_1324.cfg +++ b/tests/config/bug_1324.cfg @@ -1,3 +1,3 @@ -indent_with_tabs = 0 -sp_after_semi_for = remove -sp_after_semi_for_empty = force +indent_with_tabs = 0 +sp_after_semi_for = remove +sp_after_semi_for_empty = force diff --git a/tests/config/bug_1338.cfg b/tests/config/bug_1338.cfg index 8d2ab2a0c8..3bdb4073a7 100644 --- a/tests/config/bug_1338.cfg +++ b/tests/config/bug_1338.cfg @@ -1,2 +1,2 @@ -nl_max=2 +nl_max = 2 diff --git a/tests/config/bug_1349.cfg b/tests/config/bug_1349.cfg index a97ecf7943..bba256956d 100644 --- a/tests/config/bug_1349.cfg +++ b/tests/config/bug_1349.cfg @@ -1,5 +1,5 @@ -code_width = 115 -indent_columns = 4 -indent_with_tabs = 0 -nl_after_semicolon = true -align_struct_init_span = 5 +code_width = 115 +indent_columns = 4 +indent_with_tabs = 0 +nl_after_semicolon = true +align_struct_init_span = 5 diff --git a/tests/config/bug_340.cfg b/tests/config/bug_340.cfg index 53e935230a..c4307aec68 100644 --- a/tests/config/bug_340.cfg +++ b/tests/config/bug_340.cfg @@ -5,19 +5,19 @@ # # The type of line endings -newlines = lf # auto/lf/crlf/cr +newlines = lf # auto/lf/crlf/cr # The original size of tabs in the input -input_tab_size = 2 # number +input_tab_size = 2 # number # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 2 # number +output_tab_size = 2 # number # The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # number # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # number # # Indenting @@ -25,1286 +25,1286 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 2 # number +indent_columns = 2 # number # The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents. # For FreeBSD, this is set to 4. -indent_continue = 0 # number +indent_continue = 0 # number # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs to brace level, align with spaces # 2=indent and align with tabs, using spaces when not on a tabstop -indent_with_tabs = 0 # number +indent_with_tabs = 0 # number # Comments that are not a brace level are indented with tabs on a tabstop. # Requires indent_with_tabs=2. If false, will use spaces. -indent_cmt_with_tabs = false # false/true +indent_cmt_with_tabs = false # false/true # Whether to indent strings broken by '\' so that they line up -indent_align_string = false # false/true +indent_align_string = false # false/true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # number # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # number # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # false/true # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # false/true # Disabled indenting class braces if indent_braces is true -indent_braces_no_class = false # false/true +indent_braces_no_class = false # false/true # Disabled indenting struct braces if indent_braces is true -indent_braces_no_struct = false # false/true +indent_braces_no_struct = false # false/true # Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # false/true # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # false/true # The number of spaces to indent a namespace block -indent_namespace_level = 0 # number +indent_namespace_level = 0 # number # If the body of the namespace is longer than this number, it won't be indented. # Requires indent_namespace=true. Default=0 (no limit) -indent_namespace_limit = 0 # number +indent_namespace_limit = 0 # number # Whether the 'extern "C"' body is indented -indent_extern = false # false/true +indent_extern = false # false/true # Whether the 'class' body is indented -indent_class = false # false/true +indent_class = false # false/true # Whether to indent the stuff after a leading class colon -indent_class_colon = false # false/true +indent_class_colon = false # false/true # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level -indent_else_if = false # false/true +indent_else_if = false # false/true # Amount to indent variable declarations after a open brace. neg=relative, pos=absolute -indent_var_def_blk = 0 # number +indent_var_def_blk = 0 # number # Indent continued variable declarations instead of aligning. -indent_var_def_cont = false # false/true +indent_var_def_cont = false # false/true # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = false # false/true +indent_func_call_param = false # false/true # Same as indent_func_call_param, but for function defs -indent_func_def_param = false # false/true +indent_func_def_param = false # false/true # Same as indent_func_call_param, but for function protos -indent_func_proto_param = false # false/true +indent_func_proto_param = false # false/true # Same as indent_func_call_param, but for class declarations -indent_func_class_param = false # false/true +indent_func_class_param = false # false/true # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = false # false/true +indent_func_ctor_var_param = false # false/true # Same as indent_func_call_param, but for templates -indent_template_param = false # false/true +indent_template_param = false # false/true # Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true +indent_func_param_double = false # false/true # Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 0 # number +indent_func_const = 0 # number # Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 0 # number +indent_func_throw = 0 # number # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 0 # number +indent_member = 0 # number # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # number # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = false # false/true +indent_relative_single_line_comments = false # false/true # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 2 # number +indent_switch_case = 2 # number # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # number # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 0 # number +indent_case_brace = 0 # number # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # false/true # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # number # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 0 # number +indent_access_spec = 0 # number # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # false/true # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # false/true # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 0 # number +indent_paren_close = 0 # number # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # false/true # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # false/true # If 'indent_bool_paren' is true, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones -indent_first_bool_expr = false # false/true +indent_first_bool_expr = false # false/true # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # false/true # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # false/true # Align continued statements at the '='. Default=True # If FALSE or the '=' is followed by a newline, the next line is indent one tab. -indent_align_assign = true # false/true +indent_align_assign = true # false/true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = add # ignore/add/remove/force +sp_arith = add # ignore/add/remove/force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = add # ignore/add/remove/force +sp_assign = add # ignore/add/remove/force # Add or remove space around assignment operator '=' in a prototype -sp_assign_default = ignore # ignore/add/remove/force +sp_assign_default = ignore # ignore/add/remove/force # Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. -sp_before_assign = ignore # ignore/add/remove/force +sp_before_assign = ignore # ignore/add/remove/force # Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. -sp_after_assign = ignore # ignore/add/remove/force +sp_after_assign = ignore # ignore/add/remove/force # Add or remove space around assignment '=' in enum -sp_enum_assign = add # ignore/add/remove/force +sp_enum_assign = add # ignore/add/remove/force # Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_before_assign = ignore # ignore/add/remove/force +sp_enum_before_assign = ignore # ignore/add/remove/force # Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_after_assign = ignore # ignore/add/remove/force +sp_enum_after_assign = ignore # ignore/add/remove/force # Add or remove space around preprocessor '##' concatenation operator. Default=Add -sp_pp_concat = add # ignore/add/remove/force +sp_pp_concat = add # ignore/add/remove/force # Add or remove space after preprocessor '#' stringify operator. Default=Add -sp_pp_stringify = add # ignore/add/remove/force +sp_pp_stringify = add # ignore/add/remove/force # Add or remove space around boolean operators '&&' and '||' -sp_bool = add # ignore/add/remove/force +sp_bool = add # ignore/add/remove/force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = add # ignore/add/remove/force +sp_compare = add # ignore/add/remove/force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # ignore/add/remove/force # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # ignore/add/remove/force # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # false/true # Add or remove space between ')' and '{' -sp_paren_brace = add # ignore/add/remove/force +sp_paren_brace = add # ignore/add/remove/force # Add or remove space before pointer star '*' -sp_before_ptr_star = add # ignore/add/remove/force +sp_before_ptr_star = add # ignore/add/remove/force # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = add # ignore/add/remove/force +sp_before_unnamed_ptr_star = add # ignore/add/remove/force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # ignore/add/remove/force # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # ignore/add/remove/force # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = remove # ignore/add/remove/force +sp_after_ptr_star_func = remove # ignore/add/remove/force # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = ignore # ignore/add/remove/force +sp_before_ptr_star_func = ignore # ignore/add/remove/force # Add or remove space before a reference sign '&' -sp_before_byref = add # ignore/add/remove/force +sp_before_byref = add # ignore/add/remove/force # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force +sp_before_unnamed_byref = ignore # ignore/add/remove/force # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = ignore # ignore/add/remove/force +sp_after_byref = ignore # ignore/add/remove/force # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = ignore # ignore/add/remove/force +sp_after_byref_func = ignore # ignore/add/remove/force # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = ignore # ignore/add/remove/force +sp_before_byref_func = ignore # ignore/add/remove/force # Add or remove space between type and word. Default=Force -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # ignore/add/remove/force # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. -sp_template_angle = ignore # ignore/add/remove/force +sp_template_angle = ignore # ignore/add/remove/force # Add or remove space before '<>' -sp_before_angle = force # ignore/add/remove/force +sp_before_angle = force # ignore/add/remove/force # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # ignore/add/remove/force # Add or remove space after '<>' -sp_after_angle = ignore # ignore/add/remove/force +sp_after_angle = ignore # ignore/add/remove/force # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = ignore # ignore/add/remove/force +sp_angle_paren = ignore # ignore/add/remove/force # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = ignore # ignore/add/remove/force +sp_angle_word = ignore # ignore/add/remove/force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = add # ignore/add/remove/force +sp_before_sparen = add # ignore/add/remove/force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # ignore/add/remove/force # Add or remove space before if-condition ')'. Overrides sp_inside_sparen. -sp_inside_sparen_close = remove # ignore/add/remove/force +sp_inside_sparen_close = remove # ignore/add/remove/force # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # ignore/add/remove/force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = add # ignore/add/remove/force +sp_sparen_brace = add # ignore/add/remove/force # Add or remove space between 'invariant' and '(' in the D language. -sp_invariant_paren = ignore # ignore/add/remove/force +sp_invariant_paren = ignore # ignore/add/remove/force # Add or remove space after the ')' in 'invariant (C) c' in the D language. -sp_after_invariant_paren = ignore # ignore/add/remove/force +sp_after_invariant_paren = ignore # ignore/add/remove/force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # ignore/add/remove/force # Add or remove space before ';'. Default=Remove -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # ignore/add/remove/force # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = remove # ignore/add/remove/force +sp_before_semi_for = remove # ignore/add/remove/force # Add or remove space before a semicolon of an empty part of a for statement. -sp_before_semi_for_empty = remove # ignore/add/remove/force +sp_before_semi_for_empty = remove # ignore/add/remove/force # Add or remove space after ';', except when followed by a comment. Default=Add -sp_after_semi = add # ignore/add/remove/force +sp_after_semi = add # ignore/add/remove/force # Add or remove space after ';' in non-empty 'for' statements. Default=Force -sp_after_semi_for = force # ignore/add/remove/force +sp_after_semi_for = force # ignore/add/remove/force # Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; ). -sp_after_semi_for_empty = remove # ignore/add/remove/force +sp_after_semi_for_empty = remove # ignore/add/remove/force # Add or remove space before '[' (except '[]') -sp_before_square = add # ignore/add/remove/force +sp_before_square = add # ignore/add/remove/force # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # ignore/add/remove/force # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # ignore/add/remove/force # Add or remove space after ',' -sp_after_comma = add # ignore/add/remove/force +sp_after_comma = add # ignore/add/remove/force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # ignore/add/remove/force # Add or remove space before the variadic '...' when preceded by a non-punctuator -sp_before_ellipsis = add # ignore/add/remove/force +sp_before_ellipsis = add # ignore/add/remove/force # Add or remove space after class ':' -sp_after_class_colon = add # ignore/add/remove/force +sp_after_class_colon = add # ignore/add/remove/force # Add or remove space before class ':' -sp_before_class_colon = add # ignore/add/remove/force +sp_before_class_colon = add # ignore/add/remove/force # Add or remove space before case ':'. Default=Remove -sp_before_case_colon = remove # ignore/add/remove/force +sp_before_case_colon = remove # ignore/add/remove/force # Add or remove space between 'operator' and operator sign -sp_after_operator = remove # ignore/add/remove/force +sp_after_operator = remove # ignore/add/remove/force # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = force # ignore/add/remove/force +sp_after_operator_sym = force # ignore/add/remove/force # Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = ignore # ignore/add/remove/force +sp_after_cast = ignore # ignore/add/remove/force # Add or remove spaces inside cast parens -sp_inside_paren_cast = ignore # ignore/add/remove/force +sp_inside_paren_cast = ignore # ignore/add/remove/force # Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = ignore # ignore/add/remove/force +sp_cpp_cast_paren = ignore # ignore/add/remove/force # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # ignore/add/remove/force # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # ignore/add/remove/force # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = ignore # ignore/add/remove/force +sp_inside_braces_enum = ignore # ignore/add/remove/force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = ignore # ignore/add/remove/force +sp_inside_braces_struct = ignore # ignore/add/remove/force # Add or remove space inside '{' and '}' -sp_inside_braces = ignore # ignore/add/remove/force +sp_inside_braces = ignore # ignore/add/remove/force # Add or remove space inside '{}' -sp_inside_braces_empty = add # ignore/add/remove/force +sp_inside_braces_empty = add # ignore/add/remove/force # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = force # ignore/add/remove/force +sp_type_func = force # ignore/add/remove/force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # ignore/add/remove/force # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # ignore/add/remove/force # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # ignore/add/remove/force # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # ignore/add/remove/force # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = remove # ignore/add/remove/force +sp_square_fparen = remove # ignore/add/remove/force # Add or remove space between ')' and '{' of function -sp_fparen_brace = add # ignore/add/remove/force +sp_fparen_brace = add # ignore/add/remove/force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # ignore/add/remove/force # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = remove # ignore/add/remove/force +sp_func_call_user_paren = remove # ignore/add/remove/force # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # ignore/add/remove/force # Add or remove space between 'return' and '(' -sp_return_paren = ignore # ignore/add/remove/force +sp_return_paren = ignore # ignore/add/remove/force # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # ignore/add/remove/force # Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = ignore # ignore/add/remove/force +sp_defined_paren = ignore # ignore/add/remove/force # Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = ignore # ignore/add/remove/force +sp_throw_paren = ignore # ignore/add/remove/force # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # ignore/add/remove/force # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # ignore/add/remove/force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = add # ignore/add/remove/force +sp_else_brace = add # ignore/add/remove/force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # ignore/add/remove/force # Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = add # ignore/add/remove/force +sp_brace_typedef = add # ignore/add/remove/force # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # ignore/add/remove/force # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # ignore/add/remove/force # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = force # ignore/add/remove/force +sp_try_brace = force # ignore/add/remove/force # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # ignore/add/remove/force # Add or remove space before the '::' operator -sp_before_dc = ignore # ignore/add/remove/force +sp_before_dc = ignore # ignore/add/remove/force # Add or remove space after the '::' operator -sp_after_dc = ignore # ignore/add/remove/force +sp_after_dc = ignore # ignore/add/remove/force # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # ignore/add/remove/force # Add or remove space after the '!' (not) operator. Default=Remove -sp_not = remove # ignore/add/remove/force +sp_not = remove # ignore/add/remove/force # Add or remove space after the '~' (invert) operator. Default=Remove -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # ignore/add/remove/force # Add or remove space after the '&' (address-of) operator. Default=Remove # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # ignore/add/remove/force # Add or remove space around the '.' or '->' operators. Default=Remove -sp_member = remove # ignore/add/remove/force +sp_member = remove # ignore/add/remove/force # Add or remove space after the '*' (dereference) operator. Default=Remove # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # ignore/add/remove/force # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # ignore/add/remove/force # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # ignore/add/remove/force # Add or remove space before a backslash-newline at the end of a line. Default=Add -sp_before_nl_cont = add # ignore/add/remove/force +sp_before_nl_cont = add # ignore/add/remove/force # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = add # ignore/add/remove/force +sp_after_oc_scope = add # ignore/add/remove/force # Add or remove space after the colon in message specs # '-(int) f:(int) x;' vs '-(int) f: (int) x;' -sp_after_oc_colon = remove # ignore/add/remove/force +sp_after_oc_colon = remove # ignore/add/remove/force # Add or remove space before the colon in message specs # '-(int) f: (int) x;' vs '-(int) f : (int) x;' -sp_before_oc_colon = remove # ignore/add/remove/force +sp_before_oc_colon = remove # ignore/add/remove/force # Add or remove space after the colon in message specs # '[object setValue:1];' vs '[object setValue: 1];' -sp_after_send_oc_colon = remove # ignore/add/remove/force +sp_after_send_oc_colon = remove # ignore/add/remove/force # Add or remove space before the colon in message specs # '[object setValue:1];' vs '[object setValue :1];' -sp_before_send_oc_colon = remove # ignore/add/remove/force +sp_before_send_oc_colon = remove # ignore/add/remove/force # Add or remove space after the (type) in message specs # '-(int)f: (int) x;' vs '-(int)f: (int)x;' -sp_after_oc_type = remove # ignore/add/remove/force +sp_after_oc_type = remove # ignore/add/remove/force # Add or remove space after the first (type) in message specs # '-(int) f:(int)x;' vs '-(int)f:(int)x;' -sp_after_oc_return_type = force # ignore/add/remove/force +sp_after_oc_return_type = force # ignore/add/remove/force # Add or remove space between '@selector' and '(' # '@selector(msgName)' vs '@selector (msgName)' # Also applies to @protocol() constructs -sp_after_oc_at_sel = remove # ignore/add/remove/force +sp_after_oc_at_sel = remove # ignore/add/remove/force # Add or remove space between '@selector(x)' and the following word # '@selector(foo) a:' vs '@selector(foo)a:' -sp_after_oc_at_sel_parens = add # ignore/add/remove/force +sp_after_oc_at_sel_parens = add # ignore/add/remove/force # Add or remove space inside '@selector' parens # '@selector(foo)' vs '@selector( foo )' # Also applies to @protocol() constructs -sp_inside_oc_at_sel_parens = remove # ignore/add/remove/force +sp_inside_oc_at_sel_parens = remove # ignore/add/remove/force # Add or remove space before a block pointer caret # '^int (int arg){...}' vs. ' ^int (int arg){...}' -sp_before_oc_block_caret = add # ignore/add/remove/force +sp_before_oc_block_caret = add # ignore/add/remove/force # Add or remove space after a block pointer caret # '^int (int arg){...}' vs. '^ int (int arg){...}' -sp_after_oc_block_caret = ignore # ignore/add/remove/force +sp_after_oc_block_caret = ignore # ignore/add/remove/force # Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = add # ignore/add/remove/force +sp_cond_colon = add # ignore/add/remove/force # Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = add # ignore/add/remove/force +sp_cond_question = add # ignore/add/remove/force # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = force # ignore/add/remove/force +sp_case_label = force # ignore/add/remove/force # Control the space around the D '..' operator. -sp_range = ignore # ignore/add/remove/force +sp_range = ignore # ignore/add/remove/force # Control the space after the opening of a C++ comment '// A' vs '//A' -sp_cmt_cpp_start = ignore # ignore/add/remove/force +sp_cmt_cpp_start = ignore # ignore/add/remove/force # Controls the spaces between #else or #endif and a trailing comment -sp_endif_cmt = ignore # ignore/add/remove/force +sp_endif_cmt = ignore # ignore/add/remove/force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # false/true # Whether to use tabs for aligning -align_with_tabs = false # false/true +align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # false/true # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # false/true # Align variable definitions in prototypes and functions -align_func_params = false # false/true +align_func_params = false # false/true # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = true # false/true +align_same_func_call_params = true # false/true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 0 # number +align_var_def_span = 0 # number # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 1 # number +align_var_def_star_style = 1 # number # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 1 # number +align_var_def_amp_style = 1 # number # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # number # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # number # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # false/true # Whether to align any attribute after the variable name -align_var_def_attribute = false # false/true +align_var_def_attribute = false # false/true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = false # false/true +align_var_def_inline = false # false/true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 0 # number +align_assign_span = 0 # number # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 # number # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 2 # number +align_enum_equ_span = 2 # number # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # number # The span for aligning struct/union (0=don't align) -align_var_struct_span = 0 # number +align_var_struct_span = 0 # number # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # number # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # number # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 0 # number +align_struct_init_span = 0 # number # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number +align_typedef_gap = 0 # number # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 0 # number +align_typedef_span = 0 # number # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # number # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typedef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # number # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typedef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # number # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 0 # number +align_right_cmt_span = 0 # number # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # false/true # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. This has to be > 0 to do anything. -align_right_cmt_gap = 0 # number +align_right_cmt_gap = 0 # number # Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore) -align_right_cmt_at_col = 0 # number +align_right_cmt_at_col = 0 # number # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # number # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # number # Align function protos on the 'operator' keyword instead of what follows -align_on_operator = false # false/true +align_on_operator = false # false/true # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # false/true # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true +align_single_line_func = false # false/true # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # false/true # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # number # The span for aligning ObjC msg spec (0=don't align) -align_oc_msg_spec_span = 0 # number +align_oc_msg_spec_span = 0 # number # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = false # false/true +align_nl_cont = false # false/true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 0 # number +align_pp_define_gap = 0 # number # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 0 # number +align_pp_define_span = 0 # number # Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = true # false/true +align_left_shift = true # false/true # Span for aligning parameters in an Obj-C message call on the ':' (0=don't align) -align_oc_msg_colon_span = 1 # number +align_oc_msg_colon_span = 1 # number # Aligning parameters in an Obj-C '+' or '-' declaration on the ':' -align_oc_decl_colon = true # false/true +align_oc_decl_colon = true # false/true # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # false/true # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = false # false/true +nl_assign_leave_one_liners = false # false/true # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = true # false/true +nl_class_leave_one_liners = true # false/true # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = true # false/true +nl_enum_leave_one_liners = true # false/true # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # false/true # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # false/true # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # false/true # Add or remove newlines at the start of the file -nl_start_of_file = ignore # ignore/add/remove/force +nl_start_of_file = ignore # ignore/add/remove/force # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # number # Add or remove newline at the end of the file -nl_end_of_file = ignore # ignore/add/remove/force +nl_end_of_file = ignore # ignore/add/remove/force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 0 # number +nl_end_of_file_min = 0 # number # Add or remove newline between '=' and '{' -nl_assign_brace = remove # ignore/add/remove/force +nl_assign_brace = remove # ignore/add/remove/force # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # ignore/add/remove/force # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # ignore/add/remove/force # The number of blank lines after a block of variable definitions -nl_func_var_def_blk = 0 # number +nl_func_var_def_blk = 0 # number # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = remove # ignore/add/remove/force +nl_fcall_brace = remove # ignore/add/remove/force # Add or remove newline between 'enum' and '{' -nl_enum_brace = remove # ignore/add/remove/force +nl_enum_brace = remove # ignore/add/remove/force # Add or remove newline between 'struct and '{' -nl_struct_brace = remove # ignore/add/remove/force +nl_struct_brace = remove # ignore/add/remove/force # Add or remove newline between 'union' and '{' -nl_union_brace = remove # ignore/add/remove/force +nl_union_brace = remove # ignore/add/remove/force # Add or remove newline between 'if' and '{' -nl_if_brace = remove # ignore/add/remove/force +nl_if_brace = remove # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # ignore/add/remove/force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = ignore # ignore/add/remove/force +nl_elseif_brace = ignore # ignore/add/remove/force # Add or remove newline between 'else' and '{' -nl_else_brace = remove # ignore/add/remove/force +nl_else_brace = remove # ignore/add/remove/force # Add or remove newline between 'else' and 'if' -nl_else_if = ignore # ignore/add/remove/force +nl_else_if = ignore # ignore/add/remove/force # Add or remove newline between '}' and 'finally' -nl_brace_finally = ignore # ignore/add/remove/force +nl_brace_finally = ignore # ignore/add/remove/force # Add or remove newline between 'finally' and '{' -nl_finally_brace = ignore # ignore/add/remove/force +nl_finally_brace = ignore # ignore/add/remove/force # Add or remove newline between 'try' and '{' -nl_try_brace = remove # ignore/add/remove/force +nl_try_brace = remove # ignore/add/remove/force # Add or remove newline between get/set and '{' -nl_getset_brace = remove # ignore/add/remove/force +nl_getset_brace = remove # ignore/add/remove/force # Add or remove newline between 'for' and '{' -nl_for_brace = remove # ignore/add/remove/force +nl_for_brace = remove # ignore/add/remove/force # Add or remove newline between 'catch' and '{' -nl_catch_brace = remove # ignore/add/remove/force +nl_catch_brace = remove # ignore/add/remove/force # Add or remove newline between '}' and 'catch' -nl_brace_catch = add # ignore/add/remove/force +nl_brace_catch = add # ignore/add/remove/force # Add or remove newline between 'while' and '{' -nl_while_brace = remove # ignore/add/remove/force +nl_while_brace = remove # ignore/add/remove/force # Add or remove newline between 'using' and '{' -nl_using_brace = ignore # ignore/add/remove/force +nl_using_brace = ignore # ignore/add/remove/force # Add or remove newline between two open or close braces. # Due to general newline/brace handling, REMOVE may not work. -nl_brace_brace = ignore # ignore/add/remove/force +nl_brace_brace = ignore # ignore/add/remove/force # Add or remove newline between 'do' and '{' -nl_do_brace = remove # ignore/add/remove/force +nl_do_brace = remove # ignore/add/remove/force # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = ignore # ignore/add/remove/force +nl_brace_while = ignore # ignore/add/remove/force # Add or remove newline between 'switch' and '{' -nl_switch_brace = remove # ignore/add/remove/force +nl_switch_brace = remove # ignore/add/remove/force # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # false/true # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = false # false/true +nl_multi_line_define = false # false/true # Whether to put a newline before 'case' statement -nl_before_case = false # false/true +nl_before_case = false # false/true # Add or remove newline between ')' and 'throw' -nl_before_throw = ignore # ignore/add/remove/force +nl_before_throw = ignore # ignore/add/remove/force # Whether to put a newline after 'case' statement -nl_after_case = false # false/true +nl_after_case = false # false/true # Newline between namespace and { -nl_namespace_brace = ignore # ignore/add/remove/force +nl_namespace_brace = ignore # ignore/add/remove/force # Add or remove newline between 'template<>' and whatever follows. -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # ignore/add/remove/force # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # ignore/add/remove/force # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in a function definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # ignore/add/remove/force # Add or remove newline between return type and function name inside a class {} # Uses nl_func_type_name or nl_func_proto_type_name if set to ignore. -nl_func_type_name_class = ignore # ignore/add/remove/force +nl_func_type_name_class = ignore # ignore/add/remove/force # Add or remove newline between function scope and name in a definition # Controls the newline after '::' in 'void A::f() { }' -nl_func_scope_name = ignore # ignore/add/remove/force +nl_func_scope_name = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = ignore # ignore/add/remove/force +nl_func_proto_type_name = ignore # ignore/add/remove/force # Add or remove newline between a function name and the opening '(' -nl_func_paren = remove # ignore/add/remove/force +nl_func_paren = remove # ignore/add/remove/force # Add or remove newline after '(' in a function declaration -nl_func_decl_start = remove # ignore/add/remove/force +nl_func_decl_start = remove # ignore/add/remove/force # Overrides nl_func_decl_start when there is only one paramter. -nl_func_decl_start_single = ignore # ignore/add/remove/force +nl_func_decl_start_single = ignore # ignore/add/remove/force # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # ignore/add/remove/force # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = remove # ignore/add/remove/force +nl_func_decl_end = remove # ignore/add/remove/force # Overrides nl_func_decl_end when there is only one paramter. -nl_func_decl_end_single = ignore # ignore/add/remove/force +nl_func_decl_end_single = ignore # ignore/add/remove/force # Add or remove newline between '()' in a function declaration. -nl_func_decl_empty = ignore # ignore/add/remove/force +nl_func_decl_empty = ignore # ignore/add/remove/force # Add or remove newline between function signature and '{' -nl_fdef_brace = remove # ignore/add/remove/force +nl_fdef_brace = remove # ignore/add/remove/force # Whether to put a newline after 'return' statement -nl_after_return = false # false/true +nl_after_return = false # false/true # Add or remove a newline between the return keyword and return expression. -nl_return_expr = ignore # ignore/add/remove/force +nl_return_expr = ignore # ignore/add/remove/force # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # false/true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = true # false/true +nl_after_brace_open = true # false/true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true +nl_after_brace_open_cmt = false # false/true # Whether to put a newline after a virtual brace open with a non-empty body. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = false # false/true +nl_after_vbrace_open = false # false/true # Whether to put a newline after a virtual brace open with an empty body. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open_empty = false # false/true +nl_after_vbrace_open_empty = false # false/true # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. -nl_after_brace_close = true # false/true +nl_after_brace_close = true # false/true # Whether to put a newline after a virtual brace close. # Would add a newline before return in: 'if (foo) a++; return;' -nl_after_vbrace_close = false # false/true +nl_after_vbrace_close = false # false/true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # false/true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = true # false/true +nl_squeeze_ifdef = true # false/true # Add or remove blank line before 'if' -nl_before_if = remove # ignore/add/remove/force +nl_before_if = remove # ignore/add/remove/force # Add or remove blank line after 'if' statement -nl_after_if = remove # ignore/add/remove/force +nl_after_if = remove # ignore/add/remove/force # Add or remove blank line before 'for' -nl_before_for = add # ignore/add/remove/force +nl_before_for = add # ignore/add/remove/force # Add or remove blank line after 'for' statement -nl_after_for = remove # ignore/add/remove/force +nl_after_for = remove # ignore/add/remove/force # Add or remove blank line before 'while' -nl_before_while = add # ignore/add/remove/force +nl_before_while = add # ignore/add/remove/force # Add or remove blank line after 'while' statement -nl_after_while = remove # ignore/add/remove/force +nl_after_while = remove # ignore/add/remove/force # Add or remove blank line before 'switch' -nl_before_switch = add # ignore/add/remove/force +nl_before_switch = add # ignore/add/remove/force # Add or remove blank line after 'switch' statement -nl_after_switch = remove # ignore/add/remove/force +nl_after_switch = remove # ignore/add/remove/force # Add or remove blank line before 'do' -nl_before_do = add # ignore/add/remove/force +nl_before_do = add # ignore/add/remove/force # Add or remove blank line after 'do/while' statement -nl_after_do = remove # ignore/add/remove/force +nl_after_do = remove # ignore/add/remove/force # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # false/true # Whether to double-space before the close brace of a struct/union/enum # (lower priority than 'eat_blanks_before_close_brace') -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # false/true # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # ignore/add/remove/force # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # false/true # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # false/true # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # false/true # # Positioning options # # The position of arithmetic operators in wrapped expressions -pos_arith = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_arith = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of assignment in wrapped expressions. # Do not affect '=' followed by '{' -pos_assign = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_assign = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of boolean operators in wrapped expressions -pos_bool = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_bool = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of comparison operators in wrapped expressions -pos_compare = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_compare = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of conditional (b ? t : f) operators in wrapped expressions -pos_conditional = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_conditional = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of the comma in wrapped expressions -pos_comma = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_comma = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of the comma in the constructor initialization list -pos_class_comma = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_comma = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_colon = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # number # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = true # false/true +ls_for_split_full = true # false/true # Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true +ls_func_split_full = false # false/true # # Blank line options # # The maximum consecutive newlines -nl_max = 2 # number +nl_max = 2 # number # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # number # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 0 # number +nl_after_func_proto_group = 0 # number # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 0 # number +nl_after_func_body = 0 # number # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 0 # number +nl_after_func_body_one_liner = 0 # number # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 0 # number +nl_before_block_comment = 0 # number # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # number # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # number # Whether to force a newline after a multi-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # false/true # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 1 # number +nl_before_access_spec = 1 # number # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # number # The number of newlines between a function def and the function comment. # 0 = No change. -nl_comment_func_def = 0 # number +nl_comment_func_def = 0 # number # The number of newlines after a try-catch-finally block that isn't followed by a brace close. # 0 = No change. -nl_after_try_catch_finally = 0 # number +nl_after_try_catch_finally = 0 # number # The number of newlines before and after a property, indexer or event decl. # 0 = No change. -nl_around_cs_property = 0 # number +nl_around_cs_property = 0 # number # The number of newlines between the get/set/add/remove handlers in C#. # 0 = No change. -nl_between_get_set = 0 # number +nl_between_get_set = 0 # number # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # false/true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # false/true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # ignore/add/remove/force # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # ignore/add/remove/force # Add or remove braces on single-line function definitions. (Pawn) -mod_full_brace_function = add # ignore/add/remove/force +mod_full_brace_function = add # ignore/add/remove/force # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # ignore/add/remove/force # Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if. # If any must be braced, they are all braced. If all can be unbraced, then the braces are removed. -mod_full_brace_if_chain = false # false/true +mod_full_brace_if_chain = false # false/true # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # number # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # ignore/add/remove/force # Add or remove braces on single-line 'using ()' statement -mod_full_brace_using = ignore # ignore/add/remove/force +mod_full_brace_using = ignore # ignore/add/remove/force # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = remove # ignore/add/remove/force +mod_paren_on_return = remove # ignore/add/remove/force # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # false/true # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = false # false/true +mod_full_paren_if_bool = false # false/true # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = true # false/true +mod_remove_extra_semicolon = true # false/true # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 10 # number +mod_add_long_function_closebrace_comment = 10 # number # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number +mod_add_long_switch_closebrace_comment = 0 # number # If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after # the #else, a comment will be added. -mod_add_long_ifdef_endif_comment = 0 # number +mod_add_long_ifdef_endif_comment = 0 # number # If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after # the #endif, a comment will be added. -mod_add_long_ifdef_else_comment = 0 # number +mod_add_long_ifdef_else_comment = 0 # number # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # false/true # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # false/true # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # false/true # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = true # false/true +mod_move_case_break = true # false/true # Will add or remove the braces around a fully braced case statement. # Will only remove the braces if there are no variable declarations in the block. -mod_case_brace = force # ignore/add/remove/force +mod_case_brace = force # ignore/add/remove/force # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = true # false/true +mod_remove_empty_return = true # false/true # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # number # Set the comment reflow mode (default: 0) # 0: no reflowing (apart from the line wrapping due to cmt_width) # 1: no touching at all # 2: full reflow -cmt_reflow_mode = 0 # number +cmt_reflow_mode = 0 # number # If false, disable all multi-line comment changes, including cmt_width. keyword substitution, and leading chars. # Default is true. -cmt_indent_multi = false # false/true +cmt_indent_multi = false # false/true # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # false/true # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # false/true # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # false/true # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # false/true # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # false/true # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # false/true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # number # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # number # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true # false/true # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # string # The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_footer = "" # string +cmt_insert_file_footer = "" # string # The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment. # Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # string # The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment. # Will substitute $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # string # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true +cmt_insert_before_preproc = false # false/true # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # ignore/add/remove/force # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # false/true # If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. -pp_indent_count = 1 # number +pp_indent_count = 1 # number # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # ignore/add/remove/force # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # number # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # number # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # false/true # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # number # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true +pp_if_indent_code = false # false/true # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # false/true # You can force a token to be a type with the 'type' option. # Example: @@ -1343,4 +1343,4 @@ pp_define_at_level = false # false/true # all tokens are separated by any mix of ',' commas, '=' equal signs # and whitespace (space, tab) # -set OC_PROPERTY OC_MSG_SPEC +set OC_PROPERTY OC_MSG_SPEC diff --git a/tests/config/bug_472.cfg b/tests/config/bug_472.cfg index ea204d841e..1cc878ba4f 100644 --- a/tests/config/bug_472.cfg +++ b/tests/config/bug_472.cfg @@ -1,5 +1,5 @@ -nl_func_type_name = remove # ignore/add/remove/force -nl_func_proto_type_name = remove # ignore/add/remove/force -nl_after_func_proto = 0 # number -nl_after_func_proto_group = 0 # number -set type dbgTrace +nl_func_type_name = remove # ignore/add/remove/force +nl_func_proto_type_name = remove # ignore/add/remove/force +nl_after_func_proto = 0 # number +nl_after_func_proto_group = 0 # number +set type dbgTrace diff --git a/tests/config/bug_488.cfg b/tests/config/bug_488.cfg index 3b4c2782fa..159897a8dd 100644 --- a/tests/config/bug_488.cfg +++ b/tests/config/bug_488.cfg @@ -1,4 +1,4 @@ -output_tab_size = 8 -indent_columns = 8 -indent_continue = -4 -indent_with_tabs =0 +output_tab_size = 8 +indent_columns = 8 +indent_continue = -4 +indent_with_tabs = 0 diff --git a/tests/config/bug_489.cfg b/tests/config/bug_489.cfg index d3201a6ea9..e7d6fa68a0 100644 --- a/tests/config/bug_489.cfg +++ b/tests/config/bug_489.cfg @@ -1,199 +1,199 @@ -indent_align_string=false -indent_braces=false -indent_braces_no_func=false -indent_brace_parent=false -indent_namespace=false -indent_extern=false -indent_class=false -indent_class_colon=false -indent_else_if=false -indent_func_call_param=true -indent_func_def_param=true -indent_func_proto_param=true -indent_func_class_param=true -indent_func_ctor_var_param=true -indent_template_param=true -indent_func_param_double=true -indent_relative_single_line_comments=false -indent_col1_comment=true -indent_access_spec_body=false -indent_paren_nl=false -indent_comma_paren=false -indent_bool_paren=false -indent_square_nl=false -indent_preserve_sql=false -indent_align_assign=false -sp_balance_nested_parens=false -align_keep_tabs=false -align_with_tabs=false -align_on_tabstop=false -align_number_right=false -align_func_params=false -align_same_func_call_params=false -align_var_def_colon=false -align_var_def_attribute=false -align_var_def_inline=false -align_right_cmt_mix=false -align_on_operator=false -align_mix_var_proto=false -align_single_line_func=false -align_single_line_brace=false -align_nl_cont=false -align_left_shift=false -nl_collapse_empty_body=false -nl_assign_leave_one_liners=false -nl_class_leave_one_liners=false -nl_enum_leave_one_liners=false -nl_getset_leave_one_liners=false -nl_func_leave_one_liners=false -nl_if_leave_one_liners=false -nl_multi_line_cond=false -nl_multi_line_define=false -nl_before_case=true -nl_after_case=true -nl_after_return=true -nl_after_semicolon=false -nl_after_brace_open=false -nl_after_brace_open_cmt=false -nl_after_vbrace_open=false -nl_after_brace_close=true -nl_define_macro=false -nl_squeeze_ifdef=true -nl_ds_struct_enum_cmt=false -nl_ds_struct_enum_close_brace=false -nl_create_if_one_liner=false -nl_create_for_one_liner=false -nl_create_while_one_liner=false -#ls_for_split_full=true -#ls_func_split_full=true -nl_after_multiline_comment=false -eat_blanks_after_open_brace=true -eat_blanks_before_close_brace=true -mod_pawn_semicolon=false -mod_full_paren_if_bool=false -mod_remove_extra_semicolon=true -mod_sort_import=false -mod_sort_using=false -mod_sort_include=false -mod_move_case_break=false -mod_remove_empty_return=false -cmt_indent_multi=true -cmt_c_group=false -cmt_c_nl_start=false -cmt_c_nl_end=true -cmt_cpp_group=false -cmt_cpp_nl_start=false -cmt_cpp_nl_end=true -cmt_cpp_to_c=true -cmt_star_cont=true -cmt_multi_check_last=true -cmt_insert_before_preproc=false -pp_indent_at_level=false -pp_region_indent_code=false -pp_if_indent_code=false -pp_define_at_level=false -input_tab_size=8 -output_tab_size=8 -string_escape_char=92 -indent_columns=8 -indent_continue=-16 -indent_switch_case=0 -indent_case_shift=0 -indent_case_brace=0 -indent_label=1 -nl_end_of_file_min=1 -code_width=80 -nl_max=2 -nl_after_func_proto=1 -nl_after_func_proto_group=2 -nl_after_func_body=2 -nl_after_func_body_one_liner=2 -nl_before_block_comment=2 -nl_before_c_comment=1 -cmt_width=80 -newlines=crlf -indent_with_tabs=2 -sp_arith=add -sp_assign=add -sp_enum_assign=add -sp_bool=add -sp_compare=add -sp_inside_paren=remove -sp_paren_paren=remove -sp_paren_brace=add -sp_before_ptr_star=force -sp_between_ptr_star=remove -sp_after_ptr_star=remove -sp_sizeof_paren=remove -sp_after_ptr_star_func=remove -sp_func_proto_paren=remove -sp_func_def_paren=remove -sp_func_call_paren=remove -sp_inside_fparens=remove -sp_fparen_brace=force -sp_before_ptr_star_func=force -sp_before_byref=force -sp_after_byref=remove -sp_after_byref_func=remove -sp_before_byref_func=force -sp_after_type=force -sp_before_sparen=force -sp_inside_sparen=remove -sp_inside_sparen_close=remove -sp_after_sparen=force -sp_sparen_brace=force -sp_special_semi=remove -sp_before_semi=remove -sp_before_semi_for=remove -sp_before_semi_for_empty=remove -sp_after_semi_for_empty=remove -sp_after_comma=force -sp_before_comma=remove -sp_before_case_colon=remove -sp_after_cast=remove -sp_inside_paren_cast=remove -sp_else_brace=force -sp_brace_else=force -sp_brace_typedef=force -sp_not=remove -sp_inv=remove -sp_addr=remove -sp_member=remove -sp_deref=remove -sp_sign=remove -sp_incdec=remove -sp_before_nl_cont=force -sp_cond_colon=add -sp_cond_question=add -sp_case_label=force -nl_start_of_file=remove -nl_end_of_file=force -nl_assign_brace=remove -nl_enum_brace=remove -nl_struct_brace=remove -nl_union_brace=remove -nl_if_brace=remove -nl_brace_else=remove -nl_elseif_brace=remove -nl_else_brace=remove -nl_else_if=remove -nl_for_brace=remove -nl_while_brace=remove -nl_do_brace=remove -nl_brace_while=remove -nl_switch_brace=remove -nl_func_type_name=remove -nl_func_proto_type_name=remove -nl_func_paren=remove -nl_fdef_brace=force -nl_return_expr=remove -nl_after_if=add -pos_assign=lead -pos_bool=trail -pos_comma=trail -pos_class_colon=trail -mod_full_brace_do=add -mod_full_brace_for=add -mod_full_brace_function=add -mod_full_brace_while=add -mod_full_brace_if=add \ No newline at end of file +indent_align_string = false +indent_braces = false +indent_braces_no_func = false +indent_brace_parent = false +indent_namespace = false +indent_extern = false +indent_class = false +indent_class_colon = false +indent_else_if = false +indent_func_call_param = true +indent_func_def_param = true +indent_func_proto_param = true +indent_func_class_param = true +indent_func_ctor_var_param = true +indent_template_param = true +indent_func_param_double = true +indent_relative_single_line_comments = false +indent_col1_comment = true +indent_access_spec_body = false +indent_paren_nl = false +indent_comma_paren = false +indent_bool_paren = false +indent_square_nl = false +indent_preserve_sql = false +indent_align_assign = false +sp_balance_nested_parens = false +align_keep_tabs = false +align_with_tabs = false +align_on_tabstop = false +align_number_right = false +align_func_params = false +align_same_func_call_params = false +align_var_def_colon = false +align_var_def_attribute = false +align_var_def_inline = false +align_right_cmt_mix = false +align_on_operator = false +align_mix_var_proto = false +align_single_line_func = false +align_single_line_brace = false +align_nl_cont = false +align_left_shift = false +nl_collapse_empty_body = false +nl_assign_leave_one_liners = false +nl_class_leave_one_liners = false +nl_enum_leave_one_liners = false +nl_getset_leave_one_liners = false +nl_func_leave_one_liners = false +nl_if_leave_one_liners = false +nl_multi_line_cond = false +nl_multi_line_define = false +nl_before_case = true +nl_after_case = true +nl_after_return = true +nl_after_semicolon = false +nl_after_brace_open = false +nl_after_brace_open_cmt = false +nl_after_vbrace_open = false +nl_after_brace_close = true +nl_define_macro = false +nl_squeeze_ifdef = true +nl_ds_struct_enum_cmt = false +nl_ds_struct_enum_close_brace = false +nl_create_if_one_liner = false +nl_create_for_one_liner = false +nl_create_while_one_liner = false +#ls_for_split_full=true +#ls_func_split_full=true +nl_after_multiline_comment = false +eat_blanks_after_open_brace = true +eat_blanks_before_close_brace = true +mod_pawn_semicolon = false +mod_full_paren_if_bool = false +mod_remove_extra_semicolon = true +mod_sort_import = false +mod_sort_using = false +mod_sort_include = false +mod_move_case_break = false +mod_remove_empty_return = false +cmt_indent_multi = true +cmt_c_group = false +cmt_c_nl_start = false +cmt_c_nl_end = true +cmt_cpp_group = false +cmt_cpp_nl_start = false +cmt_cpp_nl_end = true +cmt_cpp_to_c = true +cmt_star_cont = true +cmt_multi_check_last = true +cmt_insert_before_preproc = false +pp_indent_at_level = false +pp_region_indent_code = false +pp_if_indent_code = false +pp_define_at_level = false +input_tab_size = 8 +output_tab_size = 8 +string_escape_char = 92 +indent_columns = 8 +indent_continue = -16 +indent_switch_case = 0 +indent_case_shift = 0 +indent_case_brace = 0 +indent_label = 1 +nl_end_of_file_min = 1 +code_width = 80 +nl_max = 2 +nl_after_func_proto = 1 +nl_after_func_proto_group = 2 +nl_after_func_body = 2 +nl_after_func_body_one_liner = 2 +nl_before_block_comment = 2 +nl_before_c_comment = 1 +cmt_width = 80 +newlines = crlf +indent_with_tabs = 2 +sp_arith = add +sp_assign = add +sp_enum_assign = add +sp_bool = add +sp_compare = add +sp_inside_paren = remove +sp_paren_paren = remove +sp_paren_brace = add +sp_before_ptr_star = force +sp_between_ptr_star = remove +sp_after_ptr_star = remove +sp_sizeof_paren = remove +sp_after_ptr_star_func = remove +sp_func_proto_paren = remove +sp_func_def_paren = remove +sp_func_call_paren = remove +sp_inside_fparens = remove +sp_fparen_brace = force +sp_before_ptr_star_func = force +sp_before_byref = force +sp_after_byref = remove +sp_after_byref_func = remove +sp_before_byref_func = force +sp_after_type = force +sp_before_sparen = force +sp_inside_sparen = remove +sp_inside_sparen_close = remove +sp_after_sparen = force +sp_sparen_brace = force +sp_special_semi = remove +sp_before_semi = remove +sp_before_semi_for = remove +sp_before_semi_for_empty = remove +sp_after_semi_for_empty = remove +sp_after_comma = force +sp_before_comma = remove +sp_before_case_colon = remove +sp_after_cast = remove +sp_inside_paren_cast = remove +sp_else_brace = force +sp_brace_else = force +sp_brace_typedef = force +sp_not = remove +sp_inv = remove +sp_addr = remove +sp_member = remove +sp_deref = remove +sp_sign = remove +sp_incdec = remove +sp_before_nl_cont = force +sp_cond_colon = add +sp_cond_question = add +sp_case_label = force +nl_start_of_file = remove +nl_end_of_file = force +nl_assign_brace = remove +nl_enum_brace = remove +nl_struct_brace = remove +nl_union_brace = remove +nl_if_brace = remove +nl_brace_else = remove +nl_elseif_brace = remove +nl_else_brace = remove +nl_else_if = remove +nl_for_brace = remove +nl_while_brace = remove +nl_do_brace = remove +nl_brace_while = remove +nl_switch_brace = remove +nl_func_type_name = remove +nl_func_proto_type_name = remove +nl_func_paren = remove +nl_fdef_brace = force +nl_return_expr = remove +nl_after_if = add +pos_assign = lead +pos_bool = trail +pos_comma = trail +pos_class_colon = trail +mod_full_brace_do = add +mod_full_brace_for = add +mod_full_brace_function = add +mod_full_brace_while = add +mod_full_brace_if = add diff --git a/tests/config/bug_600.cfg b/tests/config/bug_600.cfg index 88f1d6746d..bd45658a41 100644 --- a/tests/config/bug_600.cfg +++ b/tests/config/bug_600.cfg @@ -1 +1 @@ -sp_after_type=ignore +sp_after_type = ignore diff --git a/tests/config/bug_612.cfg b/tests/config/bug_612.cfg index 25d01505d8..a9ef749281 100644 --- a/tests/config/bug_612.cfg +++ b/tests/config/bug_612.cfg @@ -1,2 +1,2 @@ -align_assign_span = 1 -align_assign_thresh = 5 +align_assign_span = 1 +align_assign_thresh = 5 diff --git a/tests/config/bug_620.cfg b/tests/config/bug_620.cfg index b2283f1f24..d6e5261a38 100644 --- a/tests/config/bug_620.cfg +++ b/tests/config/bug_620.cfg @@ -1,5 +1,5 @@ -nl_getset_brace=force -nl_getset_leave_one_liners=true -nl_after_brace_close=true -nl_property_brace=force -indent_class=true +nl_getset_brace = force +nl_getset_leave_one_liners = true +nl_after_brace_close = true +nl_property_brace = force +indent_class = true diff --git a/tests/config/bug_631.cfg b/tests/config/bug_631.cfg index 41d48ab0a3..55023ea155 100644 --- a/tests/config/bug_631.cfg +++ b/tests/config/bug_631.cfg @@ -1,171 +1,171 @@ -align_func_params=false -align_keep_tabs=false -align_left_shift=true -align_mix_var_proto=false -align_nl_cont=true -align_number_right=false -align_on_operator=false -align_on_tabstop=false -align_right_cmt_mix=false -align_same_func_call_params=false -align_single_line_brace=false -align_single_line_func=false -align_var_def_attribute=false -align_var_def_colon=false -align_var_def_inline=false -align_with_tabs=false -cmt_c_group=false -cmt_c_nl_end=false -cmt_c_nl_start=false -cmt_cpp_group=false -cmt_cpp_nl_end=false -cmt_cpp_nl_start=false -cmt_cpp_to_c=false -cmt_indent_multi=true -cmt_insert_before_preproc=false -cmt_multi_check_last=true -cmt_star_cont=false -code_width=80 -eat_blanks_after_open_brace=true -eat_blanks_before_close_brace=true -indent_access_spec_body=true -indent_align_assign=true -indent_align_string=false -indent_bool_paren=false -indent_brace_parent=false -indent_braces=false -indent_braces_no_func=false -indent_class_colon=true -indent_class=true -indent_col1_comment=false -indent_columns=4 -indent_comma_paren=false -indent_else_if=false -indent_extern=false -indent_func_call_param=false -indent_func_class_param=false -indent_func_ctor_var_param=false -indent_func_def_param=false -indent_func_param_double=false -indent_func_proto_param=false -indent_namespace=false -indent_paren_nl=false -indent_preserve_sql=false -indent_relative_single_line_comments=false -indent_square_nl=false -indent_template_param=false -indent_with_tabs=0 -input_tab_size=4 -ls_code_width=true -ls_for_split_full=true -ls_func_split_full=true -mod_add_long_ifdef_else_comment=10 -mod_full_brace_for=add -mod_full_brace_if=add -mod_full_brace_while=add -mod_full_paren_if_bool=false -mod_move_case_break=false -mod_paren_on_return=remove -mod_pawn_semicolon=false -mod_remove_empty_return=true -mod_remove_extra_semicolon=false -mod_sort_import=false -mod_sort_include=true -mod_sort_using=false -nl_after_access_spec=2 -nl_after_brace_close=false -nl_after_brace_open_cmt=false -nl_after_brace_open=false -nl_after_case=false -nl_after_class=2 -nl_after_func_body=2 -nl_after_func_body_class=2 -nl_after_func_proto=2 -nl_after_func_proto_group=2 -nl_after_multiline_comment=false -nl_after_return=false -nl_after_semicolon=true -nl_after_struct=2 -nl_after_vbrace_open=false -nl_before_access_spec=2 -nl_before_case=false -nl_brace_catch=add -nl_brace_else=add -nl_brace_while=add -nl_catch_brace=add -nl_class_brace=add -nl_class_colon=force -nl_class_init_args=force -nl_class_leave_one_liners=true -nl_collapse_empty_body=false -nl_create_for_one_liner=false -nl_create_if_one_liner=false -nl_create_while_one_liner=false -nl_define_macro=false -nl_ds_struct_enum_close_brace=true -nl_ds_struct_enum_cmt=true -nl_else_brace=add -nl_elseif_brace=add -nl_end_of_file=add -nl_enum_brace=add -nl_enum_leave_one_liners=false -nl_fdef_brace=add -nl_for_brace=add -nl_func_leave_one_liners=true -nl_func_type_name_class=remove -nl_func_type_name=remove -nl_getset_leave_one_liners=true -nl_if_brace=add -nl_if_leave_one_liners=false -nl_max=2 -nl_multi_line_cond=false -nl_multi_line_define=true -nl_namespace_brace=add -nl_squeeze_ifdef=false -nl_struct_brace=add -nl_switch_brace=add -nl_try_brace=add -nl_union_brace=add -nl_while_brace=add -pp_define_at_level=false -pp_if_indent_code=false -pp_indent_at_level=false -pp_indent=remove -pp_region_indent_code=false -sp_after_angle=remove -sp_after_comma=add -sp_after_ptr_star=add -sp_after_sparen=remove -sp_angle_paren=remove -sp_angle_paren_empty=remove -sp_angle_shift=remove -sp_angle_word=add -sp_arith=add -sp_assign=add -sp_balance_nested_parens=false -sp_before_angle=remove -sp_before_byref_func=remove -sp_before_byref=remove -sp_before_ptr_star=remove -sp_before_sparen=remove -sp_before_unnamed_byref=remove -sp_before_unnamed_ptr_star=remove -sp_bool=add -sp_compare=add -sp_enum_assign=add -sp_enum_assign=add -sp_func_call_paren_empty=remove -sp_func_call_paren=remove -sp_inside_angle=remove -sp_inside_braces_enum=add -sp_inside_fparen=remove -sp_inside_paren=remove -sp_inside_sparen_close=remove -sp_inside_sparen=remove -sp_inside_square=remove -sp_macro_func=remove -sp_paren_paren=remove -sp_permit_cpp11_shift=true -sp_sparen_brace=remove -sp_template_angle=remove -set qualifier NO_EXCEPT FINAL +align_func_params = false +align_keep_tabs = false +align_left_shift = true +align_mix_var_proto = false +align_nl_cont = true +align_number_right = false +align_on_operator = false +align_on_tabstop = false +align_right_cmt_mix = false +align_same_func_call_params = false +align_single_line_brace = false +align_single_line_func = false +align_var_def_attribute = false +align_var_def_colon = false +align_var_def_inline = false +align_with_tabs = false +cmt_c_group = false +cmt_c_nl_end = false +cmt_c_nl_start = false +cmt_cpp_group = false +cmt_cpp_nl_end = false +cmt_cpp_nl_start = false +cmt_cpp_to_c = false +cmt_indent_multi = true +cmt_insert_before_preproc = false +cmt_multi_check_last = true +cmt_star_cont = false +code_width = 80 +eat_blanks_after_open_brace = true +eat_blanks_before_close_brace = true +indent_access_spec_body = true +indent_align_assign = true +indent_align_string = false +indent_bool_paren = false +indent_brace_parent = false +indent_braces = false +indent_braces_no_func = false +indent_class_colon = true +indent_class = true +indent_col1_comment = false +indent_columns = 4 +indent_comma_paren = false +indent_else_if = false +indent_extern = false +indent_func_call_param = false +indent_func_class_param = false +indent_func_ctor_var_param = false +indent_func_def_param = false +indent_func_param_double = false +indent_func_proto_param = false +indent_namespace = false +indent_paren_nl = false +indent_preserve_sql = false +indent_relative_single_line_comments = false +indent_square_nl = false +indent_template_param = false +indent_with_tabs = 0 +input_tab_size = 4 +ls_code_width = true +ls_for_split_full = true +ls_func_split_full = true +mod_add_long_ifdef_else_comment = 10 +mod_full_brace_for = add +mod_full_brace_if = add +mod_full_brace_while = add +mod_full_paren_if_bool = false +mod_move_case_break = false +mod_paren_on_return = remove +mod_pawn_semicolon = false +mod_remove_empty_return = true +mod_remove_extra_semicolon = false +mod_sort_import = false +mod_sort_include = true +mod_sort_using = false +nl_after_access_spec = 2 +nl_after_brace_close = false +nl_after_brace_open_cmt = false +nl_after_brace_open = false +nl_after_case = false +nl_after_class = 2 +nl_after_func_body = 2 +nl_after_func_body_class = 2 +nl_after_func_proto = 2 +nl_after_func_proto_group = 2 +nl_after_multiline_comment = false +nl_after_return = false +nl_after_semicolon = true +nl_after_struct = 2 +nl_after_vbrace_open = false +nl_before_access_spec = 2 +nl_before_case = false +nl_brace_catch = add +nl_brace_else = add +nl_brace_while = add +nl_catch_brace = add +nl_class_brace = add +nl_class_colon = force +nl_class_init_args = force +nl_class_leave_one_liners = true +nl_collapse_empty_body = false +nl_create_for_one_liner = false +nl_create_if_one_liner = false +nl_create_while_one_liner = false +nl_define_macro = false +nl_ds_struct_enum_close_brace = true +nl_ds_struct_enum_cmt = true +nl_else_brace = add +nl_elseif_brace = add +nl_end_of_file = add +nl_enum_brace = add +nl_enum_leave_one_liners = false +nl_fdef_brace = add +nl_for_brace = add +nl_func_leave_one_liners = true +nl_func_type_name_class = remove +nl_func_type_name = remove +nl_getset_leave_one_liners = true +nl_if_brace = add +nl_if_leave_one_liners = false +nl_max = 2 +nl_multi_line_cond = false +nl_multi_line_define = true +nl_namespace_brace = add +nl_squeeze_ifdef = false +nl_struct_brace = add +nl_switch_brace = add +nl_try_brace = add +nl_union_brace = add +nl_while_brace = add +pp_define_at_level = false +pp_if_indent_code = false +pp_indent_at_level = false +pp_indent = remove +pp_region_indent_code = false +sp_after_angle = remove +sp_after_comma = add +sp_after_ptr_star = add +sp_after_sparen = remove +sp_angle_paren = remove +sp_angle_paren_empty = remove +sp_angle_shift = remove +sp_angle_word = add +sp_arith = add +sp_assign = add +sp_balance_nested_parens = false +sp_before_angle = remove +sp_before_byref_func = remove +sp_before_byref = remove +sp_before_ptr_star = remove +sp_before_sparen = remove +sp_before_unnamed_byref = remove +sp_before_unnamed_ptr_star = remove +sp_bool = add +sp_compare = add +sp_enum_assign = add +sp_enum_assign = add +sp_func_call_paren_empty = remove +sp_func_call_paren = remove +sp_inside_angle = remove +sp_inside_braces_enum = add +sp_inside_fparen = remove +sp_inside_paren = remove +sp_inside_sparen_close = remove +sp_inside_sparen = remove +sp_inside_square = remove +sp_macro_func = remove +sp_paren_paren = remove +sp_permit_cpp11_shift = true +sp_sparen_brace = remove +sp_template_angle = remove +set qualifier NO_EXCEPT FINAL diff --git a/tests/config/bug_633.cfg b/tests/config/bug_633.cfg index 6c691dc2fe..afaba3a5f9 100644 --- a/tests/config/bug_633.cfg +++ b/tests/config/bug_633.cfg @@ -1,8 +1,8 @@ -indent_columns=4 -indent_with_tabs=0 -sp_arith=add -indent_class=true -# -# bug 633 -# -include "../../etc/msvc.cfg" +indent_columns = 4 +indent_with_tabs = 0 +sp_arith = add +indent_class = true +# +# bug 633 +# +include "../../etc/msvc.cfg" diff --git a/tests/config/bug_634.cfg b/tests/config/bug_634.cfg index c42c64c16d..29727227a4 100644 --- a/tests/config/bug_634.cfg +++ b/tests/config/bug_634.cfg @@ -1 +1 @@ -sp_arith=add +sp_arith = add diff --git a/tests/config/bug_651.cfg b/tests/config/bug_651.cfg index 2231fa269c..36728d28e2 100644 --- a/tests/config/bug_651.cfg +++ b/tests/config/bug_651.cfg @@ -1,5 +1,5 @@ -indent_align_assign=false -indent_columns=2 -indent_continue=5 -indent_with_tabs=0 -use_indent_continue_only_once=true +indent_align_assign = false +indent_columns = 2 +indent_continue = 5 +indent_with_tabs = 0 +use_indent_continue_only_once = true diff --git a/tests/config/bug_657.cfg b/tests/config/bug_657.cfg index 50f8ed5903..6890992eef 100644 --- a/tests/config/bug_657.cfg +++ b/tests/config/bug_657.cfg @@ -1,123 +1,123 @@ -align_assign_span=1 -align_assign_thresh=12 -align_enum_equ_span=16 -align_func_params=true -align_nl_cont=true -align_number_right=true -align_pp_define_gap=4 -align_pp_define_span=3 -align_right_cmt_span=3 -align_struct_init_span=3 -align_typedef_gap=3 -align_typedef_span=5 -align_var_def_colon=true -align_var_def_inline=true -align_var_def_span=1 -align_var_def_star_style=1 -align_var_def_thresh=16 -align_var_struct_span=99 -cmt_insert_class_header="" -cmt_insert_file_footer="" -cmt_insert_file_header="" -cmt_insert_func_header="" -cmt_insert_oc_msg_header="" -cmt_star_cont=true -eat_blanks_after_open_brace=true -eat_blanks_before_close_brace=true -indent_align_string=true -indent_case_brace=3 -indent_class_colon=true -indent_class=true -indent_columns=3 -indent_member=3 -indent_with_tabs=0 -mod_case_brace=remove -mod_full_brace_do=add -mod_full_brace_for=add -mod_full_brace_if=add -mod_full_brace_while=add -mod_full_paren_if_bool=true -mod_remove_empty_return=true -mod_remove_extra_semicolon=true -newlines=lf -nl_after_brace_close=true -nl_after_brace_open=true -nl_after_case=true -nl_after_func_body=3 -nl_after_func_body_class=2 -nl_after_func_proto_group=2 -nl_after_return=true -nl_after_semicolon=true -nl_assign_brace=add -nl_assign_leave_one_liners=true -nl_before_block_comment=2 -nl_before_case=true -nl_brace_else=add -nl_brace_while=remove -nl_class_init_args=force -nl_class_leave_one_liners=true -nl_comment_func_def=1 -nl_do_brace=add -nl_else_brace=add -nl_end_of_file=force -nl_end_of_file_min=1 -nl_enum_brace=force -nl_fcall_brace=add -nl_fdef_brace=add -nl_for_brace=add -nl_func_paren=remove -nl_func_var_def_blk=1 -nl_getset_brace=force -nl_if_brace=add -nl_max=4 -nl_multi_line_define=true -nl_squeeze_ifdef=true -nl_start_of_file=remove -nl_struct_brace=force -nl_switch_brace=add -nl_union_brace=force -nl_while_brace=add -output_tab_size=3 -pos_bool=trail -pos_class_comma=lead -pos_comma=trail -pp_indent=remove -sp_after_angle=force -sp_after_byref=force -sp_after_cast=remove -sp_after_comma=force -sp_after_dc=remove -sp_after_ptr_star=remove -sp_after_sparen=force -sp_arith=force -sp_assign=force -sp_before_angle=remove -sp_before_byref=remove -sp_before_dc=remove -sp_before_ptr_star=force -sp_before_semi_for_empty=force -sp_before_sparen=force -sp_between_ptr_star=remove -sp_bool=force -sp_brace_typedef=force -sp_case_label=remove -sp_compare=force -sp_fparen_brace=add -sp_func_call_paren=remove -sp_func_class_paren=remove -sp_func_def_paren=remove -sp_func_proto_paren=remove -sp_inside_angle=remove -sp_inside_braces_enum=force -sp_inside_braces=force -sp_inside_braces_struct=force -sp_inside_fparen=remove -sp_inside_paren=remove -sp_inside_sparen=remove -sp_inside_square=remove -sp_paren_paren=remove -sp_pp_stringify=add -sp_return_paren=remove -sp_sizeof_paren=remove -sp_sparen_brace=add -sp_type_func=force +align_assign_span = 1 +align_assign_thresh = 12 +align_enum_equ_span = 16 +align_func_params = true +align_nl_cont = true +align_number_right = true +align_pp_define_gap = 4 +align_pp_define_span = 3 +align_right_cmt_span = 3 +align_struct_init_span = 3 +align_typedef_gap = 3 +align_typedef_span = 5 +align_var_def_colon = true +align_var_def_inline = true +align_var_def_span = 1 +align_var_def_star_style = 1 +align_var_def_thresh = 16 +align_var_struct_span = 99 +cmt_insert_class_header = "" +cmt_insert_file_footer = "" +cmt_insert_file_header = "" +cmt_insert_func_header = "" +cmt_insert_oc_msg_header = "" +cmt_star_cont = true +eat_blanks_after_open_brace = true +eat_blanks_before_close_brace = true +indent_align_string = true +indent_case_brace = 3 +indent_class_colon = true +indent_class = true +indent_columns = 3 +indent_member = 3 +indent_with_tabs = 0 +mod_case_brace = remove +mod_full_brace_do = add +mod_full_brace_for = add +mod_full_brace_if = add +mod_full_brace_while = add +mod_full_paren_if_bool = true +mod_remove_empty_return = true +mod_remove_extra_semicolon = true +newlines = lf +nl_after_brace_close = true +nl_after_brace_open = true +nl_after_case = true +nl_after_func_body = 3 +nl_after_func_body_class = 2 +nl_after_func_proto_group = 2 +nl_after_return = true +nl_after_semicolon = true +nl_assign_brace = add +nl_assign_leave_one_liners = true +nl_before_block_comment = 2 +nl_before_case = true +nl_brace_else = add +nl_brace_while = remove +nl_class_init_args = force +nl_class_leave_one_liners = true +nl_comment_func_def = 1 +nl_do_brace = add +nl_else_brace = add +nl_end_of_file = force +nl_end_of_file_min = 1 +nl_enum_brace = force +nl_fcall_brace = add +nl_fdef_brace = add +nl_for_brace = add +nl_func_paren = remove +nl_func_var_def_blk = 1 +nl_getset_brace = force +nl_if_brace = add +nl_max = 4 +nl_multi_line_define = true +nl_squeeze_ifdef = true +nl_start_of_file = remove +nl_struct_brace = force +nl_switch_brace = add +nl_union_brace = force +nl_while_brace = add +output_tab_size = 3 +pos_bool = trail +pos_class_comma = lead +pos_comma = trail +pp_indent = remove +sp_after_angle = force +sp_after_byref = force +sp_after_cast = remove +sp_after_comma = force +sp_after_dc = remove +sp_after_ptr_star = remove +sp_after_sparen = force +sp_arith = force +sp_assign = force +sp_before_angle = remove +sp_before_byref = remove +sp_before_dc = remove +sp_before_ptr_star = force +sp_before_semi_for_empty = force +sp_before_sparen = force +sp_between_ptr_star = remove +sp_bool = force +sp_brace_typedef = force +sp_case_label = remove +sp_compare = force +sp_fparen_brace = add +sp_func_call_paren = remove +sp_func_class_paren = remove +sp_func_def_paren = remove +sp_func_proto_paren = remove +sp_inside_angle = remove +sp_inside_braces_enum = force +sp_inside_braces = force +sp_inside_braces_struct = force +sp_inside_fparen = remove +sp_inside_paren = remove +sp_inside_sparen = remove +sp_inside_square = remove +sp_paren_paren = remove +sp_pp_stringify = add +sp_return_paren = remove +sp_sizeof_paren = remove +sp_sparen_brace = add +sp_type_func = force diff --git a/tests/config/bug_662.cfg b/tests/config/bug_662.cfg index 3bb34e9f42..83385e8aa5 100644 --- a/tests/config/bug_662.cfg +++ b/tests/config/bug_662.cfg @@ -1,2 +1,2 @@ -sp_cmt_cpp_start=add -sp_cmt_cpp_doxygen=true +sp_cmt_cpp_start = add +sp_cmt_cpp_doxygen = true diff --git a/tests/config/bug_663.cfg b/tests/config/bug_663.cfg index 0855fd2d77..831198ebef 100644 --- a/tests/config/bug_663.cfg +++ b/tests/config/bug_663.cfg @@ -1 +1 @@ -pos_compare=lead +pos_compare = lead diff --git a/tests/config/bug_664.cfg b/tests/config/bug_664.cfg index 135398adf3..55336548eb 100644 --- a/tests/config/bug_664.cfg +++ b/tests/config/bug_664.cfg @@ -1,129 +1,129 @@ -tok_split_gte=false -utf8_byte=false -utf8_force=false -indent_cmt_with_tabs=false -indent_align_string=false -indent_braces=false -indent_braces_no_func=false -indent_braces_no_class=false -indent_braces_no_struct=false -indent_brace_parent=false -indent_namespace=false -indent_extern=false -indent_class=true -indent_class_colon=false -indent_else_if=false -indent_var_def_cont=false -indent_func_call_param=false -indent_func_def_param=false -indent_func_proto_param=false -indent_func_class_param=false -indent_func_ctor_var_param=false -indent_template_param=false -indent_func_param_double=false -indent_relative_single_line_comments=false -indent_col1_comment=false -indent_access_spec_body=false -indent_paren_nl=false -indent_comma_paren=false -indent_bool_paren=false -indent_first_bool_expr=false -indent_square_nl=false -indent_preserve_sql=false -indent_align_assign=true -sp_balance_nested_parens=false -align_keep_tabs=false -align_with_tabs=false -align_on_tabstop=false -align_number_right=false -align_func_params=false -align_same_func_call_params=false -align_var_def_colon=false -align_var_def_attribute=false -align_var_def_inline=false -align_right_cmt_mix=false -align_on_operator=false -align_mix_var_proto=false -align_single_line_func=false -align_single_line_brace=false -align_nl_cont=false -align_left_shift=true -align_oc_decl_colon=false -nl_collapse_empty_body=false -nl_assign_leave_one_liners=false -nl_class_leave_one_liners=false -nl_enum_leave_one_liners=false -nl_getset_leave_one_liners=false -nl_func_leave_one_liners=false -nl_if_leave_one_liners=false -nl_multi_line_cond=false -nl_multi_line_define=false -nl_before_case=false -nl_after_case=false -nl_after_return=false -nl_after_semicolon=false -nl_after_brace_open=true -nl_after_brace_open_cmt=false -nl_after_vbrace_open=false -nl_after_vbrace_open_empty=false -nl_after_brace_close=false -nl_after_vbrace_close=false -nl_define_macro=false -nl_squeeze_ifdef=false -nl_ds_struct_enum_cmt=false -nl_ds_struct_enum_close_brace=false -nl_create_if_one_liner=false -nl_create_for_one_liner=false -nl_create_while_one_liner=false -ls_for_split_full=false -ls_func_split_full=false -nl_after_multiline_comment=false -eat_blanks_after_open_brace=false -eat_blanks_before_close_brace=false -mod_full_brace_if_chain=false -mod_pawn_semicolon=false -mod_full_paren_if_bool=false -mod_remove_extra_semicolon=true -mod_sort_import=false -mod_sort_using=false -mod_sort_include=false -mod_move_case_break=false -mod_remove_empty_return=false -cmt_indent_multi=true -cmt_c_group=false -cmt_c_nl_start=false -cmt_c_nl_end=false -cmt_cpp_group=false -cmt_cpp_nl_start=false -cmt_cpp_nl_end=false -cmt_cpp_to_c=false -cmt_star_cont=false -cmt_multi_check_last=true -cmt_insert_before_preproc=false -pp_indent_at_level=false -pp_region_indent_code=false -pp_if_indent_code=false -pp_define_at_level=false -indent_columns=4 -nl_max=2 -nl_after_func_body=2 -indent_with_tabs=0 -sp_arith=add -sp_assign=add -sp_inside_angle=force -sp_before_sparen=add -sp_inside_sparen=add -sp_inside_square=add -sp_func_def_paren=remove -sp_inside_fparen=add -nl_fcall_brace=add -nl_if_brace=add -nl_brace_else=add -nl_elseif_brace=add -nl_else_brace=add -nl_for_brace=add -nl_while_brace=add -nl_fdef_brace=add -mod_full_brace_do=add -mod_full_brace_for=add -mod_full_brace_if=add +tok_split_gte = false +utf8_byte = false +utf8_force = false +indent_cmt_with_tabs = false +indent_align_string = false +indent_braces = false +indent_braces_no_func = false +indent_braces_no_class = false +indent_braces_no_struct = false +indent_brace_parent = false +indent_namespace = false +indent_extern = false +indent_class = true +indent_class_colon = false +indent_else_if = false +indent_var_def_cont = false +indent_func_call_param = false +indent_func_def_param = false +indent_func_proto_param = false +indent_func_class_param = false +indent_func_ctor_var_param = false +indent_template_param = false +indent_func_param_double = false +indent_relative_single_line_comments = false +indent_col1_comment = false +indent_access_spec_body = false +indent_paren_nl = false +indent_comma_paren = false +indent_bool_paren = false +indent_first_bool_expr = false +indent_square_nl = false +indent_preserve_sql = false +indent_align_assign = true +sp_balance_nested_parens = false +align_keep_tabs = false +align_with_tabs = false +align_on_tabstop = false +align_number_right = false +align_func_params = false +align_same_func_call_params = false +align_var_def_colon = false +align_var_def_attribute = false +align_var_def_inline = false +align_right_cmt_mix = false +align_on_operator = false +align_mix_var_proto = false +align_single_line_func = false +align_single_line_brace = false +align_nl_cont = false +align_left_shift = true +align_oc_decl_colon = false +nl_collapse_empty_body = false +nl_assign_leave_one_liners = false +nl_class_leave_one_liners = false +nl_enum_leave_one_liners = false +nl_getset_leave_one_liners = false +nl_func_leave_one_liners = false +nl_if_leave_one_liners = false +nl_multi_line_cond = false +nl_multi_line_define = false +nl_before_case = false +nl_after_case = false +nl_after_return = false +nl_after_semicolon = false +nl_after_brace_open = true +nl_after_brace_open_cmt = false +nl_after_vbrace_open = false +nl_after_vbrace_open_empty = false +nl_after_brace_close = false +nl_after_vbrace_close = false +nl_define_macro = false +nl_squeeze_ifdef = false +nl_ds_struct_enum_cmt = false +nl_ds_struct_enum_close_brace = false +nl_create_if_one_liner = false +nl_create_for_one_liner = false +nl_create_while_one_liner = false +ls_for_split_full = false +ls_func_split_full = false +nl_after_multiline_comment = false +eat_blanks_after_open_brace = false +eat_blanks_before_close_brace = false +mod_full_brace_if_chain = false +mod_pawn_semicolon = false +mod_full_paren_if_bool = false +mod_remove_extra_semicolon = true +mod_sort_import = false +mod_sort_using = false +mod_sort_include = false +mod_move_case_break = false +mod_remove_empty_return = false +cmt_indent_multi = true +cmt_c_group = false +cmt_c_nl_start = false +cmt_c_nl_end = false +cmt_cpp_group = false +cmt_cpp_nl_start = false +cmt_cpp_nl_end = false +cmt_cpp_to_c = false +cmt_star_cont = false +cmt_multi_check_last = true +cmt_insert_before_preproc = false +pp_indent_at_level = false +pp_region_indent_code = false +pp_if_indent_code = false +pp_define_at_level = false +indent_columns = 4 +nl_max = 2 +nl_after_func_body = 2 +indent_with_tabs = 0 +sp_arith = add +sp_assign = add +sp_inside_angle = force +sp_before_sparen = add +sp_inside_sparen = add +sp_inside_square = add +sp_func_def_paren = remove +sp_inside_fparen = add +nl_fcall_brace = add +nl_if_brace = add +nl_brace_else = add +nl_elseif_brace = add +nl_else_brace = add +nl_for_brace = add +nl_while_brace = add +nl_fdef_brace = add +mod_full_brace_do = add +mod_full_brace_for = add +mod_full_brace_if = add diff --git a/tests/config/bug_666.cfg b/tests/config/bug_666.cfg index 6acabd4954..18742a67f8 100644 --- a/tests/config/bug_666.cfg +++ b/tests/config/bug_666.cfg @@ -1,2 +1,2 @@ -indent_else_if = true -nl_after_brace_close = true +indent_else_if = true +nl_after_brace_close = true diff --git a/tests/config/bug_670.cfg b/tests/config/bug_670.cfg index 10bda77bb1..83d14a6cf7 100644 --- a/tests/config/bug_670.cfg +++ b/tests/config/bug_670.cfg @@ -1,307 +1,307 @@ #set FOR foreach #set COMMENT_EMBED Q_OBJECT -indent_member=7 -string_replace_tab_chars=false -tok_split_gte=false -enable_digraphs=false -utf8_byte=false -utf8_force=false -indent_cmt_with_tabs=false -indent_align_string=false -indent_braces=false -indent_braces_no_func=false -indent_braces_no_class=false -indent_braces_no_struct=false -indent_brace_parent=false -indent_paren_open_brace=false -indent_namespace=false -indent_namespace_single_indent=false -indent_extern=true -indent_class=true -indent_class_colon=true -indent_class_on_colon=true -indent_constr_colon=true -indent_else_if=false -indent_var_def_cont=true -indent_shift=false -indent_func_def_force_col1=false -indent_func_call_param=true -indent_func_def_param=true -indent_func_proto_param=true -indent_func_class_param=true -indent_func_ctor_var_param=true -indent_template_param=true -indent_func_param_double=true -indent_relative_single_line_comments=false -indent_col1_comment=false -indent_access_spec_body=false -indent_paren_nl=false -indent_comma_paren=false -indent_bool_paren=false -indent_first_bool_expr=false -indent_square_nl=false -indent_preserve_sql=false -indent_align_assign=true -indent_oc_block=false -indent_oc_msg_prioritize_first_colon=true -indent_oc_block_msg_xcode_style=false -indent_oc_block_msg_from_keyword=false -indent_oc_block_msg_from_colon=false -indent_oc_block_msg_from_caret=false -indent_oc_block_msg_from_brace=false -indent_vbrace_open_on_tabstop=false -sp_balance_nested_parens=false -sp_permit_cpp11_shift=false -sp_cmt_cpp_doxygen=false -sp_cmt_cpp_qttr=false -align_keep_tabs=false -align_with_tabs=false -align_on_tabstop=false -align_number_right=false -align_keep_extra_space=false -align_func_params=true -align_same_func_call_params=false -align_var_def_colon=false -align_var_def_attribute=false -align_var_def_inline=false -align_right_cmt_mix=false -align_on_operator=false -align_mix_var_proto=false -align_single_line_func=false -align_single_line_brace=false -align_nl_cont=false -align_pp_define_together=false -align_left_shift=false -align_oc_msg_colon_first=false -align_oc_decl_colon=false -nl_collapse_empty_body=true -nl_assign_leave_one_liners=false -nl_class_leave_one_liners=false -nl_enum_leave_one_liners=false -nl_getset_leave_one_liners=false -nl_func_leave_one_liners=false -nl_cpp_lambda_leave_one_liners=false -nl_if_leave_one_liners=false -nl_while_leave_one_liners=false -nl_oc_msg_leave_one_liner=false -nl_multi_line_cond=false -nl_multi_line_define=true -nl_before_case=false -nl_after_case=false -nl_oc_msg_args=false -nl_after_semicolon=true -nl_after_brace_open=true -nl_after_brace_open_cmt=false -nl_after_vbrace_open=false -nl_after_vbrace_open_empty=false -nl_after_brace_close=false -nl_after_vbrace_close=false -nl_define_macro=true -nl_squeeze_ifdef=false -nl_ds_struct_enum_cmt=false -nl_ds_struct_enum_close_brace=false -nl_create_if_one_liner=false -nl_create_for_one_liner=false -nl_create_while_one_liner=false -ls_for_split_full=true -ls_func_split_full=true -ls_code_width=false -nl_after_multiline_comment=false -nl_after_label_colon=false -eat_blanks_after_open_brace=false -eat_blanks_before_close_brace=false -nl_before_return=false -nl_after_return=false -mod_full_brace_if_chain=false -mod_pawn_semicolon=true -mod_full_paren_if_bool=false -mod_remove_extra_semicolon=true -mod_sort_import=false -mod_sort_using=false -mod_sort_include=false -mod_move_case_break=false -mod_remove_empty_return=false -cmt_convert_tab_to_spaces=false -cmt_indent_multi=true -cmt_c_group=false -cmt_c_nl_start=true -cmt_c_nl_end=true -cmt_cpp_group=false -cmt_cpp_nl_start=true -cmt_cpp_nl_end=true -cmt_cpp_to_c=false -cmt_star_cont=true -cmt_multi_check_last=true -cmt_insert_before_preproc=true -pp_indent_at_level=true -pp_region_indent_code=true -pp_if_indent_code=false -pp_define_at_level=false -indent_columns=4 -indent_continue=8 -indent_ctor_init=4 -indent_access_spec=-4 -nl_end_of_file_min=1 -code_width=100 -nl_max=2 -nl_after_func_body=3 -nl_after_func_body_class=3 -nl_after_func_body_one_liner=3 -nl_after_class=3 -mod_add_long_ifdef_endif_comment=1 -cmt_width=100 -cmt_reflow_mode=2 -cmt_sp_before_star_cont=0 -pp_indent_count=2 -pp_indent_if=1 -indent_with_tabs=0 -sp_arith=force -sp_assign=force -sp_assign_default=force -sp_enum_assign=force -sp_pp_concat=force -sp_pp_stringify=remove -sp_bool=force -sp_compare=force -sp_inside_paren=force -sp_paren_paren=force -sp_paren_brace=force -sp_before_ptr_star=remove -sp_before_unnamed_ptr_star=ignore -sp_between_ptr_star=remove -sp_after_ptr_star=force -sp_before_byref=remove -sp_after_byref=force -sp_after_type=force -sp_template_angle=remove -sp_before_angle=remove -sp_inside_angle=remove -sp_after_angle=remove -sp_angle_paren=remove -sp_angle_paren_empty=remove -sp_angle_word=force -sp_angle_shift=force -sp_before_sparen=remove -sp_inside_sparen=force -sp_inside_sparen_close=force -sp_after_sparen=force -sp_sparen_brace=force -sp_before_semi=remove -sp_before_semi_for=remove -sp_before_semi_for_empty=remove -sp_after_semi=force -sp_after_semi_for=force -sp_after_semi_for_empty=remove -sp_before_square=remove -sp_before_squares=remove -sp_inside_square=remove -sp_after_comma=force -sp_before_comma=remove -sp_paren_comma=force -sp_after_class_colon=force -sp_before_class_colon=force -sp_before_case_colon=remove -sp_after_operator=remove -sp_after_operator_sym=remove -sp_after_cast=remove -sp_inside_paren_cast=remove -sp_cpp_cast_paren=remove -sp_sizeof_paren=force -sp_inside_braces_empty=remove -sp_type_func=force -sp_func_proto_paren=remove -sp_func_def_paren=remove -sp_inside_fparens=remove -sp_inside_fparen=force -sp_square_fparen=remove -sp_fparen_brace=force -sp_func_call_paren=remove -sp_func_call_paren_empty=remove -sp_func_class_paren=remove -sp_attribute_paren=remove -sp_defined_paren=remove -sp_throw_paren=remove -sp_catch_paren=remove -sp_else_brace=force -sp_brace_else=force -sp_brace_typedef=force -sp_catch_brace=force -sp_brace_catch=force -sp_finally_brace=force -sp_brace_finally=force -sp_try_brace=force -sp_before_dc=remove -sp_after_dc=remove -sp_not=remove -sp_inv=remove -sp_addr=remove -sp_member=remove -sp_deref=remove -sp_sign=remove -sp_incdec=remove -sp_before_nl_cont=force -sp_cond_colon=force -sp_cond_question=force -sp_cmt_cpp_start=force -sp_endif_cmt=force -sp_after_new=force -nl_start_of_file=remove -nl_end_of_file=force -nl_assign_brace=ignore -nl_enum_brace=force -nl_struct_brace=force -nl_union_brace=force -nl_if_brace=remove -nl_brace_else=remove -nl_elseif_brace=remove -nl_else_brace=remove -nl_else_if=remove -nl_for_brace=remove -nl_while_brace=remove -nl_using_brace=force -nl_brace_brace=force -nl_do_brace=remove -nl_brace_while=remove -nl_switch_brace=force -nl_namespace_brace=force -nl_template_class=force -nl_class_brace=force -nl_class_init_args=force -nl_constr_init_args=force +indent_member = 7 +string_replace_tab_chars = false +tok_split_gte = false +enable_digraphs = false +utf8_byte = false +utf8_force = false +indent_cmt_with_tabs = false +indent_align_string = false +indent_braces = false +indent_braces_no_func = false +indent_braces_no_class = false +indent_braces_no_struct = false +indent_brace_parent = false +indent_paren_open_brace = false +indent_namespace = false +indent_namespace_single_indent = false +indent_extern = true +indent_class = true +indent_class_colon = true +indent_class_on_colon = true +indent_constr_colon = true +indent_else_if = false +indent_var_def_cont = true +indent_shift = false +indent_func_def_force_col1 = false +indent_func_call_param = true +indent_func_def_param = true +indent_func_proto_param = true +indent_func_class_param = true +indent_func_ctor_var_param = true +indent_template_param = true +indent_func_param_double = true +indent_relative_single_line_comments = false +indent_col1_comment = false +indent_access_spec_body = false +indent_paren_nl = false +indent_comma_paren = false +indent_bool_paren = false +indent_first_bool_expr = false +indent_square_nl = false +indent_preserve_sql = false +indent_align_assign = true +indent_oc_block = false +indent_oc_msg_prioritize_first_colon = true +indent_oc_block_msg_xcode_style = false +indent_oc_block_msg_from_keyword = false +indent_oc_block_msg_from_colon = false +indent_oc_block_msg_from_caret = false +indent_oc_block_msg_from_brace = false +indent_vbrace_open_on_tabstop = false +sp_balance_nested_parens = false +sp_permit_cpp11_shift = false +sp_cmt_cpp_doxygen = false +sp_cmt_cpp_qttr = false +align_keep_tabs = false +align_with_tabs = false +align_on_tabstop = false +align_number_right = false +align_keep_extra_space = false +align_func_params = true +align_same_func_call_params = false +align_var_def_colon = false +align_var_def_attribute = false +align_var_def_inline = false +align_right_cmt_mix = false +align_on_operator = false +align_mix_var_proto = false +align_single_line_func = false +align_single_line_brace = false +align_nl_cont = false +align_pp_define_together = false +align_left_shift = false +align_oc_msg_colon_first = false +align_oc_decl_colon = false +nl_collapse_empty_body = true +nl_assign_leave_one_liners = false +nl_class_leave_one_liners = false +nl_enum_leave_one_liners = false +nl_getset_leave_one_liners = false +nl_func_leave_one_liners = false +nl_cpp_lambda_leave_one_liners = false +nl_if_leave_one_liners = false +nl_while_leave_one_liners = false +nl_oc_msg_leave_one_liner = false +nl_multi_line_cond = false +nl_multi_line_define = true +nl_before_case = false +nl_after_case = false +nl_oc_msg_args = false +nl_after_semicolon = true +nl_after_brace_open = true +nl_after_brace_open_cmt = false +nl_after_vbrace_open = false +nl_after_vbrace_open_empty = false +nl_after_brace_close = false +nl_after_vbrace_close = false +nl_define_macro = true +nl_squeeze_ifdef = false +nl_ds_struct_enum_cmt = false +nl_ds_struct_enum_close_brace = false +nl_create_if_one_liner = false +nl_create_for_one_liner = false +nl_create_while_one_liner = false +ls_for_split_full = true +ls_func_split_full = true +ls_code_width = false +nl_after_multiline_comment = false +nl_after_label_colon = false +eat_blanks_after_open_brace = false +eat_blanks_before_close_brace = false +nl_before_return = false +nl_after_return = false +mod_full_brace_if_chain = false +mod_pawn_semicolon = true +mod_full_paren_if_bool = false +mod_remove_extra_semicolon = true +mod_sort_import = false +mod_sort_using = false +mod_sort_include = false +mod_move_case_break = false +mod_remove_empty_return = false +cmt_convert_tab_to_spaces = false +cmt_indent_multi = true +cmt_c_group = false +cmt_c_nl_start = true +cmt_c_nl_end = true +cmt_cpp_group = false +cmt_cpp_nl_start = true +cmt_cpp_nl_end = true +cmt_cpp_to_c = false +cmt_star_cont = true +cmt_multi_check_last = true +cmt_insert_before_preproc = true +pp_indent_at_level = true +pp_region_indent_code = true +pp_if_indent_code = false +pp_define_at_level = false +indent_columns = 4 +indent_continue = 8 +indent_ctor_init = 4 +indent_access_spec = -4 +nl_end_of_file_min = 1 +code_width = 100 +nl_max = 2 +nl_after_func_body = 3 +nl_after_func_body_class = 3 +nl_after_func_body_one_liner = 3 +nl_after_class = 3 +mod_add_long_ifdef_endif_comment = 1 +cmt_width = 100 +cmt_reflow_mode = 2 +cmt_sp_before_star_cont = 0 +pp_indent_count = 2 +pp_indent_if = 1 +indent_with_tabs = 0 +sp_arith = force +sp_assign = force +sp_assign_default = force +sp_enum_assign = force +sp_pp_concat = force +sp_pp_stringify = remove +sp_bool = force +sp_compare = force +sp_inside_paren = force +sp_paren_paren = force +sp_paren_brace = force +sp_before_ptr_star = remove +sp_before_unnamed_ptr_star = ignore +sp_between_ptr_star = remove +sp_after_ptr_star = force +sp_before_byref = remove +sp_after_byref = force +sp_after_type = force +sp_template_angle = remove +sp_before_angle = remove +sp_inside_angle = remove +sp_after_angle = remove +sp_angle_paren = remove +sp_angle_paren_empty = remove +sp_angle_word = force +sp_angle_shift = force +sp_before_sparen = remove +sp_inside_sparen = force +sp_inside_sparen_close = force +sp_after_sparen = force +sp_sparen_brace = force +sp_before_semi = remove +sp_before_semi_for = remove +sp_before_semi_for_empty = remove +sp_after_semi = force +sp_after_semi_for = force +sp_after_semi_for_empty = remove +sp_before_square = remove +sp_before_squares = remove +sp_inside_square = remove +sp_after_comma = force +sp_before_comma = remove +sp_paren_comma = force +sp_after_class_colon = force +sp_before_class_colon = force +sp_before_case_colon = remove +sp_after_operator = remove +sp_after_operator_sym = remove +sp_after_cast = remove +sp_inside_paren_cast = remove +sp_cpp_cast_paren = remove +sp_sizeof_paren = force +sp_inside_braces_empty = remove +sp_type_func = force +sp_func_proto_paren = remove +sp_func_def_paren = remove +sp_inside_fparens = remove +sp_inside_fparen = force +sp_square_fparen = remove +sp_fparen_brace = force +sp_func_call_paren = remove +sp_func_call_paren_empty = remove +sp_func_class_paren = remove +sp_attribute_paren = remove +sp_defined_paren = remove +sp_throw_paren = remove +sp_catch_paren = remove +sp_else_brace = force +sp_brace_else = force +sp_brace_typedef = force +sp_catch_brace = force +sp_brace_catch = force +sp_finally_brace = force +sp_brace_finally = force +sp_try_brace = force +sp_before_dc = remove +sp_after_dc = remove +sp_not = remove +sp_inv = remove +sp_addr = remove +sp_member = remove +sp_deref = remove +sp_sign = remove +sp_incdec = remove +sp_before_nl_cont = force +sp_cond_colon = force +sp_cond_question = force +sp_cmt_cpp_start = force +sp_endif_cmt = force +sp_after_new = force +nl_start_of_file = remove +nl_end_of_file = force +nl_assign_brace = ignore +nl_enum_brace = force +nl_struct_brace = force +nl_union_brace = force +nl_if_brace = remove +nl_brace_else = remove +nl_elseif_brace = remove +nl_else_brace = remove +nl_else_if = remove +nl_for_brace = remove +nl_while_brace = remove +nl_using_brace = force +nl_brace_brace = force +nl_do_brace = remove +nl_brace_while = remove +nl_switch_brace = force +nl_namespace_brace = force +nl_template_class = force +nl_class_brace = force +nl_class_init_args = force +nl_constr_init_args = force # guy # Add or remove newline between return type and function name in a function definition -nl_func_type_name=force +nl_func_type_name = force # Add or remove newline between return type and function name inside a class {} # Uses nl_func_type_name or nl_func_proto_type_name if set to ignore. -nl_func_type_name_class=ignore +nl_func_type_name_class = ignore # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name=force +nl_func_proto_type_name = force # guy -nl_func_scope_name=remove -nl_func_paren=remove -nl_func_def_paren=remove -nl_func_decl_start=force -nl_func_def_start=force -nl_func_decl_start_single=remove -nl_func_def_start_single=remove -nl_func_decl_args=force -nl_func_def_args=force -nl_func_decl_end=remove -nl_func_def_end=remove -nl_func_decl_empty=remove -nl_func_def_empty=remove -nl_fdef_brace=force -nl_return_expr=ignore -nl_class_colon=ignore -pos_bool=lead -pos_class_comma=trail -pos_constr_comma=trail -pos_class_colon=lead -pos_constr_colon=lead -mod_full_brace_do=force -mod_full_brace_for=force -mod_full_brace_function=force -mod_full_brace_if=force -mod_paren_on_return=remove -pp_indent=remove -pp_space=remove +nl_func_scope_name = remove +nl_func_paren = remove +nl_func_def_paren = remove +nl_func_decl_start = force +nl_func_def_start = force +nl_func_decl_start_single = remove +nl_func_def_start_single = remove +nl_func_decl_args = force +nl_func_def_args = force +nl_func_decl_end = remove +nl_func_def_end = remove +nl_func_decl_empty = remove +nl_func_def_empty = remove +nl_fdef_brace = force +nl_return_expr = ignore +nl_class_colon = ignore +pos_bool = lead +pos_class_comma = trail +pos_constr_comma = trail +pos_class_colon = lead +pos_constr_colon = lead +mod_full_brace_do = force +mod_full_brace_for = force +mod_full_brace_function = force +mod_full_brace_if = force +mod_paren_on_return = remove +pp_indent = remove +pp_space = remove diff --git a/tests/config/bug_671.cfg b/tests/config/bug_671.cfg index 7d63244bd1..cc20daa55b 100644 --- a/tests/config/bug_671.cfg +++ b/tests/config/bug_671.cfg @@ -5,33 +5,33 @@ # # The type of line endings -newlines = auto # auto/lf/crlf/cr +newlines = auto # auto/lf/crlf/cr # The original size of tabs in the input -input_tab_size = 8 # number +input_tab_size = 8 # number # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 8 # number +output_tab_size = 8 # number # The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # number # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # number # Allow interpreting '>=' and '>>=' as part of a template in 'void f(list>=val);'. # If true (default), 'assert(x<0 && y>=3)' will be broken. # Improvements to template detection may make this option obsolete. -tok_split_gte = false # false/true +tok_split_gte = false # false/true # Control what to do with the UTF-8 BOM (recommend 'remove') -utf8_bom = ignore # ignore/add/remove/force +utf8_bom = ignore # ignore/add/remove/force # If the file contains bytes with values between 128 and 255, but is not UTF-8, then output as UTF-8 -utf8_byte = false # false/true +utf8_byte = false # false/true # Force the output encoding to UTF-8 -utf8_force = false # false/true +utf8_force = false # false/true # # Indenting @@ -39,1615 +39,1615 @@ utf8_force = false # false/true # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 4 # number +indent_columns = 4 # number # The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents. # For FreeBSD, this is set to 4. Negative value is absolute and not increased for each ( level -indent_continue = 0 # number +indent_continue = 0 # number # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs to brace level, align with spaces # 2=indent and align with tabs, using spaces when not on a tabstop -indent_with_tabs = 0 # number +indent_with_tabs = 0 # number # Comments that are not a brace level are indented with tabs on a tabstop. # Requires indent_with_tabs=2. If false, will use spaces. -indent_cmt_with_tabs = false # false/true +indent_cmt_with_tabs = false # false/true # Whether to indent strings broken by '\' so that they line up -indent_align_string = false # false/true +indent_align_string = false # false/true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # number # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # number # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # false/true # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # false/true # Disabled indenting class braces if indent_braces is true -indent_braces_no_class = false # false/true +indent_braces_no_class = false # false/true # Disabled indenting struct braces if indent_braces is true -indent_braces_no_struct = false # false/true +indent_braces_no_struct = false # false/true # Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # false/true # Indent based on the paren open instead of the brace open in '({\n', default is to indent by brace. -indent_paren_open_brace = false # false/true +indent_paren_open_brace = false # false/true # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # false/true # Only indent one namespace and no sub-namepaces. # Requires indent_namespace=true. -indent_namespace_single_indent = false # false/true +indent_namespace_single_indent = false # false/true # The number of spaces to indent a namespace block -indent_namespace_level = 0 # number +indent_namespace_level = 0 # number # If the body of the namespace is longer than this number, it won't be indented. # Requires indent_namespace=true. Default=0 (no limit) -indent_namespace_limit = 0 # number +indent_namespace_limit = 0 # number # Whether the 'extern "C"' body is indented -indent_extern = false # false/true +indent_extern = false # false/true # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # false/true # Whether to indent the stuff after a leading base class colon -indent_class_colon = true # false/true +indent_class_colon = true # false/true # Whether to indent the stuff after a leading class initializer colon -indent_constr_colon = false # false/true +indent_constr_colon = false # false/true # Virtual indent from the ':' for member initializers. Default is 2 -indent_ctor_init_leading = 2 # number +indent_ctor_init_leading = 2 # number # Additional indenting for constructor initializer list -indent_ctor_init = 0 # number +indent_ctor_init = 0 # number # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level -indent_else_if = false # false/true +indent_else_if = false # false/true # Amount to indent variable declarations after a open brace. neg=relative, pos=absolute -indent_var_def_blk = 0 # number +indent_var_def_blk = 0 # number # Indent continued variable declarations instead of aligning. -indent_var_def_cont = false # false/true +indent_var_def_cont = false # false/true # True: force indentation of function definition to start in column 1 # False: use the default behavior -indent_func_def_force_col1 = false # false/true +indent_func_def_force_col1 = false # false/true # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = false # false/true +indent_func_call_param = false # false/true # Same as indent_func_call_param, but for function defs -indent_func_def_param = false # false/true +indent_func_def_param = false # false/true # Same as indent_func_call_param, but for function protos -indent_func_proto_param = false # false/true +indent_func_proto_param = false # false/true # Same as indent_func_call_param, but for class declarations -indent_func_class_param = false # false/true +indent_func_class_param = false # false/true # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = false # false/true +indent_func_ctor_var_param = false # false/true # Same as indent_func_call_param, but for templates -indent_template_param = false # false/true +indent_template_param = false # false/true # Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true +indent_func_param_double = false # false/true # Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 0 # number +indent_func_const = 0 # number # Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 0 # number +indent_func_throw = 0 # number # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 0 # number +indent_member = 0 # number # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # number # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = false # false/true +indent_relative_single_line_comments = false # false/true # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 4 # number +indent_switch_case = 4 # number # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # number # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 0 # number +indent_case_brace = 0 # number # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # false/true # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # number # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # number # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # false/true # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # false/true # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 0 # number +indent_paren_close = 0 # number # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # false/true # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # false/true # If 'indent_bool_paren' is true, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones -indent_first_bool_expr = false # false/true +indent_first_bool_expr = false # false/true # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # false/true # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # false/true # Align continued statements at the '='. Default=True # If FALSE or the '=' is followed by a newline, the next line is indent one tab. -indent_align_assign = true # false/true +indent_align_assign = true # false/true # Indent OC blocks at brace level instead of usual rules. -indent_oc_block = false # false/true +indent_oc_block = false # false/true # Indent OC blocks in a message relative to the parameter name. # 0=use indent_oc_block rules, 1+=spaces to indent -indent_oc_block_msg = 0 # number +indent_oc_block_msg = 0 # number # Minimum indent for subsequent parameters -indent_oc_msg_colon = 0 # number +indent_oc_msg_colon = 0 # number # If true, prioritize aligning with initial colon (and stripping spaces from lines, if necessary). # Default is true. -indent_oc_msg_prioritize_first_colon = true # false/true +indent_oc_msg_prioritize_first_colon = true # false/true # If indent_oc_block_msg and this option are on, blocks will be indented the way that Xcode does by default (from keyword if the parameter is on its own line; otherwise, from the previous indentation level). -indent_oc_block_msg_xcode_style = false # false/true +indent_oc_block_msg_xcode_style = false # false/true # If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is relative to a msg keyword. -indent_oc_block_msg_from_keyword = false # false/true +indent_oc_block_msg_from_keyword = false # false/true # If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is relative to a msg colon. -indent_oc_block_msg_from_colon = false # false/true +indent_oc_block_msg_from_colon = false # false/true # If indent_oc_block_msg and this option are on, blocks will be indented from where the block caret is. -indent_oc_block_msg_from_caret = false # false/true +indent_oc_block_msg_from_caret = false # false/true # If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is. -indent_oc_block_msg_from_brace = false # false/true +indent_oc_block_msg_from_brace = false # false/true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = add # ignore/add/remove/force +sp_arith = add # ignore/add/remove/force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = add # ignore/add/remove/force +sp_assign = add # ignore/add/remove/force # Add or remove space around '=' in C++11 lambda capture specifications. Overrides sp_assign -sp_cpp_lambda_assign = ignore # ignore/add/remove/force +sp_cpp_lambda_assign = ignore # ignore/add/remove/force # Add or remove space after the capture specification in C++11 lambda. -sp_cpp_lambda_paren = ignore # ignore/add/remove/force +sp_cpp_lambda_paren = ignore # ignore/add/remove/force # Add or remove space around assignment operator '=' in a prototype -sp_assign_default = ignore # ignore/add/remove/force +sp_assign_default = ignore # ignore/add/remove/force # Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. -sp_before_assign = ignore # ignore/add/remove/force +sp_before_assign = ignore # ignore/add/remove/force # Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. -sp_after_assign = ignore # ignore/add/remove/force +sp_after_assign = ignore # ignore/add/remove/force # Add or remove space in 'NS_ENUM (' -sp_enum_paren = ignore # ignore/add/remove/force +sp_enum_paren = ignore # ignore/add/remove/force # Add or remove space around assignment '=' in enum -sp_enum_assign = add # ignore/add/remove/force +sp_enum_assign = add # ignore/add/remove/force # Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_before_assign = ignore # ignore/add/remove/force +sp_enum_before_assign = ignore # ignore/add/remove/force # Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_after_assign = ignore # ignore/add/remove/force +sp_enum_after_assign = ignore # ignore/add/remove/force # Add or remove space around preprocessor '##' concatenation operator. Default=Add -sp_pp_concat = ignore # ignore/add/remove/force +sp_pp_concat = ignore # ignore/add/remove/force # Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator. -sp_pp_stringify = ignore # ignore/add/remove/force +sp_pp_stringify = ignore # ignore/add/remove/force # Add or remove space before preprocessor '#' stringify operator as in '#define x(y) L#y'. -sp_before_pp_stringify = ignore # ignore/add/remove/force +sp_before_pp_stringify = ignore # ignore/add/remove/force # Add or remove space around boolean operators '&&' and '||' -sp_bool = add # ignore/add/remove/force +sp_bool = add # ignore/add/remove/force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = add # ignore/add/remove/force +sp_compare = add # ignore/add/remove/force # Add or remove space inside '(' and ')' -sp_inside_paren = add # ignore/add/remove/force +sp_inside_paren = add # ignore/add/remove/force # Add or remove space between nested parens: '((' vs ') )' -sp_paren_paren = add # ignore/add/remove/force +sp_paren_paren = add # ignore/add/remove/force # Add or remove space between back-to-back parens: ')(' vs ') (' -sp_cparen_oparen = ignore # ignore/add/remove/force +sp_cparen_oparen = ignore # ignore/add/remove/force # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # false/true # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # ignore/add/remove/force # Add or remove space before pointer star '*' -sp_before_ptr_star = remove # ignore/add/remove/force +sp_before_ptr_star = remove # ignore/add/remove/force # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force +sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force # Add or remove space between pointer stars '*' -sp_between_ptr_star = ignore # ignore/add/remove/force +sp_between_ptr_star = ignore # ignore/add/remove/force # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = add # ignore/add/remove/force +sp_after_ptr_star = add # ignore/add/remove/force # Add or remove space after pointer star '*', if followed by a qualifier. -sp_after_ptr_star_qualifier = ignore # ignore/add/remove/force +sp_after_ptr_star_qualifier = ignore # ignore/add/remove/force # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = ignore # ignore/add/remove/force +sp_after_ptr_star_func = ignore # ignore/add/remove/force # Add or remove space after a pointer star '*', if followed by an open paren (function types). -sp_ptr_star_paren = ignore # ignore/add/remove/force +sp_ptr_star_paren = ignore # ignore/add/remove/force # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = ignore # ignore/add/remove/force +sp_before_ptr_star_func = ignore # ignore/add/remove/force # Add or remove space before a reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # ignore/add/remove/force # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force +sp_before_unnamed_byref = ignore # ignore/add/remove/force # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = add # ignore/add/remove/force +sp_after_byref = add # ignore/add/remove/force # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = ignore # ignore/add/remove/force +sp_after_byref_func = ignore # ignore/add/remove/force # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = ignore # ignore/add/remove/force +sp_before_byref_func = ignore # ignore/add/remove/force # Add or remove space between type and word. Default=Force -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # ignore/add/remove/force # Add or remove space before the paren in the D constructs 'template Foo(' and 'class Foo('. -sp_before_template_paren = ignore # ignore/add/remove/force +sp_before_template_paren = ignore # ignore/add/remove/force # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. -sp_template_angle = ignore # ignore/add/remove/force +sp_template_angle = ignore # ignore/add/remove/force # Add or remove space before '<>' -sp_before_angle = ignore # ignore/add/remove/force +sp_before_angle = ignore # ignore/add/remove/force # Add or remove space inside '<' and '>' -sp_inside_angle = ignore # ignore/add/remove/force +sp_inside_angle = ignore # ignore/add/remove/force # Add or remove space after '<>' -sp_after_angle = ignore # ignore/add/remove/force +sp_after_angle = ignore # ignore/add/remove/force # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = ignore # ignore/add/remove/force +sp_angle_paren = ignore # ignore/add/remove/force # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = ignore # ignore/add/remove/force +sp_angle_word = ignore # ignore/add/remove/force # Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add -sp_angle_shift = add # ignore/add/remove/force +sp_angle_shift = add # ignore/add/remove/force # Permit removal of the space between '>>' in 'foo >' (C++11 only). Default=False # sp_angle_shift cannot remove the space without this option. -sp_permit_cpp11_shift = false # false/true +sp_permit_cpp11_shift = false # false/true # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # ignore/add/remove/force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = add # ignore/add/remove/force +sp_inside_sparen = add # ignore/add/remove/force # Add or remove space before if-condition ')'. Overrides sp_inside_sparen. -sp_inside_sparen_close = ignore # ignore/add/remove/force +sp_inside_sparen_close = ignore # ignore/add/remove/force # Add or remove space before if-condition '('. Overrides sp_inside_sparen. -sp_inside_sparen_open = ignore # ignore/add/remove/force +sp_inside_sparen_open = ignore # ignore/add/remove/force # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = ignore # ignore/add/remove/force +sp_after_sparen = ignore # ignore/add/remove/force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = ignore # ignore/add/remove/force +sp_sparen_brace = ignore # ignore/add/remove/force # Add or remove space between 'invariant' and '(' in the D language. -sp_invariant_paren = ignore # ignore/add/remove/force +sp_invariant_paren = ignore # ignore/add/remove/force # Add or remove space after the ')' in 'invariant (C) c' in the D language. -sp_after_invariant_paren = ignore # ignore/add/remove/force +sp_after_invariant_paren = ignore # ignore/add/remove/force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # ignore/add/remove/force # Add or remove space before ';'. Default=Remove -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # ignore/add/remove/force # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = ignore # ignore/add/remove/force +sp_before_semi_for = ignore # ignore/add/remove/force # Add or remove space before a semicolon of an empty part of a for statement. -sp_before_semi_for_empty = ignore # ignore/add/remove/force +sp_before_semi_for_empty = ignore # ignore/add/remove/force # Add or remove space after ';', except when followed by a comment. Default=Add -sp_after_semi = add # ignore/add/remove/force +sp_after_semi = add # ignore/add/remove/force # Add or remove space after ';' in non-empty 'for' statements. Default=Force -sp_after_semi_for = force # ignore/add/remove/force +sp_after_semi_for = force # ignore/add/remove/force # Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; ). -sp_after_semi_for_empty = ignore # ignore/add/remove/force +sp_after_semi_for_empty = ignore # ignore/add/remove/force # Add or remove space before '[' (except '[]') -sp_before_square = remove # ignore/add/remove/force +sp_before_square = remove # ignore/add/remove/force # Add or remove space before '[]' -sp_before_squares = remove # ignore/add/remove/force +sp_before_squares = remove # ignore/add/remove/force # Add or remove space inside a non-empty '[' and ']' -sp_inside_square = add # ignore/add/remove/force +sp_inside_square = add # ignore/add/remove/force # Add or remove space after ',' -sp_after_comma = add # ignore/add/remove/force +sp_after_comma = add # ignore/add/remove/force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # ignore/add/remove/force # Add or remove space between an open paren and comma: '(,' vs '( ,' -sp_paren_comma = force # ignore/add/remove/force +sp_paren_comma = force # ignore/add/remove/force # Add or remove space before the variadic '...' when preceded by a non-punctuator -sp_before_ellipsis = ignore # ignore/add/remove/force +sp_before_ellipsis = ignore # ignore/add/remove/force # Add or remove space after class ':' -sp_after_class_colon = ignore # ignore/add/remove/force +sp_after_class_colon = ignore # ignore/add/remove/force # Add or remove space before class ':' -sp_before_class_colon = ignore # ignore/add/remove/force +sp_before_class_colon = ignore # ignore/add/remove/force # Add or remove space after class constructor ':' -sp_after_constr_colon = ignore # ignore/add/remove/force +sp_after_constr_colon = ignore # ignore/add/remove/force # Add or remove space before class constructor ':' -sp_before_constr_colon = ignore # ignore/add/remove/force +sp_before_constr_colon = ignore # ignore/add/remove/force # Add or remove space before case ':'. Default=Remove -sp_before_case_colon = remove # ignore/add/remove/force +sp_before_case_colon = remove # ignore/add/remove/force # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # ignore/add/remove/force # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = ignore # ignore/add/remove/force +sp_after_operator_sym = ignore # ignore/add/remove/force # Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # ignore/add/remove/force # Add or remove spaces inside cast parens -sp_inside_paren_cast = add # ignore/add/remove/force +sp_inside_paren_cast = add # ignore/add/remove/force # Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = ignore # ignore/add/remove/force +sp_cpp_cast_paren = ignore # ignore/add/remove/force # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # ignore/add/remove/force # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # ignore/add/remove/force # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = force # ignore/add/remove/force +sp_inside_braces_enum = force # ignore/add/remove/force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = force # ignore/add/remove/force +sp_inside_braces_struct = force # ignore/add/remove/force # Add or remove space inside '{' and '}' -sp_inside_braces = force # ignore/add/remove/force +sp_inside_braces = force # ignore/add/remove/force # Add or remove space inside '{}' -sp_inside_braces_empty = ignore # ignore/add/remove/force +sp_inside_braces_empty = ignore # ignore/add/remove/force # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = ignore # ignore/add/remove/force +sp_type_func = ignore # ignore/add/remove/force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # ignore/add/remove/force # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # ignore/add/remove/force # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # ignore/add/remove/force # Add or remove space inside function '(' and ')' -sp_inside_fparen = add # ignore/add/remove/force +sp_inside_fparen = add # ignore/add/remove/force # Add or remove space inside the first parens in the function type: 'void (*x)(...)' -sp_inside_tparen = ignore # ignore/add/remove/force +sp_inside_tparen = ignore # ignore/add/remove/force # Add or remove between the parens in the function type: 'void (*x)(...)' -sp_after_tparen_close = ignore # ignore/add/remove/force +sp_after_tparen_close = ignore # ignore/add/remove/force # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = remove # ignore/add/remove/force +sp_square_fparen = remove # ignore/add/remove/force # Add or remove space between ')' and '{' of function -sp_fparen_brace = ignore # ignore/add/remove/force +sp_fparen_brace = ignore # ignore/add/remove/force # Java: Add or remove space between ')' and '{{' of double brace initializer. -sp_fparen_dbrace = ignore # ignore/add/remove/force +sp_fparen_dbrace = ignore # ignore/add/remove/force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # ignore/add/remove/force # Add or remove space between function name and '()' on function calls without parameters. # If set to 'ignore' (the default), sp_func_call_paren is used. -sp_func_call_paren_empty = ignore # ignore/add/remove/force +sp_func_call_paren_empty = ignore # ignore/add/remove/force # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = ignore # ignore/add/remove/force +sp_func_call_user_paren = ignore # ignore/add/remove/force # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = ignore # ignore/add/remove/force +sp_func_class_paren = ignore # ignore/add/remove/force # Add or remove space between 'return' and '(' -sp_return_paren = add # ignore/add/remove/force +sp_return_paren = add # ignore/add/remove/force # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # ignore/add/remove/force # Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = ignore # ignore/add/remove/force +sp_defined_paren = ignore # ignore/add/remove/force # Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = ignore # ignore/add/remove/force +sp_throw_paren = ignore # ignore/add/remove/force # Add or remove space between 'throw' and anything other than '(' as in '@throw [...];' -sp_after_throw = ignore # ignore/add/remove/force +sp_after_throw = ignore # ignore/add/remove/force # Add or remove space between 'catch' and '(' in 'catch (something) { }' # If set to ignore, sp_before_sparen is used. -sp_catch_paren = ignore # ignore/add/remove/force +sp_catch_paren = ignore # ignore/add/remove/force # Add or remove space between 'version' and '(' in 'version (something) { }' (D language) # If set to ignore, sp_before_sparen is used. -sp_version_paren = ignore # ignore/add/remove/force +sp_version_paren = ignore # ignore/add/remove/force # Add or remove space between 'scope' and '(' in 'scope (something) { }' (D language) # If set to ignore, sp_before_sparen is used. -sp_scope_paren = ignore # ignore/add/remove/force +sp_scope_paren = ignore # ignore/add/remove/force # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # ignore/add/remove/force # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # ignore/add/remove/force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = ignore # ignore/add/remove/force +sp_else_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # ignore/add/remove/force # Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = ignore # ignore/add/remove/force +sp_brace_typedef = ignore # ignore/add/remove/force # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # ignore/add/remove/force # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # ignore/add/remove/force # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # ignore/add/remove/force # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # ignore/add/remove/force # Add or remove space between a variable and '{' for C++ uniform initialization -sp_word_brace = add # ignore/add/remove/force +sp_word_brace = add # ignore/add/remove/force # Add or remove space between a variable and '{' for a namespace -sp_word_brace_ns = add # ignore/add/remove/force +sp_word_brace_ns = add # ignore/add/remove/force # Add or remove space before the '::' operator -sp_before_dc = ignore # ignore/add/remove/force +sp_before_dc = ignore # ignore/add/remove/force # Add or remove space after the '::' operator -sp_after_dc = ignore # ignore/add/remove/force +sp_after_dc = ignore # ignore/add/remove/force # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # ignore/add/remove/force # Add or remove space after the '!' (not) operator. Default=Remove -sp_not = remove # ignore/add/remove/force +sp_not = remove # ignore/add/remove/force # Add or remove space after the '~' (invert) operator. Default=Remove -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # ignore/add/remove/force # Add or remove space after the '&' (address-of) operator. Default=Remove # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # ignore/add/remove/force # Add or remove space around the '.' or '->' operators. Default=Remove -sp_member = remove # ignore/add/remove/force +sp_member = remove # ignore/add/remove/force # Add or remove space after the '*' (dereference) operator. Default=Remove # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # ignore/add/remove/force # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # ignore/add/remove/force # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # ignore/add/remove/force # Add or remove space before a backslash-newline at the end of a line. Default=Add -sp_before_nl_cont = add # ignore/add/remove/force +sp_before_nl_cont = add # ignore/add/remove/force # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force +sp_after_oc_scope = ignore # ignore/add/remove/force # Add or remove space after the colon in message specs # '-(int) f:(int) x;' vs '-(int) f: (int) x;' -sp_after_oc_colon = ignore # ignore/add/remove/force +sp_after_oc_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in message specs # '-(int) f: (int) x;' vs '-(int) f : (int) x;' -sp_before_oc_colon = ignore # ignore/add/remove/force +sp_before_oc_colon = ignore # ignore/add/remove/force # Add or remove space after the colon in immutable dictionary expression # 'NSDictionary *test = @{@"foo" :@"bar"};' -sp_after_oc_dict_colon = ignore # ignore/add/remove/force +sp_after_oc_dict_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in immutable dictionary expression # 'NSDictionary *test = @{@"foo" :@"bar"};' -sp_before_oc_dict_colon = ignore # ignore/add/remove/force +sp_before_oc_dict_colon = ignore # ignore/add/remove/force # Add or remove space after the colon in message specs # '[object setValue:1];' vs '[object setValue: 1];' -sp_after_send_oc_colon = ignore # ignore/add/remove/force +sp_after_send_oc_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in message specs # '[object setValue:1];' vs '[object setValue :1];' -sp_before_send_oc_colon = ignore # ignore/add/remove/force +sp_before_send_oc_colon = ignore # ignore/add/remove/force # Add or remove space after the (type) in message specs # '-(int)f: (int) x;' vs '-(int)f: (int)x;' -sp_after_oc_type = ignore # ignore/add/remove/force +sp_after_oc_type = ignore # ignore/add/remove/force # Add or remove space after the first (type) in message specs # '-(int) f:(int)x;' vs '-(int)f:(int)x;' -sp_after_oc_return_type = ignore # ignore/add/remove/force +sp_after_oc_return_type = ignore # ignore/add/remove/force # Add or remove space between '@selector' and '(' # '@selector(msgName)' vs '@selector (msgName)' # Also applies to @protocol() constructs -sp_after_oc_at_sel = ignore # ignore/add/remove/force +sp_after_oc_at_sel = ignore # ignore/add/remove/force # Add or remove space between '@selector(x)' and the following word # '@selector(foo) a:' vs '@selector(foo)a:' -sp_after_oc_at_sel_parens = ignore # ignore/add/remove/force +sp_after_oc_at_sel_parens = ignore # ignore/add/remove/force # Add or remove space inside '@selector' parens # '@selector(foo)' vs '@selector( foo )' # Also applies to @protocol() constructs -sp_inside_oc_at_sel_parens = ignore # ignore/add/remove/force +sp_inside_oc_at_sel_parens = ignore # ignore/add/remove/force # Add or remove space before a block pointer caret # '^int (int arg){...}' vs. ' ^int (int arg){...}' -sp_before_oc_block_caret = ignore # ignore/add/remove/force +sp_before_oc_block_caret = ignore # ignore/add/remove/force # Add or remove space after a block pointer caret # '^int (int arg){...}' vs. '^ int (int arg){...}' -sp_after_oc_block_caret = ignore # ignore/add/remove/force +sp_after_oc_block_caret = ignore # ignore/add/remove/force # Add or remove space between the receiver and selector in a message. # '[receiver selector ...]' -sp_after_oc_msg_receiver = ignore # ignore/add/remove/force +sp_after_oc_msg_receiver = ignore # ignore/add/remove/force # Add or remove space after @property. -sp_after_oc_property = ignore # ignore/add/remove/force +sp_after_oc_property = ignore # ignore/add/remove/force # Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = add # ignore/add/remove/force +sp_cond_colon = add # ignore/add/remove/force # Add or remove space before the ':' in 'b ? t : f'. Overrides sp_cond_colon. -sp_cond_colon_before = ignore # ignore/add/remove/force +sp_cond_colon_before = ignore # ignore/add/remove/force # Add or remove space after the ':' in 'b ? t : f'. Overrides sp_cond_colon. -sp_cond_colon_after = ignore # ignore/add/remove/force +sp_cond_colon_after = ignore # ignore/add/remove/force # Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = add # ignore/add/remove/force +sp_cond_question = add # ignore/add/remove/force # Add or remove space before the '?' in 'b ? t : f'. Overrides sp_cond_question. -sp_cond_question_before = ignore # ignore/add/remove/force +sp_cond_question_before = ignore # ignore/add/remove/force # Add or remove space after the '?' in 'b ? t : f'. Overrides sp_cond_question. -sp_cond_question_after = ignore # ignore/add/remove/force +sp_cond_question_after = ignore # ignore/add/remove/force # In the abbreviated ternary form (a ?: b), add/remove space between ? and :.'. Overrides all other sp_cond_* options. -sp_cond_ternary_short = ignore # ignore/add/remove/force +sp_cond_ternary_short = ignore # ignore/add/remove/force # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = ignore # ignore/add/remove/force +sp_case_label = ignore # ignore/add/remove/force # Control the space around the D '..' operator. -sp_range = ignore # ignore/add/remove/force +sp_range = ignore # ignore/add/remove/force # Control the spacing after ':' in 'for (TYPE VAR : EXPR)' (Java) -sp_after_for_colon = ignore # ignore/add/remove/force +sp_after_for_colon = ignore # ignore/add/remove/force # Control the spacing before ':' in 'for (TYPE VAR : EXPR)' (Java) -sp_before_for_colon = ignore # ignore/add/remove/force +sp_before_for_colon = ignore # ignore/add/remove/force # Control the spacing in 'extern (C)' (D) -sp_extern_paren = ignore # ignore/add/remove/force +sp_extern_paren = ignore # ignore/add/remove/force # Control the space after the opening of a C++ comment '// A' vs '//A' -sp_cmt_cpp_start = ignore # ignore/add/remove/force +sp_cmt_cpp_start = ignore # ignore/add/remove/force # Controls the spaces between #else or #endif and a trailing comment -sp_endif_cmt = ignore # ignore/add/remove/force +sp_endif_cmt = ignore # ignore/add/remove/force # Controls the spaces after 'new', 'delete', and 'delete[]' -sp_after_new = ignore # ignore/add/remove/force +sp_after_new = ignore # ignore/add/remove/force # Controls the spaces before a trailing or embedded comment -sp_before_tr_emb_cmt = ignore # ignore/add/remove/force +sp_before_tr_emb_cmt = ignore # ignore/add/remove/force # Number of spaces before a trailing or embedded comment -sp_num_before_tr_emb_cmt = 0 # number +sp_num_before_tr_emb_cmt = 0 # number # Control space between a Java annotation and the open paren. -sp_annotation_paren = ignore # ignore/add/remove/force +sp_annotation_paren = ignore # ignore/add/remove/force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # false/true # Whether to use tabs for aligning -align_with_tabs = false # false/true +align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # false/true # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # false/true # Whether to keep whitespace not required for alignment. -align_keep_extra_space = false # false/true +align_keep_extra_space = false # false/true # Align variable definitions in prototypes and functions -align_func_params = true # false/true +align_func_params = true # false/true # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = false # false/true +align_same_func_call_params = false # false/true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 1 # number +align_var_def_span = 1 # number # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 0 # number +align_var_def_star_style = 0 # number # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # number # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # number # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # number # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # false/true # Whether to align any attribute after the variable name -align_var_def_attribute = false # false/true +align_var_def_attribute = false # false/true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = false # false/true +align_var_def_inline = false # false/true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 1 # number +align_assign_span = 1 # number # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 # number # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 4 # number +align_enum_equ_span = 4 # number # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # number # The span for aligning struct/union (0=don't align) -align_var_struct_span = 2 # number +align_var_struct_span = 2 # number # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # number # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # number # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 3 # number +align_struct_init_span = 3 # number # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number +align_typedef_gap = 0 # number # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 2 # number +align_typedef_span = 2 # number # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # number # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typedef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # number # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typedef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # number # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 3 # number +align_right_cmt_span = 3 # number # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # false/true # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. This has to be > 0 to do anything. -align_right_cmt_gap = 0 # number +align_right_cmt_gap = 0 # number # Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore) -align_right_cmt_at_col = 0 # number +align_right_cmt_at_col = 0 # number # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # number # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # number # Align function protos on the 'operator' keyword instead of what follows -align_on_operator = false # false/true +align_on_operator = false # false/true # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # false/true # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true +align_single_line_func = false # false/true # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # false/true # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # number # The span for aligning ObjC msg spec (0=don't align) -align_oc_msg_spec_span = 0 # number +align_oc_msg_spec_span = 0 # number # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = false # false/true +align_nl_cont = false # false/true # # Align macro functions and variables together -align_pp_define_together = false # false/true +align_pp_define_together = false # false/true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 0 # number +align_pp_define_gap = 0 # number # The span for aligning on '#define' bodies (0=don't align, other=number of lines including comments between blocks) -align_pp_define_span = 0 # number +align_pp_define_span = 0 # number # Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = true # false/true +align_left_shift = true # false/true # Span for aligning parameters in an Obj-C message call on the ':' (0=don't align) -align_oc_msg_colon_span = 0 # number +align_oc_msg_colon_span = 0 # number # If true, always align with the first parameter, even if it is too short. -align_oc_msg_colon_first = false # false/true +align_oc_msg_colon_first = false # false/true # Aligning parameters in an Obj-C '+' or '-' declaration on the ':' -align_oc_decl_colon = false # false/true +align_oc_decl_colon = false # false/true # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # false/true # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = false # false/true +nl_assign_leave_one_liners = false # false/true # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = false # false/true +nl_class_leave_one_liners = false # false/true # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = false # false/true +nl_enum_leave_one_liners = false # false/true # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # false/true # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # false/true # Don't split one-line C++11 lambdas - '[]() { return 0; }' -nl_cpp_lambda_leave_one_liners = false # false/true +nl_cpp_lambda_leave_one_liners = false # false/true # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # false/true # Don't split one-line OC messages -nl_oc_msg_leave_one_liner = false # false/true +nl_oc_msg_leave_one_liner = false # false/true # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # ignore/add/remove/force # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # number # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # ignore/add/remove/force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # number # Add or remove newline between '=' and '{' -nl_assign_brace = ignore # ignore/add/remove/force +nl_assign_brace = ignore # ignore/add/remove/force # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # ignore/add/remove/force # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # ignore/add/remove/force # The number of blank lines after a block of variable definitions at the top of a function body # 0 = No change (default) -nl_func_var_def_blk = 0 # number +nl_func_var_def_blk = 0 # number # The number of newlines before a block of typedefs # 0 = No change (default) -nl_typedef_blk_start = 0 # number +nl_typedef_blk_start = 0 # number # The number of newlines after a block of typedefs # 0 = No change (default) -nl_typedef_blk_end = 0 # number +nl_typedef_blk_end = 0 # number # The maximum consecutive newlines within a block of typedefs # 0 = No change (default) -nl_typedef_blk_in = 0 # number +nl_typedef_blk_in = 0 # number # The number of newlines before a block of variable definitions not at the top of a function body # 0 = No change (default) -nl_var_def_blk_start = 0 # number +nl_var_def_blk_start = 0 # number # The number of newlines after a block of variable definitions not at the top of a function body # 0 = No change (default) -nl_var_def_blk_end = 0 # number +nl_var_def_blk_end = 0 # number # The maximum consecutive newlines within a block of variable definitions # 0 = No change (default) -nl_var_def_blk_in = 0 # number +nl_var_def_blk_in = 0 # number # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = add # ignore/add/remove/force +nl_fcall_brace = add # ignore/add/remove/force # Add or remove newline between 'enum' and '{' -nl_enum_brace = add # ignore/add/remove/force +nl_enum_brace = add # ignore/add/remove/force # Add or remove newline between 'struct and '{' -nl_struct_brace = add # ignore/add/remove/force +nl_struct_brace = add # ignore/add/remove/force # Add or remove newline between 'union' and '{' -nl_union_brace = add # ignore/add/remove/force +nl_union_brace = add # ignore/add/remove/force # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # ignore/add/remove/force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = ignore # ignore/add/remove/force +nl_elseif_brace = ignore # ignore/add/remove/force # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # ignore/add/remove/force # Add or remove newline between 'else' and 'if' -nl_else_if = ignore # ignore/add/remove/force +nl_else_if = ignore # ignore/add/remove/force # Add or remove newline between '}' and 'finally' -nl_brace_finally = ignore # ignore/add/remove/force +nl_brace_finally = ignore # ignore/add/remove/force # Add or remove newline between 'finally' and '{' -nl_finally_brace = ignore # ignore/add/remove/force +nl_finally_brace = ignore # ignore/add/remove/force # Add or remove newline between 'try' and '{' -nl_try_brace = ignore # ignore/add/remove/force +nl_try_brace = ignore # ignore/add/remove/force # Add or remove newline between get/set and '{' -nl_getset_brace = ignore # ignore/add/remove/force +nl_getset_brace = ignore # ignore/add/remove/force # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # ignore/add/remove/force # Add or remove newline between 'catch' and '{' -nl_catch_brace = add # ignore/add/remove/force +nl_catch_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'catch' -nl_brace_catch = add # ignore/add/remove/force +nl_brace_catch = add # ignore/add/remove/force # Add or remove newline between '}' and ']' -nl_brace_square = ignore # ignore/add/remove/force +nl_brace_square = ignore # ignore/add/remove/force # Add or remove newline between '}' and ')' in a function invocation -nl_brace_fparen = ignore # ignore/add/remove/force +nl_brace_fparen = ignore # ignore/add/remove/force # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # ignore/add/remove/force # Add or remove newline between 'scope (x)' and '{' (D) -nl_scope_brace = ignore # ignore/add/remove/force +nl_scope_brace = ignore # ignore/add/remove/force # Add or remove newline between 'unittest' and '{' (D) -nl_unittest_brace = ignore # ignore/add/remove/force +nl_unittest_brace = ignore # ignore/add/remove/force # Add or remove newline between 'version (x)' and '{' (D) -nl_version_brace = ignore # ignore/add/remove/force +nl_version_brace = ignore # ignore/add/remove/force # Add or remove newline between 'using' and '{' -nl_using_brace = ignore # ignore/add/remove/force +nl_using_brace = ignore # ignore/add/remove/force # Add or remove newline between two open or close braces. # Due to general newline/brace handling, REMOVE may not work. -nl_brace_brace = ignore # ignore/add/remove/force +nl_brace_brace = ignore # ignore/add/remove/force # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = add # ignore/add/remove/force +nl_brace_while = add # ignore/add/remove/force # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # ignore/add/remove/force # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # false/true # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = false # false/true +nl_multi_line_define = false # false/true # Whether to put a newline before 'case' statement -nl_before_case = false # false/true +nl_before_case = false # false/true # Add or remove newline between ')' and 'throw' -nl_before_throw = ignore # ignore/add/remove/force +nl_before_throw = ignore # ignore/add/remove/force # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # false/true # Add or remove a newline between a case ':' and '{'. Overrides nl_after_case. -nl_case_colon_brace = ignore # ignore/add/remove/force +nl_case_colon_brace = ignore # ignore/add/remove/force # Newline between namespace and { -nl_namespace_brace = add # ignore/add/remove/force +nl_namespace_brace = add # ignore/add/remove/force # Add or remove newline between 'template<>' and whatever follows. -nl_template_class = add # ignore/add/remove/force +nl_template_class = add # ignore/add/remove/force # Add or remove newline between 'class' and '{' -nl_class_brace = add # ignore/add/remove/force +nl_class_brace = add # ignore/add/remove/force # Add or remove newline after each ',' in the class base list -nl_class_init_args = add # ignore/add/remove/force +nl_class_init_args = add # ignore/add/remove/force # Add or remove newline after each ',' in the constructor member initialization -nl_constr_init_args = ignore # ignore/add/remove/force +nl_constr_init_args = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in a function definition -nl_func_type_name = add # ignore/add/remove/force +nl_func_type_name = add # ignore/add/remove/force # Add or remove newline between return type and function name inside a class {} # Uses nl_func_type_name or nl_func_proto_type_name if set to ignore. -nl_func_type_name_class = ignore # ignore/add/remove/force +nl_func_type_name_class = ignore # ignore/add/remove/force # Add or remove newline between function scope and name in a definition # Controls the newline after '::' in 'void A::f() { }' -nl_func_scope_name = ignore # ignore/add/remove/force +nl_func_scope_name = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = add # ignore/add/remove/force +nl_func_proto_type_name = add # ignore/add/remove/force # Add or remove newline between a function name and the opening '(' -nl_func_paren = ignore # ignore/add/remove/force +nl_func_paren = ignore # ignore/add/remove/force # Add or remove newline between a function name and the opening '(' in the definition -nl_func_def_paren = ignore # ignore/add/remove/force +nl_func_def_paren = ignore # ignore/add/remove/force # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # ignore/add/remove/force # Add or remove newline after '(' in a function definition -nl_func_def_start = ignore # ignore/add/remove/force +nl_func_def_start = ignore # ignore/add/remove/force # Overrides nl_func_decl_start when there is only one parameter. -nl_func_decl_start_single = ignore # ignore/add/remove/force +nl_func_decl_start_single = ignore # ignore/add/remove/force # Overrides nl_func_def_start when there is only one parameter. -nl_func_def_start_single = ignore # ignore/add/remove/force +nl_func_def_start_single = ignore # ignore/add/remove/force # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = add # ignore/add/remove/force +nl_func_decl_args = add # ignore/add/remove/force # Add or remove newline after each ',' in a function definition -nl_func_def_args = ignore # ignore/add/remove/force +nl_func_def_args = ignore # ignore/add/remove/force # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # ignore/add/remove/force # Add or remove newline before the ')' in a function definition -nl_func_def_end = ignore # ignore/add/remove/force +nl_func_def_end = ignore # ignore/add/remove/force # Overrides nl_func_decl_end when there is only one parameter. -nl_func_decl_end_single = ignore # ignore/add/remove/force +nl_func_decl_end_single = ignore # ignore/add/remove/force # Overrides nl_func_def_end when there is only one parameter. -nl_func_def_end_single = ignore # ignore/add/remove/force +nl_func_def_end_single = ignore # ignore/add/remove/force # Add or remove newline between '()' in a function declaration. -nl_func_decl_empty = ignore # ignore/add/remove/force +nl_func_decl_empty = ignore # ignore/add/remove/force # Add or remove newline between '()' in a function definition. -nl_func_def_empty = ignore # ignore/add/remove/force +nl_func_def_empty = ignore # ignore/add/remove/force # Whether to put each OC message parameter on a separate line # See nl_oc_msg_leave_one_liner -nl_oc_msg_args = false # false/true +nl_oc_msg_args = false # false/true # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # ignore/add/remove/force # Add or remove newline between C++11 lambda signature and '{' -nl_cpp_ldef_brace = ignore # ignore/add/remove/force +nl_cpp_ldef_brace = ignore # ignore/add/remove/force # Add or remove a newline between the return keyword and return expression. -nl_return_expr = ignore # ignore/add/remove/force +nl_return_expr = ignore # ignore/add/remove/force # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # false/true # Java: Control the newline between the ')' and '{{' of the double brace initializer. -nl_paren_dbrace_open = ignore # ignore/add/remove/force +nl_paren_dbrace_open = ignore # ignore/add/remove/force # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = false # false/true +nl_after_brace_open = false # false/true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true +nl_after_brace_open_cmt = false # false/true # Whether to put a newline after a virtual brace open with a non-empty body. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = false # false/true +nl_after_vbrace_open = false # false/true # Whether to put a newline after a virtual brace open with an empty body. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open_empty = false # false/true +nl_after_vbrace_open_empty = false # false/true # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. -nl_after_brace_close = false # false/true +nl_after_brace_close = false # false/true # Whether to put a newline after a virtual brace close. # Would add a newline before return in: 'if (foo) a++; return;' -nl_after_vbrace_close = false # false/true +nl_after_vbrace_close = false # false/true # Control the newline between the close brace and 'b' in: 'struct { int a; } b;' # Affects enums, unions, and structures. If set to ignore, uses nl_after_brace_close -nl_brace_struct_var = ignore # ignore/add/remove/force +nl_brace_struct_var = ignore # ignore/add/remove/force # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # false/true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true +nl_squeeze_ifdef = false # false/true # Add or remove blank line before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # ignore/add/remove/force # Add or remove blank line after 'if' statement -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # ignore/add/remove/force # Add or remove blank line before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # ignore/add/remove/force # Add or remove blank line after 'for' statement -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # ignore/add/remove/force # Add or remove blank line before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # ignore/add/remove/force # Add or remove blank line after 'while' statement -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # ignore/add/remove/force # Add or remove blank line before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # ignore/add/remove/force # Add or remove blank line after 'switch' statement -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # ignore/add/remove/force # Add or remove blank line before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # ignore/add/remove/force # Add or remove blank line after 'do/while' statement -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # ignore/add/remove/force # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # false/true # Whether to double-space before the close brace of a struct/union/enum # (lower priority than 'eat_blanks_before_close_brace') -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # false/true # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_class_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # ignore/add/remove/force # Add or remove a newline around a class constructor colon. # Related to pos_constr_colon, nl_constr_init_args, and pos_constr_comma. -nl_constr_colon = ignore # ignore/add/remove/force +nl_constr_colon = ignore # ignore/add/remove/force # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # false/true # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # false/true # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # false/true # # Positioning options # # The position of arithmetic operators in wrapped expressions -pos_arith = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_arith = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of assignment in wrapped expressions. # Do not affect '=' followed by '{' -pos_assign = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_assign = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of boolean operators in wrapped expressions -pos_bool = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_bool = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of comparison operators in wrapped expressions -pos_compare = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_compare = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of conditional (b ? t : f) operators in wrapped expressions -pos_conditional = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_conditional = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of the comma in wrapped expressions -pos_comma = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_comma = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of the comma in the class base list -pos_class_comma = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_comma = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of the comma in the constructor initialization list -pos_constr_comma = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_constr_comma = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of colons between class and base class list -pos_class_colon = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_colon = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of colons between constructor and member initialization -pos_constr_colon = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_constr_colon = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # number # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true +ls_for_split_full = false # false/true # Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true +ls_func_split_full = false # false/true # Whether to split lines as close to code_width as possible and ignore some groupings -ls_code_width = false # false/true +ls_code_width = false # false/true # # Blank line options # # The maximum consecutive newlines -nl_max = 0 # number +nl_max = 0 # number # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # number # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # number # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 0 # number +nl_after_func_body = 0 # number # The number of newlines after '}' of a multi-line function body in a class declaration -nl_after_func_body_class = 0 # number +nl_after_func_body_class = 0 # number # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 0 # number +nl_after_func_body_one_liner = 0 # number # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 0 # number +nl_before_block_comment = 0 # number # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # number # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # number # Whether to force a newline after a multi-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # false/true # The number of newlines after '}' or ';' of a struct/enum/union definition -nl_after_struct = 0 # number +nl_after_struct = 0 # number # The number of newlines after '}' or ';' of a class definition -nl_after_class = 0 # number +nl_after_class = 0 # number # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 0 # number +nl_before_access_spec = 0 # number # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # number # The number of newlines between a function def and the function comment. # 0 = No change. -nl_comment_func_def = 0 # number +nl_comment_func_def = 0 # number # The number of newlines after a try-catch-finally block that isn't followed by a brace close. # 0 = No change. -nl_after_try_catch_finally = 0 # number +nl_after_try_catch_finally = 0 # number # The number of newlines before and after a property, indexer or event decl. # 0 = No change. -nl_around_cs_property = 0 # number +nl_around_cs_property = 0 # number # The number of newlines between the get/set/add/remove handlers in C#. # 0 = No change. -nl_between_get_set = 0 # number +nl_between_get_set = 0 # number # Add or remove newline between C# property and the '{' -nl_property_brace = ignore # ignore/add/remove/force +nl_property_brace = ignore # ignore/add/remove/force # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # false/true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # false/true # How aggressively to remove extra newlines not in preproc. # 0: No change # 1: Remove most newlines not handled by other config # 2: Remove all newlines and reformat completely by config -nl_remove_extra_newlines = 0 # number +nl_remove_extra_newlines = 0 # number # Whether to put a blank line before 'return' statements, unless after an open brace. -nl_before_return = false # false/true +nl_before_return = false # false/true # Whether to put a blank line after 'return' statements, unless followed by a close brace. -nl_after_return = false # false/true +nl_after_return = false # false/true # Whether to put a newline after a Java annotation statement. # Only affects annotations that are after a newline. -nl_after_annotation = ignore # ignore/add/remove/force +nl_after_annotation = ignore # ignore/add/remove/force # Controls the newline between two annotations. -nl_between_annotation = ignore # ignore/add/remove/force +nl_between_annotation = ignore # ignore/add/remove/force # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # ignore/add/remove/force # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # ignore/add/remove/force # Add or remove braces on single-line function definitions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # ignore/add/remove/force # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # ignore/add/remove/force # Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if. # If any must be braced, they are all braced. If all can be unbraced, then the braces are removed. -mod_full_brace_if_chain = false # false/true +mod_full_brace_if_chain = false # false/true # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # number # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # ignore/add/remove/force # Add or remove braces on single-line 'using ()' statement -mod_full_brace_using = ignore # ignore/add/remove/force +mod_full_brace_using = ignore # ignore/add/remove/force # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = remove # ignore/add/remove/force +mod_paren_on_return = remove # ignore/add/remove/force # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # false/true # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = false # false/true +mod_full_paren_if_bool = false # false/true # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = false # false/true +mod_remove_extra_semicolon = false # false/true # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 0 # number +mod_add_long_function_closebrace_comment = 0 # number # If a namespace body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_namespace_closebrace_comment = 0 # number +mod_add_long_namespace_closebrace_comment = 0 # number # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number +mod_add_long_switch_closebrace_comment = 0 # number # If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after # the #endif, a comment will be added. -mod_add_long_ifdef_endif_comment = 0 # number +mod_add_long_ifdef_endif_comment = 0 # number # If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after # the #else, a comment will be added. -mod_add_long_ifdef_else_comment = 0 # number +mod_add_long_ifdef_else_comment = 0 # number # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # false/true # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # false/true # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # false/true # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = false # false/true +mod_move_case_break = false # false/true # Will add or remove the braces around a fully braced case statement. # Will only remove the braces if there are no variable declarations in the block. -mod_case_brace = ignore # ignore/add/remove/force +mod_case_brace = ignore # ignore/add/remove/force # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = false # false/true +mod_remove_empty_return = false # false/true # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # number # Set the comment reflow mode (default: 0) # 0: no reflowing (apart from the line wrapping due to cmt_width) # 1: no touching at all # 2: full reflow -cmt_reflow_mode = 0 # number +cmt_reflow_mode = 0 # number # Whether to convert all tabs to spaces in comments. Default is to leave tabs inside comments alone, unless used for indenting. -cmt_convert_tab_to_spaces = false # false/true +cmt_convert_tab_to_spaces = false # false/true # If false, disable all multi-line comment changes, including cmt_width. keyword substitution, and leading chars. # Default is true. -cmt_indent_multi = true # false/true +cmt_indent_multi = true # false/true # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # false/true # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # false/true # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # false/true # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # false/true # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # false/true # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # false/true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # number # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # number # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true # false/true # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # string # The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_footer = "" # string +cmt_insert_file_footer = "" # string # The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment. # Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # string # The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment. # Will substitute $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # string # The filename that contains text to insert before a Obj-C message specification if the method isn't preceded with a C/C++ comment. # Will substitute $(message) with the function name and $(javaparam) with the javadoc @param and @return stuff. -cmt_insert_oc_msg_header = "" # string +cmt_insert_oc_msg_header = "" # string # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_oc_msg_header, cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true +cmt_insert_before_preproc = false # false/true # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 (file-level) -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # ignore/add/remove/force # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # false/true # Specifies the number of columns to indent preprocessors per level at brace level 0 (file-level). # If pp_indent_at_level=false, specifies the number of columns to indent preprocessors per level at brace level > 0 (function-level). # Default=1. -pp_indent_count = 1 # number +pp_indent_count = 1 # number # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # ignore/add/remove/force # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # number # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # number # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # false/true # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level. # 0: indent preprocessors using output_tab_size. # >0: column at which all preprocessors will be indented. -pp_indent_if = 0 # number +pp_indent_if = 0 # number # Control whether to indent the code between #if, #else and #endif. -pp_if_indent_code = false # false/true +pp_if_indent_code = false # false/true # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # false/true # You can force a token to be a type with the 'type' option. # Example: @@ -1693,7 +1693,7 @@ pp_define_at_level = false # false/true # # Fortran wrappers: interpret "FSUB(function)" as function name -set func_wrap FSUB -set func_wrap SCOREP_LIBWRAP_FUNC_NAME -set func_wrap CALL_SHMEM -set func_wrap CALL_PTHREAD_REAL_FUNC +set func_wrap FSUB +set func_wrap SCOREP_LIBWRAP_FUNC_NAME +set func_wrap CALL_SHMEM +set func_wrap CALL_PTHREAD_REAL_FUNC diff --git a/tests/config/bug_i_1000-f.cfg b/tests/config/bug_i_1000-f.cfg index cb9a508b7e..ba7a1c761c 100644 --- a/tests/config/bug_i_1000-f.cfg +++ b/tests/config/bug_i_1000-f.cfg @@ -1 +1 @@ -nl_brace_fparen = force +nl_brace_fparen = force diff --git a/tests/config/bug_i_1000-r.cfg b/tests/config/bug_i_1000-r.cfg index 43ecb1e6d4..a10e910430 100644 --- a/tests/config/bug_i_1000-r.cfg +++ b/tests/config/bug_i_1000-r.cfg @@ -1 +1 @@ -nl_brace_fparen = remove +nl_brace_fparen = remove diff --git a/tests/config/bug_i_125-412.cfg b/tests/config/bug_i_125-412.cfg index c6f25fbd6d..d944132796 100644 --- a/tests/config/bug_i_125-412.cfg +++ b/tests/config/bug_i_125-412.cfg @@ -1,2 +1,2 @@ -nl_oc_msg_args=true -align_oc_msg_colon_span=4 +nl_oc_msg_args = true +align_oc_msg_colon_span = 4 diff --git a/tests/config/bug_i_222.cfg b/tests/config/bug_i_222.cfg index d7cbd99713..e588537c94 100644 --- a/tests/config/bug_i_222.cfg +++ b/tests/config/bug_i_222.cfg @@ -1,50 +1,50 @@ -indent_columns = 4 -indent_with_tabs = 0 -indent_case_brace = 4 -indent_label = 2 -sp_arith = force -sp_assign = force -sp_bool = force -sp_compare = force -sp_paren_brace = force -sp_before_ptr_star = force -sp_between_ptr_star = remove -sp_after_ptr_star = remove -sp_before_sparen = force -sp_inside_sparen = remove -sp_after_sparen = force -sp_after_comma = force -sp_after_cast = remove -sp_sizeof_paren = remove -sp_inside_braces_enum = force -sp_inside_braces_struct = force -sp_inside_braces = force -sp_func_proto_paren = remove -sp_func_def_paren = remove -sp_func_call_paren = remove -align_var_def_star_style = 2 -align_enum_equ_span = 4 -align_struct_init_span = 3 -align_right_cmt_span = 3 -align_nl_cont = true -nl_fcall_brace = remove -nl_enum_brace = remove -nl_struct_brace = remove -nl_union_brace = remove -nl_if_brace = remove -nl_brace_else = remove -nl_else_brace = remove -nl_for_brace = remove -nl_while_brace = remove -nl_do_brace = remove -nl_brace_while = remove -nl_switch_brace = remove -nl_multi_line_define = true -nl_fdef_brace = force -code_width = 80 -mod_full_brace_do = force -mod_full_brace_for = force -mod_full_brace_if = force -mod_full_brace_nl = 3 -mod_full_brace_while = force -mod_paren_on_return = remove +indent_columns = 4 +indent_with_tabs = 0 +indent_case_brace = 4 +indent_label = 2 +sp_arith = force +sp_assign = force +sp_bool = force +sp_compare = force +sp_paren_brace = force +sp_before_ptr_star = force +sp_between_ptr_star = remove +sp_after_ptr_star = remove +sp_before_sparen = force +sp_inside_sparen = remove +sp_after_sparen = force +sp_after_comma = force +sp_after_cast = remove +sp_sizeof_paren = remove +sp_inside_braces_enum = force +sp_inside_braces_struct = force +sp_inside_braces = force +sp_func_proto_paren = remove +sp_func_def_paren = remove +sp_func_call_paren = remove +align_var_def_star_style = 2 +align_enum_equ_span = 4 +align_struct_init_span = 3 +align_right_cmt_span = 3 +align_nl_cont = true +nl_fcall_brace = remove +nl_enum_brace = remove +nl_struct_brace = remove +nl_union_brace = remove +nl_if_brace = remove +nl_brace_else = remove +nl_else_brace = remove +nl_for_brace = remove +nl_while_brace = remove +nl_do_brace = remove +nl_brace_while = remove +nl_switch_brace = remove +nl_multi_line_define = true +nl_fdef_brace = force +code_width = 80 +mod_full_brace_do = force +mod_full_brace_for = force +mod_full_brace_if = force +mod_full_brace_nl = 3 +mod_full_brace_while = force +mod_paren_on_return = remove diff --git a/tests/config/bug_i_322.cfg b/tests/config/bug_i_322.cfg index 8778f47bab..17e174555e 100644 --- a/tests/config/bug_i_322.cfg +++ b/tests/config/bug_i_322.cfg @@ -1,22 +1,22 @@ -input_tab_size = 4 -output_tab_size = 4 -indent_columns = 4 -indent_continue = 8 -indent_align_string = true -indent_class = true -indent_switch_case = 4 -sp_arith = add -sp_pp_stringify = remove -sp_template_angle = add -sp_before_angle = remove -sp_inside_angle = remove -sp_after_angle = add -sp_angle_paren = remove -sp_angle_word = add -sp_angle_shift = remove -sp_before_sparen = add -sp_inside_sparen = remove -sp_after_sparen = remove -sp_sparen_brace = add -sp_special_semi = remove -sp_before_class_colon = add +input_tab_size = 4 +output_tab_size = 4 +indent_columns = 4 +indent_continue = 8 +indent_align_string = true +indent_class = true +indent_switch_case = 4 +sp_arith = add +sp_pp_stringify = remove +sp_template_angle = add +sp_before_angle = remove +sp_inside_angle = remove +sp_after_angle = add +sp_angle_paren = remove +sp_angle_word = add +sp_angle_shift = remove +sp_before_sparen = add +sp_inside_sparen = remove +sp_after_sparen = remove +sp_sparen_brace = add +sp_special_semi = remove +sp_before_class_colon = add diff --git a/tests/config/bug_i_323.cfg b/tests/config/bug_i_323.cfg index 7bba3d9d51..e738f93b50 100644 --- a/tests/config/bug_i_323.cfg +++ b/tests/config/bug_i_323.cfg @@ -1,2 +1,2 @@ -indent_with_tabs=0 -sp_after_byref=add +indent_with_tabs = 0 +sp_after_byref = add diff --git a/tests/config/bug_i_359.cfg b/tests/config/bug_i_359.cfg index 7f313d1448..4bb521086b 100644 --- a/tests/config/bug_i_359.cfg +++ b/tests/config/bug_i_359.cfg @@ -1,3 +1,3 @@ -indent_columns = 4 -indent_with_tabs = 0 -sp_case_label = force +indent_columns = 4 +indent_with_tabs = 0 +sp_case_label = force diff --git a/tests/config/bug_i_405.cfg b/tests/config/bug_i_405.cfg index 49928212c1..6f2d8eaf89 100644 --- a/tests/config/bug_i_405.cfg +++ b/tests/config/bug_i_405.cfg @@ -1,5 +1,5 @@ -indent_with_tabs = 0 -indent_columns = 4 -indent_namespace = true -indent_class = true -indent_paren_close = 2 +indent_with_tabs = 0 +indent_columns = 4 +indent_namespace = true +indent_class = true +indent_paren_close = 2 diff --git a/tests/config/bug_i_408.cfg b/tests/config/bug_i_408.cfg index e021a5f1a1..515a5d724a 100644 --- a/tests/config/bug_i_408.cfg +++ b/tests/config/bug_i_408.cfg @@ -1,2 +1,2 @@ -sp_arith = add # ignore/add/remove/force -sp_before_ptr_star = remove # ignore/add/remove/force +sp_arith = add # ignore/add/remove/force +sp_before_ptr_star = remove # ignore/add/remove/force diff --git a/tests/config/bug_i_409-create.cfg b/tests/config/bug_i_409-create.cfg index ec37d34ddc..c567f4fabb 100644 --- a/tests/config/bug_i_409-create.cfg +++ b/tests/config/bug_i_409-create.cfg @@ -1,9 +1,9 @@ -indent_with_tabs = 0 -indent_columns = 4 +indent_with_tabs = 0 +indent_columns = 4 # -nl_create_if_one_liner = true -nl_create_for_one_liner = true -nl_create_while_one_liner = true +nl_create_if_one_liner = true +nl_create_for_one_liner = true +nl_create_while_one_liner = true #nl_split_if_one_liner = true #nl_split_for_one_liner = true diff --git a/tests/config/bug_i_409-split.cfg b/tests/config/bug_i_409-split.cfg index fbd53d2346..0db319969a 100644 --- a/tests/config/bug_i_409-split.cfg +++ b/tests/config/bug_i_409-split.cfg @@ -1,10 +1,10 @@ -indent_with_tabs = 0 -indent_columns = 4 +indent_with_tabs = 0 +indent_columns = 4 # #nl_create_if_one_liner = true #nl_create_for_one_liner = true #nl_create_while_one_liner = true -nl_split_if_one_liner = true -nl_split_for_one_liner = true -nl_split_while_one_liner = true +nl_split_if_one_liner = true +nl_split_for_one_liner = true +nl_split_while_one_liner = true diff --git a/tests/config/bug_i_411.cfg b/tests/config/bug_i_411.cfg index 5c54a1bfa9..5595723758 100644 --- a/tests/config/bug_i_411.cfg +++ b/tests/config/bug_i_411.cfg @@ -1 +1 @@ -nl_after_func_proto_group = 3 +nl_after_func_proto_group = 3 diff --git a/tests/config/bug_i_411a.cfg b/tests/config/bug_i_411a.cfg index 91f50754c8..8e7bd4834c 100644 --- a/tests/config/bug_i_411a.cfg +++ b/tests/config/bug_i_411a.cfg @@ -1 +1 @@ -nl_after_func_proto = 3 +nl_after_func_proto = 3 diff --git a/tests/config/bug_i_411b.cfg b/tests/config/bug_i_411b.cfg index a387060d87..c478257b52 100644 --- a/tests/config/bug_i_411b.cfg +++ b/tests/config/bug_i_411b.cfg @@ -1 +1 @@ -nl_after_func_class_proto = 3 +nl_after_func_class_proto = 3 diff --git a/tests/config/bug_i_477.cfg b/tests/config/bug_i_477.cfg index 0a3a3c6e1e..2cd3230fef 100644 --- a/tests/config/bug_i_477.cfg +++ b/tests/config/bug_i_477.cfg @@ -1 +1 @@ -nl_oc_block_brace = force +nl_oc_block_brace = force diff --git a/tests/config/bug_i_478.cfg b/tests/config/bug_i_478.cfg index ea5ab9815f..ae915151fd 100644 --- a/tests/config/bug_i_478.cfg +++ b/tests/config/bug_i_478.cfg @@ -1,4 +1,4 @@ -indent_continue=5 -code_width=80 -indent_with_tabs=0 -use_indent_continue_only_once=true +indent_continue = 5 +code_width = 80 +indent_with_tabs = 0 +use_indent_continue_only_once = true diff --git a/tests/config/bug_i_481.cfg b/tests/config/bug_i_481.cfg index 711e48d5b9..84726ba29a 100644 --- a/tests/config/bug_i_481.cfg +++ b/tests/config/bug_i_481.cfg @@ -1,10 +1,10 @@ -indent_columns = 8 -sp_balance_nested_parens = true -sp_inside_fparen = force -sp_inside_fparens = force -sp_paren_paren = force -sp_before_comma = force -sp_after_comma = force -sp_before_byref = force -sp_before_unnamed_byref = force -sp_after_type = force +indent_columns = 8 +sp_balance_nested_parens = true +sp_inside_fparen = force +sp_inside_fparens = force +sp_paren_paren = force +sp_before_comma = force +sp_after_comma = force +sp_before_byref = force +sp_before_unnamed_byref = force +sp_after_type = force diff --git a/tests/config/bug_i_552.cfg b/tests/config/bug_i_552.cfg index bfa960363b..0d78de4505 100644 --- a/tests/config/bug_i_552.cfg +++ b/tests/config/bug_i_552.cfg @@ -1,2 +1,2 @@ -indent_columns=4 -indent_with_tabs=0 +indent_columns = 4 +indent_with_tabs = 0 diff --git a/tests/config/bug_i_568.cfg b/tests/config/bug_i_568.cfg index d8e60e9aca..1dbad7ec33 100644 --- a/tests/config/bug_i_568.cfg +++ b/tests/config/bug_i_568.cfg @@ -1 +1 @@ -indent_class=true +indent_class = true diff --git a/tests/config/bug_i_596.cfg b/tests/config/bug_i_596.cfg index 1053348fa4..69cac60039 100644 --- a/tests/config/bug_i_596.cfg +++ b/tests/config/bug_i_596.cfg @@ -1,3 +1,3 @@ -indent_with_tabs = 0 -indent_columns = 4 -sp_deref = remove +indent_with_tabs = 0 +indent_columns = 4 +sp_deref = remove diff --git a/tests/config/bug_i_663.cfg b/tests/config/bug_i_663.cfg index 3ca830d525..38d8d4fe12 100644 --- a/tests/config/bug_i_663.cfg +++ b/tests/config/bug_i_663.cfg @@ -1,4 +1,4 @@ -indent_with_tabs = 0 -indent_columns = 4 -indent_switch_case = 4 -indent_case_brace = 4 +indent_with_tabs = 0 +indent_columns = 4 +indent_switch_case = 4 +indent_case_brace = 4 diff --git a/tests/config/bug_i_666.cfg b/tests/config/bug_i_666.cfg index 6acabd4954..18742a67f8 100644 --- a/tests/config/bug_i_666.cfg +++ b/tests/config/bug_i_666.cfg @@ -1,2 +1,2 @@ -indent_else_if = true -nl_after_brace_close = true +indent_else_if = true +nl_after_brace_close = true diff --git a/tests/config/bug_i_679.cfg b/tests/config/bug_i_679.cfg index ae152fd43e..a2a7c0e1ac 100644 --- a/tests/config/bug_i_679.cfg +++ b/tests/config/bug_i_679.cfg @@ -1 +1 @@ -indent_using_block = false +indent_using_block = false diff --git a/tests/config/bug_i_687.cfg b/tests/config/bug_i_687.cfg index c65b6c3c38..ef3fc1fd25 100644 --- a/tests/config/bug_i_687.cfg +++ b/tests/config/bug_i_687.cfg @@ -1,3 +1,3 @@ -indent_columns = 4 -indent_with_tabs = 0 +indent_columns = 4 +indent_with_tabs = 0 diff --git a/tests/config/bug_i_771.cfg b/tests/config/bug_i_771.cfg index df55e509c1..9f1387e88f 100644 --- a/tests/config/bug_i_771.cfg +++ b/tests/config/bug_i_771.cfg @@ -1,10 +1,10 @@ -indent_columns = 4 -indent_with_tabs = 0 +indent_columns = 4 +indent_with_tabs = 0 #How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 1 +align_var_def_star_style = 1 # SS_INCLUDE: - space between variable and '*' or '&' is eaten # void foo; // gap=5, 'foo' is aligned # char *foo; // gap=5, '*' is aligned @@ -20,7 +20,7 @@ align_var_def_star_style = 1 # foomatic foo; // gap=2 #The span for aligning struct/union (0=don't align) -align_var_struct_span = 1 +align_var_struct_span = 1 #The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 5 +align_var_struct_thresh = 5 diff --git a/tests/config/bug_i_793.cfg b/tests/config/bug_i_793.cfg index dae8506421..f4ed321b82 100644 --- a/tests/config/bug_i_793.cfg +++ b/tests/config/bug_i_793.cfg @@ -1,5 +1,5 @@ -indent_columns = 3 -indent_with_tabs = 0 +indent_columns = 3 +indent_with_tabs = 0 -align_typedef_gap = 5 -align_typedef_span = 2 +align_typedef_gap = 5 +align_typedef_span = 2 diff --git a/tests/config/bug_i_825.cfg b/tests/config/bug_i_825.cfg index 4babe60e70..6d057a6e6d 100644 --- a/tests/config/bug_i_825.cfg +++ b/tests/config/bug_i_825.cfg @@ -1,2 +1,2 @@ -indent_columns = 3 -indent_with_tabs = 0 +indent_columns = 3 +indent_with_tabs = 0 diff --git a/tests/config/bug_i_876.cfg b/tests/config/bug_i_876.cfg index 8ed37c12f5..e19ced3178 100644 --- a/tests/config/bug_i_876.cfg +++ b/tests/config/bug_i_876.cfg @@ -1 +1 @@ -force_tab_after_define= true +force_tab_after_define = true diff --git a/tests/config/bug_i_889.cfg b/tests/config/bug_i_889.cfg index dae70e66e8..f72add1a23 100644 --- a/tests/config/bug_i_889.cfg +++ b/tests/config/bug_i_889.cfg @@ -1 +1 @@ -sp_after_cast = remove +sp_after_cast = remove diff --git a/tests/config/bug_i_928.cfg b/tests/config/bug_i_928.cfg index a752ed8e5c..cac2beba78 100644 --- a/tests/config/bug_i_928.cfg +++ b/tests/config/bug_i_928.cfg @@ -1,6 +1,6 @@ #indent_columns = 8 -indent_with_tabs = 0 -indent_namespace = false +indent_with_tabs = 0 +indent_namespace = false indent_namespace_single_indent = false -indent_namespace_level = 0 -nl_namespace_brace = ignore +indent_namespace_level = 0 +nl_namespace_brace = ignore diff --git a/tests/config/bug_i_935.cfg b/tests/config/bug_i_935.cfg index f80d3a5050..bd99e59fb0 100644 --- a/tests/config/bug_i_935.cfg +++ b/tests/config/bug_i_935.cfg @@ -1 +1 @@ -mod_sort_using = true +mod_sort_using = true diff --git a/tests/config/bug_i_938.cfg b/tests/config/bug_i_938.cfg index 6cf12ead88..dee3e2b72d 100644 --- a/tests/config/bug_i_938.cfg +++ b/tests/config/bug_i_938.cfg @@ -1 +1 @@ -nl_comment_func_def=1 +nl_comment_func_def = 1 diff --git a/tests/config/bug_i_width.cfg b/tests/config/bug_i_width.cfg index 813a7b66ff..f2c072b4ed 100644 --- a/tests/config/bug_i_width.cfg +++ b/tests/config/bug_i_width.cfg @@ -1,3 +1,3 @@ -indent_with_tabs = 0 -code_width = 30 -indent_columns = 4 +indent_with_tabs = 0 +code_width = 30 +indent_columns = 4 diff --git a/tests/config/byref-2.cfg b/tests/config/byref-2.cfg index 9be723472c..61f8ff2025 100644 --- a/tests/config/byref-2.cfg +++ b/tests/config/byref-2.cfg @@ -1,8 +1,8 @@ -sp_before_byref_func=force -sp_after_byref_func=force -sp_before_byref=force -sp_after_byref=force -sp_before_byref=force -sp_before_unnamed_byref=force -sp_after_byref=force -sp_addr=force +sp_before_byref_func = force +sp_after_byref_func = force +sp_before_byref = force +sp_after_byref = force +sp_before_byref = force +sp_before_unnamed_byref = force +sp_after_byref = force +sp_addr = force diff --git a/tests/config/byref-center.cfg b/tests/config/byref-center.cfg index 4fea840584..66754b0827 100644 --- a/tests/config/byref-center.cfg +++ b/tests/config/byref-center.cfg @@ -2,10 +2,10 @@ # Places the byref as follows: "int & foo" # -indent_columns = 3 +indent_columns = 3 -sp_before_byref = force -sp_after_byref = force +sp_before_byref = force +sp_after_byref = force -indent_class = True +indent_class = True diff --git a/tests/config/byref-left.cfg b/tests/config/byref-left.cfg index d65a5fff1e..f7020adb44 100644 --- a/tests/config/byref-left.cfg +++ b/tests/config/byref-left.cfg @@ -2,10 +2,10 @@ # Places the byref as follows: "int &foo" # -indent_columns = 3 +indent_columns = 3 -sp_before_byref = force -sp_after_byref = remove +sp_before_byref = force +sp_after_byref = remove -indent_class = True +indent_class = True diff --git a/tests/config/byref-right.cfg b/tests/config/byref-right.cfg index 606a351a5d..f0c754b313 100644 --- a/tests/config/byref-right.cfg +++ b/tests/config/byref-right.cfg @@ -2,10 +2,10 @@ # Places the byref as follows: "int& foo" # -indent_columns = 3 +indent_columns = 3 -sp_before_byref = remove -sp_after_byref = force +sp_before_byref = remove +sp_after_byref = force -indent_class = True +indent_class = True diff --git a/tests/config/case-1.cfg b/tests/config/case-1.cfg index 929068faa4..3d6a1c65af 100644 --- a/tests/config/case-1.cfg +++ b/tests/config/case-1.cfg @@ -2,14 +2,14 @@ # My favorite format # -indent_with_tabs = 1 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 1 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 3 # new tab size +indent_columns = output_tab_size -indent_switch_case = 0 -indent_case_brace = 0 +indent_switch_case = 0 +indent_case_brace = 0 -nl_before_case = True # blank line before case except after { -nl_after_case = True # disallow case X: a++; break; +nl_before_case = True # blank line before case except after { +nl_after_case = True # disallow case X: a++; break; diff --git a/tests/config/case-2.cfg b/tests/config/case-2.cfg index d304aed8a4..d393a02eff 100644 --- a/tests/config/case-2.cfg +++ b/tests/config/case-2.cfg @@ -2,16 +2,16 @@ # My favorite format # -indent_with_tabs = 1 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 1 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 3 # new tab size +indent_columns = output_tab_size -indent_switch_case = indent_columns -indent_case_brace = 0 +indent_switch_case = indent_columns +indent_case_brace = 0 -nl_before_case = True # blank line before case except after { -nl_after_case = True # disallow case X: a++; break; +nl_before_case = True # blank line before case except after { +nl_after_case = True # disallow case X: a++; break; mod_move_case_break = True diff --git a/tests/config/case-3.cfg b/tests/config/case-3.cfg index b59ad31109..5aeebf6387 100644 --- a/tests/config/case-3.cfg +++ b/tests/config/case-3.cfg @@ -2,14 +2,14 @@ # My favorite format # -indent_with_tabs = 1 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 1 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 3 # new tab size +indent_columns = output_tab_size -indent_switch_case = indent_columns -indent_case_brace = -indent_columns +indent_switch_case = indent_columns +indent_case_brace = -indent_columns -nl_before_case = True # blank line before case except after { -nl_after_case = True # disallow case X: a++; break; +nl_before_case = True # blank line before case except after { +nl_after_case = True # disallow case X: a++; break; diff --git a/tests/config/cast-sp-a.cfg b/tests/config/cast-sp-a.cfg index 46b2050c41..dfa5b81086 100644 --- a/tests/config/cast-sp-a.cfg +++ b/tests/config/cast-sp-a.cfg @@ -1,195 +1,195 @@ -newlines = auto -input_tab_size = 8 -output_tab_size = 3 -string_escape_char = 92 -indent_columns = 3 -indent_with_tabs = 0 -indent_align_string = false -indent_xml_string = 0 -indent_brace = 0 -indent_braces = false -indent_braces_no_func = false -indent_brace_parent = false -indent_namespace = false -indent_class = true -indent_class_colon = false -indent_func_call_param = false -indent_member = 3 -indent_sing_line_comments = 0 -indent_switch_case = 0 -indent_case_brace = 0 -indent_col1_comment = false -indent_label = 2 -indent_access_spec = 2 -indent_paren_nl = false -indent_square_nl = false -sp_arith = force -sp_assign = force -sp_bool = force -sp_compare = force -sp_inside_paren = remove -sp_paren_paren = remove -sp_balance_nested_parens = false -sp_paren_brace = ignore -sp_before_ptr_star = force -sp_between_ptr_star = remove -sp_after_ptr_star = remove -sp_before_byref = remove -sp_after_byref = ignore -sp_before_angle = remove -sp_after_angle = force -sp_angle_paren = remove -sp_angle_paren_empty = remove -sp_angle_word = force -sp_before_sparen = force -sp_inside_sparen = remove -sp_after_sparen = force -sp_sparen_brace = ignore -sp_special_semi = ignore -sp_before_semi = remove -sp_before_semi_for = ignore -sp_before_square = ignore -sp_before_squares = ignore -sp_inside_square = remove -sp_after_comma = force -sp_before_comma = remove -sp_after_operator = ignore -sp_after_cast = remove -sp_inside_paren_cast = force -sp_sizeof_paren = remove -sp_after_tag = ignore -sp_inside_braces_enum = force -sp_inside_braces_struct = force -sp_inside_braces = force -sp_inside_angle = remove -sp_type_func = ignore -sp_func_proto_paren = remove -sp_func_def_paren = remove -sp_inside_fparens = ignore -sp_inside_fparen = remove -sp_square_fparen = ignore -sp_fparen_brace = ignore -sp_func_call_paren = remove -sp_func_class_paren = ignore -sp_return_paren = remove -sp_macro = ignore -sp_macro_func = ignore -sp_else_brace = ignore -sp_brace_else = ignore -sp_catch_brace = ignore -sp_brace_catch = ignore -sp_finally_brace = ignore -sp_brace_finally = ignore -sp_try_brace = ignore -sp_getset_brace = ignore -align_keep_tabs = false -align_with_tabs = false -align_on_tabstop = false -align_number_right = true -align_func_params = true -align_var_def_span = 2 -align_var_def_star_style = 1 -align_var_def_thresh = 0 -align_var_def_colon = true -align_var_def_inline = true -align_assign_span = 1 -align_assign_thresh = 0 -align_enum_equ_span = 4 -align_enum_equ_thresh = 0 -align_var_struct_span = 3 -align_struct_init_span = 3 -align_typedef_gap = 3 -align_typedef_span = 5 -align_typedef_star_style = 0 -align_right_cmt_span = 3 -align_func_proto_span = 0 -align_nl_cont = true -align_pp_define_gap = 4 -align_pp_define_span = 3 -code_width = 0 -nl_collapse_empty_body = false -nl_class_leave_one_liners = true -nl_start_of_file = ignore -nl_start_of_file_min = 0 -nl_end_of_file = ignore -nl_end_of_file_min = 0 -nl_assign_brace = add -nl_func_var_def_blk = 1 -nl_fcall_brace = add -nl_enum_brace = add -nl_struct_brace = add -nl_union_brace = add -nl_if_brace = add -nl_brace_else = add -nl_elseif_brace = ignore -nl_else_brace = add -nl_brace_finally = ignore -nl_finally_brace = add -nl_try_brace = add -nl_getset_brace = ignore -nl_for_brace = add -nl_catch_brace = add -nl_brace_catch = ignore -nl_while_brace = add -nl_do_brace = add -nl_brace_while = remove -nl_switch_brace = add -nl_before_case = true -nl_after_case = false -nl_namespace_brace = ignore -nl_template_class = ignore -nl_class_brace = ignore -nl_class_init_args = ignore -nl_func_type_name = ignore -nl_func_decl_start = ignore -nl_func_decl_args = ignore -nl_func_decl_end = ignore -nl_fdef_brace = add -nl_after_return = true -nl_after_semicolon = false -nl_after_brace_open = false -nl_define_macro = false -nl_squeeze_ifdef = true -nl_before_if = ignore -nl_after_if = ignore -nl_before_for = ignore -nl_after_for = ignore -nl_before_while = ignore -nl_after_while = ignore -nl_before_switch = ignore -nl_after_switch = ignore -nl_before_do = ignore -nl_after_do = ignore -nl_ds_struct_enum_cmt = false -pos_bool = ignore -pos_class_colon = ignore -ls_for_split_full = false -ls_func_split_full = false -nl_max = 0 -nl_after_func_proto = 0 -nl_after_func_proto_group = 0 -nl_after_func_body = 0 -nl_after_func_body_one_liner = 0 -nl_before_block_comment = 0 -nl_before_c_comment = 0 -nl_before_cpp_comment = 0 -eat_blanks_after_open_brace = true -eat_blanks_before_close_brace = true -mod_full_brace_do = add -mod_full_brace_for = add -mod_full_brace_function = ignore -mod_full_brace_if = add -mod_full_brace_nl = 0 -mod_full_brace_while = add -mod_paren_on_return = add -mod_pawn_semicolon = false -mod_full_paren_if_bool = false -cmt_cpp_group = false -cmt_cpp_nl_start = false -cmt_cpp_nl_end = false -cmt_cpp_to_c = false -cmt_star_cont = true -cmt_sp_before_star_cont = 0 -cmt_sp_after_star_cont = 0 -pp_indent = ignore -pp_space = ignore +newlines = auto +input_tab_size = 8 +output_tab_size = 3 +string_escape_char = 92 +indent_columns = 3 +indent_with_tabs = 0 +indent_align_string = false +indent_xml_string = 0 +indent_brace = 0 +indent_braces = false +indent_braces_no_func = false +indent_brace_parent = false +indent_namespace = false +indent_class = true +indent_class_colon = false +indent_func_call_param = false +indent_member = 3 +indent_sing_line_comments = 0 +indent_switch_case = 0 +indent_case_brace = 0 +indent_col1_comment = false +indent_label = 2 +indent_access_spec = 2 +indent_paren_nl = false +indent_square_nl = false +sp_arith = force +sp_assign = force +sp_bool = force +sp_compare = force +sp_inside_paren = remove +sp_paren_paren = remove +sp_balance_nested_parens = false +sp_paren_brace = ignore +sp_before_ptr_star = force +sp_between_ptr_star = remove +sp_after_ptr_star = remove +sp_before_byref = remove +sp_after_byref = ignore +sp_before_angle = remove +sp_after_angle = force +sp_angle_paren = remove +sp_angle_paren_empty = remove +sp_angle_word = force +sp_before_sparen = force +sp_inside_sparen = remove +sp_after_sparen = force +sp_sparen_brace = ignore +sp_special_semi = ignore +sp_before_semi = remove +sp_before_semi_for = ignore +sp_before_square = ignore +sp_before_squares = ignore +sp_inside_square = remove +sp_after_comma = force +sp_before_comma = remove +sp_after_operator = ignore +sp_after_cast = remove +sp_inside_paren_cast = force +sp_sizeof_paren = remove +sp_after_tag = ignore +sp_inside_braces_enum = force +sp_inside_braces_struct = force +sp_inside_braces = force +sp_inside_angle = remove +sp_type_func = ignore +sp_func_proto_paren = remove +sp_func_def_paren = remove +sp_inside_fparens = ignore +sp_inside_fparen = remove +sp_square_fparen = ignore +sp_fparen_brace = ignore +sp_func_call_paren = remove +sp_func_class_paren = ignore +sp_return_paren = remove +sp_macro = ignore +sp_macro_func = ignore +sp_else_brace = ignore +sp_brace_else = ignore +sp_catch_brace = ignore +sp_brace_catch = ignore +sp_finally_brace = ignore +sp_brace_finally = ignore +sp_try_brace = ignore +sp_getset_brace = ignore +align_keep_tabs = false +align_with_tabs = false +align_on_tabstop = false +align_number_right = true +align_func_params = true +align_var_def_span = 2 +align_var_def_star_style = 1 +align_var_def_thresh = 0 +align_var_def_colon = true +align_var_def_inline = true +align_assign_span = 1 +align_assign_thresh = 0 +align_enum_equ_span = 4 +align_enum_equ_thresh = 0 +align_var_struct_span = 3 +align_struct_init_span = 3 +align_typedef_gap = 3 +align_typedef_span = 5 +align_typedef_star_style = 0 +align_right_cmt_span = 3 +align_func_proto_span = 0 +align_nl_cont = true +align_pp_define_gap = 4 +align_pp_define_span = 3 +code_width = 0 +nl_collapse_empty_body = false +nl_class_leave_one_liners = true +nl_start_of_file = ignore +nl_start_of_file_min = 0 +nl_end_of_file = ignore +nl_end_of_file_min = 0 +nl_assign_brace = add +nl_func_var_def_blk = 1 +nl_fcall_brace = add +nl_enum_brace = add +nl_struct_brace = add +nl_union_brace = add +nl_if_brace = add +nl_brace_else = add +nl_elseif_brace = ignore +nl_else_brace = add +nl_brace_finally = ignore +nl_finally_brace = add +nl_try_brace = add +nl_getset_brace = ignore +nl_for_brace = add +nl_catch_brace = add +nl_brace_catch = ignore +nl_while_brace = add +nl_do_brace = add +nl_brace_while = remove +nl_switch_brace = add +nl_before_case = true +nl_after_case = false +nl_namespace_brace = ignore +nl_template_class = ignore +nl_class_brace = ignore +nl_class_init_args = ignore +nl_func_type_name = ignore +nl_func_decl_start = ignore +nl_func_decl_args = ignore +nl_func_decl_end = ignore +nl_fdef_brace = add +nl_after_return = true +nl_after_semicolon = false +nl_after_brace_open = false +nl_define_macro = false +nl_squeeze_ifdef = true +nl_before_if = ignore +nl_after_if = ignore +nl_before_for = ignore +nl_after_for = ignore +nl_before_while = ignore +nl_after_while = ignore +nl_before_switch = ignore +nl_after_switch = ignore +nl_before_do = ignore +nl_after_do = ignore +nl_ds_struct_enum_cmt = false +pos_bool = ignore +pos_class_colon = ignore +ls_for_split_full = false +ls_func_split_full = false +nl_max = 0 +nl_after_func_proto = 0 +nl_after_func_proto_group = 0 +nl_after_func_body = 0 +nl_after_func_body_one_liner = 0 +nl_before_block_comment = 0 +nl_before_c_comment = 0 +nl_before_cpp_comment = 0 +eat_blanks_after_open_brace = true +eat_blanks_before_close_brace = true +mod_full_brace_do = add +mod_full_brace_for = add +mod_full_brace_function = ignore +mod_full_brace_if = add +mod_full_brace_nl = 0 +mod_full_brace_while = add +mod_paren_on_return = add +mod_pawn_semicolon = false +mod_full_paren_if_bool = false +cmt_cpp_group = false +cmt_cpp_nl_start = false +cmt_cpp_nl_end = false +cmt_cpp_to_c = false +cmt_star_cont = true +cmt_sp_before_star_cont = 0 +cmt_sp_after_star_cont = 0 +pp_indent = ignore +pp_space = ignore diff --git a/tests/config/cast-sp-r.cfg b/tests/config/cast-sp-r.cfg index 68ba6b26c7..361c03ab96 100644 --- a/tests/config/cast-sp-r.cfg +++ b/tests/config/cast-sp-r.cfg @@ -1,195 +1,195 @@ -newlines = auto -input_tab_size = 8 -output_tab_size = 3 -string_escape_char = 92 -indent_columns = 3 -indent_with_tabs = 0 -indent_align_string = false -indent_xml_string = 0 -indent_brace = 0 -indent_braces = false -indent_braces_no_func = false -indent_brace_parent = false -indent_namespace = false -indent_class = true -indent_class_colon = false -indent_func_call_param = false -indent_member = 3 -indent_sing_line_comments = 0 -indent_switch_case = 0 -indent_case_brace = 0 -indent_col1_comment = false -indent_label = 2 -indent_access_spec = 2 -indent_paren_nl = false -indent_square_nl = false -sp_arith = force -sp_assign = force -sp_bool = force -sp_compare = force -sp_inside_paren = remove -sp_inside_paren_cast = remove -sp_paren_paren = remove -sp_balance_nested_parens = false -sp_paren_brace = ignore -sp_before_ptr_star = force -sp_between_ptr_star = remove -sp_after_ptr_star = remove -sp_before_byref = remove -sp_after_byref = ignore -sp_before_angle = remove -sp_after_angle = force -sp_angle_paren = remove -sp_angle_paren_empty = remove -sp_angle_word = force -sp_before_sparen = force -sp_inside_sparen = remove -sp_after_sparen = force -sp_sparen_brace = ignore -sp_special_semi = ignore -sp_before_semi = remove -sp_before_semi_for = ignore -sp_before_square = ignore -sp_before_squares = ignore -sp_inside_square = remove -sp_after_comma = force -sp_before_comma = remove -sp_after_operator = ignore -sp_after_cast = remove -sp_sizeof_paren = remove -sp_after_tag = ignore -sp_inside_braces_enum = force -sp_inside_braces_struct = force -sp_inside_braces = force -sp_inside_angle = remove -sp_type_func = ignore -sp_func_proto_paren = remove -sp_func_def_paren = remove -sp_inside_fparens = ignore -sp_inside_fparen = remove -sp_square_fparen = ignore -sp_fparen_brace = ignore -sp_func_call_paren = remove -sp_func_class_paren = ignore -sp_return_paren = remove -sp_macro = ignore -sp_macro_func = ignore -sp_else_brace = ignore -sp_brace_else = ignore -sp_catch_brace = ignore -sp_brace_catch = ignore -sp_finally_brace = ignore -sp_brace_finally = ignore -sp_try_brace = ignore -sp_getset_brace = ignore -align_keep_tabs = false -align_with_tabs = false -align_on_tabstop = false -align_number_right = true -align_func_params = true -align_var_def_span = 2 -align_var_def_star_style = 1 -align_var_def_thresh = 0 -align_var_def_colon = true -align_var_def_inline = true -align_assign_span = 1 -align_assign_thresh = 0 -align_enum_equ_span = 4 -align_enum_equ_thresh = 0 -align_var_struct_span = 3 -align_struct_init_span = 3 -align_typedef_gap = 3 -align_typedef_span = 5 -align_typedef_star_style = 0 -align_right_cmt_span = 3 -align_func_proto_span = 0 -align_nl_cont = true -align_pp_define_gap = 4 -align_pp_define_span = 3 -code_width = 0 -nl_collapse_empty_body = false -nl_class_leave_one_liners = true -nl_start_of_file = ignore -nl_start_of_file_min = 0 -nl_end_of_file = ignore -nl_end_of_file_min = 0 -nl_assign_brace = add -nl_func_var_def_blk = 1 -nl_fcall_brace = add -nl_enum_brace = add -nl_struct_brace = add -nl_union_brace = add -nl_if_brace = add -nl_brace_else = add -nl_elseif_brace = ignore -nl_else_brace = add -nl_brace_finally = ignore -nl_finally_brace = add -nl_try_brace = add -nl_getset_brace = ignore -nl_for_brace = add -nl_catch_brace = add -nl_brace_catch = ignore -nl_while_brace = add -nl_do_brace = add -nl_brace_while = remove -nl_switch_brace = add -nl_before_case = true -nl_after_case = false -nl_namespace_brace = ignore -nl_template_class = ignore -nl_class_brace = ignore -nl_class_init_args = ignore -nl_func_type_name = ignore -nl_func_decl_start = ignore -nl_func_decl_args = ignore -nl_func_decl_end = ignore -nl_fdef_brace = add -nl_after_return = true -nl_after_semicolon = false -nl_after_brace_open = false -nl_define_macro = false -nl_squeeze_ifdef = true -nl_before_if = ignore -nl_after_if = ignore -nl_before_for = ignore -nl_after_for = ignore -nl_before_while = ignore -nl_after_while = ignore -nl_before_switch = ignore -nl_after_switch = ignore -nl_before_do = ignore -nl_after_do = ignore -nl_ds_struct_enum_cmt = false -pos_bool = ignore -pos_class_colon = ignore -ls_for_split_full = false -ls_func_split_full = false -nl_max = 0 -nl_after_func_proto = 0 -nl_after_func_proto_group = 0 -nl_after_func_body = 0 -nl_after_func_body_one_liner = 0 -nl_before_block_comment = 0 -nl_before_c_comment = 0 -nl_before_cpp_comment = 0 -eat_blanks_after_open_brace = true -eat_blanks_before_close_brace = true -mod_full_brace_do = add -mod_full_brace_for = add -mod_full_brace_function = ignore -mod_full_brace_if = add -mod_full_brace_nl = 0 -mod_full_brace_while = add -mod_paren_on_return = add -mod_pawn_semicolon = false -mod_full_paren_if_bool = false -cmt_cpp_group = false -cmt_cpp_nl_start = false -cmt_cpp_nl_end = false -cmt_cpp_to_c = false -cmt_star_cont = true -cmt_sp_before_star_cont = 0 -cmt_sp_after_star_cont = 0 -pp_indent = ignore -pp_space = ignore +newlines = auto +input_tab_size = 8 +output_tab_size = 3 +string_escape_char = 92 +indent_columns = 3 +indent_with_tabs = 0 +indent_align_string = false +indent_xml_string = 0 +indent_brace = 0 +indent_braces = false +indent_braces_no_func = false +indent_brace_parent = false +indent_namespace = false +indent_class = true +indent_class_colon = false +indent_func_call_param = false +indent_member = 3 +indent_sing_line_comments = 0 +indent_switch_case = 0 +indent_case_brace = 0 +indent_col1_comment = false +indent_label = 2 +indent_access_spec = 2 +indent_paren_nl = false +indent_square_nl = false +sp_arith = force +sp_assign = force +sp_bool = force +sp_compare = force +sp_inside_paren = remove +sp_inside_paren_cast = remove +sp_paren_paren = remove +sp_balance_nested_parens = false +sp_paren_brace = ignore +sp_before_ptr_star = force +sp_between_ptr_star = remove +sp_after_ptr_star = remove +sp_before_byref = remove +sp_after_byref = ignore +sp_before_angle = remove +sp_after_angle = force +sp_angle_paren = remove +sp_angle_paren_empty = remove +sp_angle_word = force +sp_before_sparen = force +sp_inside_sparen = remove +sp_after_sparen = force +sp_sparen_brace = ignore +sp_special_semi = ignore +sp_before_semi = remove +sp_before_semi_for = ignore +sp_before_square = ignore +sp_before_squares = ignore +sp_inside_square = remove +sp_after_comma = force +sp_before_comma = remove +sp_after_operator = ignore +sp_after_cast = remove +sp_sizeof_paren = remove +sp_after_tag = ignore +sp_inside_braces_enum = force +sp_inside_braces_struct = force +sp_inside_braces = force +sp_inside_angle = remove +sp_type_func = ignore +sp_func_proto_paren = remove +sp_func_def_paren = remove +sp_inside_fparens = ignore +sp_inside_fparen = remove +sp_square_fparen = ignore +sp_fparen_brace = ignore +sp_func_call_paren = remove +sp_func_class_paren = ignore +sp_return_paren = remove +sp_macro = ignore +sp_macro_func = ignore +sp_else_brace = ignore +sp_brace_else = ignore +sp_catch_brace = ignore +sp_brace_catch = ignore +sp_finally_brace = ignore +sp_brace_finally = ignore +sp_try_brace = ignore +sp_getset_brace = ignore +align_keep_tabs = false +align_with_tabs = false +align_on_tabstop = false +align_number_right = true +align_func_params = true +align_var_def_span = 2 +align_var_def_star_style = 1 +align_var_def_thresh = 0 +align_var_def_colon = true +align_var_def_inline = true +align_assign_span = 1 +align_assign_thresh = 0 +align_enum_equ_span = 4 +align_enum_equ_thresh = 0 +align_var_struct_span = 3 +align_struct_init_span = 3 +align_typedef_gap = 3 +align_typedef_span = 5 +align_typedef_star_style = 0 +align_right_cmt_span = 3 +align_func_proto_span = 0 +align_nl_cont = true +align_pp_define_gap = 4 +align_pp_define_span = 3 +code_width = 0 +nl_collapse_empty_body = false +nl_class_leave_one_liners = true +nl_start_of_file = ignore +nl_start_of_file_min = 0 +nl_end_of_file = ignore +nl_end_of_file_min = 0 +nl_assign_brace = add +nl_func_var_def_blk = 1 +nl_fcall_brace = add +nl_enum_brace = add +nl_struct_brace = add +nl_union_brace = add +nl_if_brace = add +nl_brace_else = add +nl_elseif_brace = ignore +nl_else_brace = add +nl_brace_finally = ignore +nl_finally_brace = add +nl_try_brace = add +nl_getset_brace = ignore +nl_for_brace = add +nl_catch_brace = add +nl_brace_catch = ignore +nl_while_brace = add +nl_do_brace = add +nl_brace_while = remove +nl_switch_brace = add +nl_before_case = true +nl_after_case = false +nl_namespace_brace = ignore +nl_template_class = ignore +nl_class_brace = ignore +nl_class_init_args = ignore +nl_func_type_name = ignore +nl_func_decl_start = ignore +nl_func_decl_args = ignore +nl_func_decl_end = ignore +nl_fdef_brace = add +nl_after_return = true +nl_after_semicolon = false +nl_after_brace_open = false +nl_define_macro = false +nl_squeeze_ifdef = true +nl_before_if = ignore +nl_after_if = ignore +nl_before_for = ignore +nl_after_for = ignore +nl_before_while = ignore +nl_after_while = ignore +nl_before_switch = ignore +nl_after_switch = ignore +nl_before_do = ignore +nl_after_do = ignore +nl_ds_struct_enum_cmt = false +pos_bool = ignore +pos_class_colon = ignore +ls_for_split_full = false +ls_func_split_full = false +nl_max = 0 +nl_after_func_proto = 0 +nl_after_func_proto_group = 0 +nl_after_func_body = 0 +nl_after_func_body_one_liner = 0 +nl_before_block_comment = 0 +nl_before_c_comment = 0 +nl_before_cpp_comment = 0 +eat_blanks_after_open_brace = true +eat_blanks_before_close_brace = true +mod_full_brace_do = add +mod_full_brace_for = add +mod_full_brace_function = ignore +mod_full_brace_if = add +mod_full_brace_nl = 0 +mod_full_brace_while = add +mod_paren_on_return = add +mod_pawn_semicolon = false +mod_full_paren_if_bool = false +cmt_cpp_group = false +cmt_cpp_nl_start = false +cmt_cpp_nl_end = false +cmt_cpp_to_c = false +cmt_star_cont = true +cmt_sp_before_star_cont = 0 +cmt_sp_after_star_cont = 0 +pp_indent = ignore +pp_space = ignore diff --git a/tests/config/cast-type.cfg b/tests/config/cast-type.cfg index 0f29b95883..cd48699729 100644 --- a/tests/config/cast-type.cfg +++ b/tests/config/cast-type.cfg @@ -1,199 +1,199 @@ -newlines = auto -input_tab_size = 8 -output_tab_size = 3 -string_escape_char = 92 -indent_columns = 3 -indent_with_tabs = 0 -indent_align_string = false -indent_xml_string = 0 -indent_brace = 0 -indent_braces = false -indent_braces_no_func = false -indent_brace_parent = false -indent_namespace = false -indent_class = true -indent_class_colon = false -indent_func_call_param = false -indent_member = 3 -indent_sing_line_comments = 0 -indent_switch_case = 0 -indent_case_brace = 0 -indent_col1_comment = false -indent_label = 2 -indent_access_spec = 2 -indent_paren_nl = false -indent_square_nl = false -sp_arith = force -sp_assign = force -sp_bool = force -sp_compare = force -sp_inside_paren = remove -sp_inside_paren_cast = remove -sp_paren_paren = remove -sp_balance_nested_parens = false -sp_paren_brace = ignore -sp_before_ptr_star = force -sp_between_ptr_star = remove -sp_after_ptr_star = remove -sp_before_byref = remove -sp_after_byref = ignore -sp_before_angle = remove -sp_after_angle = force -sp_angle_paren = remove -sp_angle_paren_empty = remove -sp_angle_word = force -sp_before_sparen = force -sp_inside_sparen = remove -sp_after_sparen = force -sp_sparen_brace = ignore -sp_special_semi = ignore -sp_before_semi = remove -sp_before_semi_for = ignore -sp_before_square = ignore -sp_before_squares = ignore -sp_inside_square = remove -sp_after_comma = force -sp_before_comma = remove -sp_after_operator = ignore -sp_after_cast = remove -sp_sizeof_paren = remove -sp_after_tag = ignore -sp_inside_braces_enum = force -sp_inside_braces_struct = force -sp_inside_braces = force -sp_inside_angle = remove -sp_type_func = ignore -sp_func_proto_paren = remove -sp_func_def_paren = remove -sp_inside_fparens = ignore -sp_inside_fparen = remove -sp_square_fparen = ignore -sp_fparen_brace = ignore -sp_func_call_paren = remove -sp_func_class_paren = ignore -sp_return_paren = remove -sp_macro = ignore -sp_macro_func = ignore -sp_else_brace = ignore -sp_brace_else = ignore -sp_catch_brace = ignore -sp_brace_catch = ignore -sp_finally_brace = ignore -sp_brace_finally = ignore -sp_try_brace = ignore -sp_getset_brace = ignore -align_keep_tabs = false -align_with_tabs = false -align_on_tabstop = false -align_number_right = true -align_func_params = true -align_var_def_span = 2 -align_var_def_star_style = 1 -align_var_def_thresh = 0 -align_var_def_colon = true -align_var_def_inline = true -align_assign_span = 1 -align_assign_thresh = 0 -align_enum_equ_span = 4 -align_enum_equ_thresh = 0 -align_var_struct_span = 3 -align_struct_init_span = 3 -align_typedef_gap = 3 -align_typedef_span = 5 -align_typedef_star_style = 0 -align_right_cmt_span = 3 -align_func_proto_span = 0 -align_nl_cont = true -align_pp_define_gap = 4 -align_pp_define_span = 3 -code_width = 0 -nl_collapse_empty_body = false -nl_class_leave_one_liners = true -nl_start_of_file = ignore -nl_start_of_file_min = 0 -nl_end_of_file = ignore -nl_end_of_file_min = 0 -nl_assign_brace = add -nl_func_var_def_blk = 1 -nl_fcall_brace = add -nl_enum_brace = add -nl_struct_brace = add -nl_union_brace = add -nl_if_brace = add -nl_brace_else = add -nl_elseif_brace = ignore -nl_else_brace = add -nl_brace_finally = ignore -nl_finally_brace = add -nl_try_brace = add -nl_getset_brace = ignore -nl_for_brace = add -nl_catch_brace = add -nl_brace_catch = ignore -nl_while_brace = add -nl_do_brace = add -nl_brace_while = remove -nl_switch_brace = add -nl_before_case = true -nl_after_case = false -nl_namespace_brace = ignore -nl_template_class = ignore -nl_class_brace = ignore -nl_class_init_args = ignore -nl_func_type_name = ignore -nl_func_decl_start = ignore -nl_func_decl_args = ignore -nl_func_decl_end = ignore -nl_fdef_brace = add -nl_after_return = true -nl_after_semicolon = false -nl_after_brace_open = false -nl_define_macro = false -nl_squeeze_ifdef = true -nl_before_if = ignore -nl_after_if = ignore -nl_before_for = ignore -nl_after_for = ignore -nl_before_while = ignore -nl_after_while = ignore -nl_before_switch = ignore -nl_after_switch = ignore -nl_before_do = ignore -nl_after_do = ignore -nl_ds_struct_enum_cmt = false -pos_bool = ignore -pos_class_colon = ignore -ls_for_split_full = false -ls_func_split_full = false -nl_max = 0 -nl_after_func_proto = 0 -nl_after_func_proto_group = 0 -nl_after_func_body = 0 -nl_after_func_body_one_liner = 0 -nl_before_block_comment = 0 -nl_before_c_comment = 0 -nl_before_cpp_comment = 0 -eat_blanks_after_open_brace = true -eat_blanks_before_close_brace = true -mod_full_brace_do = add -mod_full_brace_for = add -mod_full_brace_function = ignore -mod_full_brace_if = add -mod_full_brace_nl = 0 -mod_full_brace_while = add -mod_paren_on_return = add -mod_pawn_semicolon = false -mod_full_paren_if_bool = false -cmt_cpp_group = false -cmt_cpp_nl_start = false -cmt_cpp_nl_end = false -cmt_cpp_to_c = false -cmt_star_cont = true -cmt_sp_before_star_cont = 0 -cmt_sp_after_star_cont = 0 -pp_indent = ignore -pp_space = ignore +newlines = auto +input_tab_size = 8 +output_tab_size = 3 +string_escape_char = 92 +indent_columns = 3 +indent_with_tabs = 0 +indent_align_string = false +indent_xml_string = 0 +indent_brace = 0 +indent_braces = false +indent_braces_no_func = false +indent_brace_parent = false +indent_namespace = false +indent_class = true +indent_class_colon = false +indent_func_call_param = false +indent_member = 3 +indent_sing_line_comments = 0 +indent_switch_case = 0 +indent_case_brace = 0 +indent_col1_comment = false +indent_label = 2 +indent_access_spec = 2 +indent_paren_nl = false +indent_square_nl = false +sp_arith = force +sp_assign = force +sp_bool = force +sp_compare = force +sp_inside_paren = remove +sp_inside_paren_cast = remove +sp_paren_paren = remove +sp_balance_nested_parens = false +sp_paren_brace = ignore +sp_before_ptr_star = force +sp_between_ptr_star = remove +sp_after_ptr_star = remove +sp_before_byref = remove +sp_after_byref = ignore +sp_before_angle = remove +sp_after_angle = force +sp_angle_paren = remove +sp_angle_paren_empty = remove +sp_angle_word = force +sp_before_sparen = force +sp_inside_sparen = remove +sp_after_sparen = force +sp_sparen_brace = ignore +sp_special_semi = ignore +sp_before_semi = remove +sp_before_semi_for = ignore +sp_before_square = ignore +sp_before_squares = ignore +sp_inside_square = remove +sp_after_comma = force +sp_before_comma = remove +sp_after_operator = ignore +sp_after_cast = remove +sp_sizeof_paren = remove +sp_after_tag = ignore +sp_inside_braces_enum = force +sp_inside_braces_struct = force +sp_inside_braces = force +sp_inside_angle = remove +sp_type_func = ignore +sp_func_proto_paren = remove +sp_func_def_paren = remove +sp_inside_fparens = ignore +sp_inside_fparen = remove +sp_square_fparen = ignore +sp_fparen_brace = ignore +sp_func_call_paren = remove +sp_func_class_paren = ignore +sp_return_paren = remove +sp_macro = ignore +sp_macro_func = ignore +sp_else_brace = ignore +sp_brace_else = ignore +sp_catch_brace = ignore +sp_brace_catch = ignore +sp_finally_brace = ignore +sp_brace_finally = ignore +sp_try_brace = ignore +sp_getset_brace = ignore +align_keep_tabs = false +align_with_tabs = false +align_on_tabstop = false +align_number_right = true +align_func_params = true +align_var_def_span = 2 +align_var_def_star_style = 1 +align_var_def_thresh = 0 +align_var_def_colon = true +align_var_def_inline = true +align_assign_span = 1 +align_assign_thresh = 0 +align_enum_equ_span = 4 +align_enum_equ_thresh = 0 +align_var_struct_span = 3 +align_struct_init_span = 3 +align_typedef_gap = 3 +align_typedef_span = 5 +align_typedef_star_style = 0 +align_right_cmt_span = 3 +align_func_proto_span = 0 +align_nl_cont = true +align_pp_define_gap = 4 +align_pp_define_span = 3 +code_width = 0 +nl_collapse_empty_body = false +nl_class_leave_one_liners = true +nl_start_of_file = ignore +nl_start_of_file_min = 0 +nl_end_of_file = ignore +nl_end_of_file_min = 0 +nl_assign_brace = add +nl_func_var_def_blk = 1 +nl_fcall_brace = add +nl_enum_brace = add +nl_struct_brace = add +nl_union_brace = add +nl_if_brace = add +nl_brace_else = add +nl_elseif_brace = ignore +nl_else_brace = add +nl_brace_finally = ignore +nl_finally_brace = add +nl_try_brace = add +nl_getset_brace = ignore +nl_for_brace = add +nl_catch_brace = add +nl_brace_catch = ignore +nl_while_brace = add +nl_do_brace = add +nl_brace_while = remove +nl_switch_brace = add +nl_before_case = true +nl_after_case = false +nl_namespace_brace = ignore +nl_template_class = ignore +nl_class_brace = ignore +nl_class_init_args = ignore +nl_func_type_name = ignore +nl_func_decl_start = ignore +nl_func_decl_args = ignore +nl_func_decl_end = ignore +nl_fdef_brace = add +nl_after_return = true +nl_after_semicolon = false +nl_after_brace_open = false +nl_define_macro = false +nl_squeeze_ifdef = true +nl_before_if = ignore +nl_after_if = ignore +nl_before_for = ignore +nl_after_for = ignore +nl_before_while = ignore +nl_after_while = ignore +nl_before_switch = ignore +nl_after_switch = ignore +nl_before_do = ignore +nl_after_do = ignore +nl_ds_struct_enum_cmt = false +pos_bool = ignore +pos_class_colon = ignore +ls_for_split_full = false +ls_func_split_full = false +nl_max = 0 +nl_after_func_proto = 0 +nl_after_func_proto_group = 0 +nl_after_func_body = 0 +nl_after_func_body_one_liner = 0 +nl_before_block_comment = 0 +nl_before_c_comment = 0 +nl_before_cpp_comment = 0 +eat_blanks_after_open_brace = true +eat_blanks_before_close_brace = true +mod_full_brace_do = add +mod_full_brace_for = add +mod_full_brace_function = ignore +mod_full_brace_if = add +mod_full_brace_nl = 0 +mod_full_brace_while = add +mod_paren_on_return = add +mod_pawn_semicolon = false +mod_full_paren_if_bool = false +cmt_cpp_group = false +cmt_cpp_nl_start = false +cmt_cpp_nl_end = false +cmt_cpp_to_c = false +cmt_star_cont = true +cmt_sp_before_star_cont = 0 +cmt_sp_after_star_cont = 0 +pp_indent = ignore +pp_space = ignore -type UINT UInt UInt32 UInt16 Uint UINT8 UINT16 UINT32 uint32_t +type UINT UInt UInt32 UInt16 Uint UINT8 UINT16 UINT32 uint32_t diff --git a/tests/config/cast.cfg b/tests/config/cast.cfg index f35194036f..d1eae4b381 100644 --- a/tests/config/cast.cfg +++ b/tests/config/cast.cfg @@ -1,10 +1,10 @@ # Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' #sp_after_cast = ignore # ignore/add/remove/force -sp_after_cast = force +sp_after_cast = force # Add or remove spaces inside cast parens #sp_inside_paren_cast = ignore # ignore/add/remove/force #sp_inside_paren_cast = remove -sp_inside_paren_cast = force +sp_inside_paren_cast = force # Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)' #sp_cpp_cast_paren = ignore # ignore/add/remove/force -sp_cpp_cast_paren = remove +sp_cpp_cast_paren = remove diff --git a/tests/config/cgal.cfg b/tests/config/cgal.cfg index aeaf551eaf..50be7f03fc 100644 --- a/tests/config/cgal.cfg +++ b/tests/config/cgal.cfg @@ -1,214 +1,214 @@ -newlines = auto -input_tab_size = 8 -output_tab_size = 3 -string_escape_char = 92 -indent_columns = 3 -indent_with_tabs = 0 -indent_align_string = false -indent_xml_string = 0 -indent_brace = 0 -indent_braces = false -indent_braces_no_func = false -indent_brace_parent = false -indent_namespace = false -indent_class = true -indent_class_colon = false -indent_func_call_param = false -indent_member = 3 -indent_sing_line_comments = 0 -indent_switch_case = 0 -indent_case_brace = 0 -indent_col1_comment = false -indent_label = 2 -indent_access_spec = 2 -indent_paren_nl = false -indent_square_nl = false -sp_arith = force -sp_assign = force -sp_bool = force -sp_compare = force -sp_inside_paren = remove -sp_paren_paren = remove -sp_balance_nested_parens = false -sp_paren_brace = ignore -sp_before_ptr_star = force -sp_between_ptr_star = remove -sp_after_ptr_star = remove -sp_before_byref = remove -sp_after_byref = ignore -sp_before_angle = remove -sp_after_angle = force -sp_angle_paren = remove -sp_angle_paren_empty = remove -sp_angle_word = force -sp_before_sparen = force -sp_inside_sparen = force -sp_inside_sparen_close = remove -sp_after_sparen = force -sp_sparen_brace = ignore -sp_special_semi = ignore -sp_before_semi = remove -sp_before_semi_for = ignore -sp_before_square = ignore -sp_before_squares = ignore -sp_inside_square = remove -sp_after_comma = force -sp_before_comma = remove -sp_after_operator = ignore -sp_after_cast = remove -sp_sizeof_paren = remove -sp_after_tag = ignore -sp_inside_braces_enum = force -sp_inside_braces_struct = force -sp_inside_braces = force -sp_inside_angle = remove -sp_type_func = ignore -sp_func_proto_paren = remove -sp_func_def_paren = remove -sp_inside_fparens = ignore -sp_inside_fparen = remove -sp_square_fparen = ignore -sp_fparen_brace = ignore -sp_func_call_paren = remove -sp_func_class_paren = ignore -sp_return_paren = remove -sp_macro = ignore -sp_before_semi_for_empty = force +newlines = auto +input_tab_size = 8 +output_tab_size = 3 +string_escape_char = 92 +indent_columns = 3 +indent_with_tabs = 0 +indent_align_string = false +indent_xml_string = 0 +indent_brace = 0 +indent_braces = false +indent_braces_no_func = false +indent_brace_parent = false +indent_namespace = false +indent_class = true +indent_class_colon = false +indent_func_call_param = false +indent_member = 3 +indent_sing_line_comments = 0 +indent_switch_case = 0 +indent_case_brace = 0 +indent_col1_comment = false +indent_label = 2 +indent_access_spec = 2 +indent_paren_nl = false +indent_square_nl = false +sp_arith = force +sp_assign = force +sp_bool = force +sp_compare = force +sp_inside_paren = remove +sp_paren_paren = remove +sp_balance_nested_parens = false +sp_paren_brace = ignore +sp_before_ptr_star = force +sp_between_ptr_star = remove +sp_after_ptr_star = remove +sp_before_byref = remove +sp_after_byref = ignore +sp_before_angle = remove +sp_after_angle = force +sp_angle_paren = remove +sp_angle_paren_empty = remove +sp_angle_word = force +sp_before_sparen = force +sp_inside_sparen = force +sp_inside_sparen_close = remove +sp_after_sparen = force +sp_sparen_brace = ignore +sp_special_semi = ignore +sp_before_semi = remove +sp_before_semi_for = ignore +sp_before_square = ignore +sp_before_squares = ignore +sp_inside_square = remove +sp_after_comma = force +sp_before_comma = remove +sp_after_operator = ignore +sp_after_cast = remove +sp_sizeof_paren = remove +sp_after_tag = ignore +sp_inside_braces_enum = force +sp_inside_braces_struct = force +sp_inside_braces = force +sp_inside_angle = remove +sp_type_func = ignore +sp_func_proto_paren = remove +sp_func_def_paren = remove +sp_inside_fparens = ignore +sp_inside_fparen = remove +sp_square_fparen = ignore +sp_fparen_brace = ignore +sp_func_call_paren = remove +sp_func_class_paren = ignore +sp_return_paren = remove +sp_macro = ignore +sp_before_semi_for_empty = force -sp_macro_func = ignore -sp_else_brace = ignore -sp_brace_else = ignore -sp_catch_brace = ignore -sp_brace_catch = ignore -sp_finally_brace = ignore -sp_brace_finally = ignore -sp_try_brace = ignore -sp_getset_brace = ignore -align_keep_tabs = false -align_with_tabs = false -align_on_tabstop = false -align_number_right = true -align_func_params = true -align_var_def_span = 2 -align_var_def_star_style = 1 -align_var_def_thresh = 0 -align_var_def_colon = true -align_var_def_inline = true -align_assign_span = 1 -align_assign_thresh = 0 -align_enum_equ_span = 4 -align_enum_equ_thresh = 0 -align_var_struct_span = 3 -align_struct_init_span = 3 -align_typedef_gap = 3 -align_typedef_span = 5 -align_typedef_star_style = 0 -align_right_cmt_span = 3 -align_func_proto_span = 0 -align_nl_cont = true -align_pp_define_gap = 4 -align_pp_define_span = 3 -code_width = 0 -nl_collapse_empty_body = false -nl_class_leave_one_liners = true -nl_assign_leave_one_liners = true -nl_start_of_file = ignore -nl_start_of_file_min = 0 -nl_end_of_file = ignore -nl_end_of_file_min = 0 -nl_assign_brace = add -nl_func_var_def_blk = 1 -nl_fcall_brace = add -nl_enum_brace = add -nl_struct_brace = add -nl_union_brace = add -nl_if_brace = add -nl_brace_else = add -nl_elseif_brace = ignore -nl_else_brace = add -nl_brace_finally = ignore -nl_finally_brace = add -nl_try_brace = add -nl_getset_brace = ignore -nl_for_brace = add -nl_catch_brace = add -nl_brace_catch = ignore -nl_while_brace = add -nl_do_brace = add -nl_brace_while = remove -nl_switch_brace = add -nl_before_case = true -nl_after_case = false -nl_namespace_brace = ignore -nl_template_class = ignore -nl_class_brace = ignore -nl_class_init_args = ignore -nl_func_type_name = ignore -nl_func_decl_start = ignore -nl_func_decl_args = ignore -nl_func_decl_end = ignore -nl_fdef_brace = add -nl_after_return = true -nl_after_semicolon = true -nl_after_brace_open = true -nl_after_vbrace_open = true -nl_after_access_spec = 1 -nl_assign_leave_one_liners = true -nl_class_leave_one_liners = true -nl_enum_leave_one_liners = true -nl_getset_leave_one_liners = true -nl_define_macro = false -nl_squeeze_ifdef = true -nl_before_if = ignore -nl_after_if = ignore -nl_before_for = ignore -nl_after_for = ignore -nl_before_while = ignore -nl_after_while = ignore -nl_before_switch = ignore -nl_after_switch = ignore -nl_before_do = ignore -nl_after_do = ignore -nl_ds_struct_enum_cmt = false -pos_bool = ignore -pos_class_colon = ignore -ls_for_split_full = false -ls_func_split_full = false -nl_max = 0 -nl_after_func_proto = 0 -nl_after_func_proto_group = 0 -nl_after_func_body = 0 -nl_after_func_body_one_liner = 0 -nl_before_block_comment = 0 -nl_before_c_comment = 0 -nl_before_cpp_comment = 0 -eat_blanks_after_open_brace = true -eat_blanks_before_close_brace = true -mod_full_brace_do = add -mod_full_brace_for = add -mod_full_brace_function = ignore -mod_full_brace_if = add -mod_full_brace_nl = 0 -mod_full_brace_while = add -mod_paren_on_return = add -mod_pawn_semicolon = false -mod_full_paren_if_bool = false -cmt_cpp_group = false -cmt_cpp_nl_start = false -cmt_cpp_nl_end = false -cmt_cpp_to_c = false -cmt_star_cont = true -cmt_sp_before_star_cont = 0 -cmt_sp_after_star_cont = 0 -pp_indent = remove -pp_space = remove -sp_after_dc = remove -sp_before_dc = remove -sp_attribute_paren = remove -sp_defined_paren = force +sp_macro_func = ignore +sp_else_brace = ignore +sp_brace_else = ignore +sp_catch_brace = ignore +sp_brace_catch = ignore +sp_finally_brace = ignore +sp_brace_finally = ignore +sp_try_brace = ignore +sp_getset_brace = ignore +align_keep_tabs = false +align_with_tabs = false +align_on_tabstop = false +align_number_right = true +align_func_params = true +align_var_def_span = 2 +align_var_def_star_style = 1 +align_var_def_thresh = 0 +align_var_def_colon = true +align_var_def_inline = true +align_assign_span = 1 +align_assign_thresh = 0 +align_enum_equ_span = 4 +align_enum_equ_thresh = 0 +align_var_struct_span = 3 +align_struct_init_span = 3 +align_typedef_gap = 3 +align_typedef_span = 5 +align_typedef_star_style = 0 +align_right_cmt_span = 3 +align_func_proto_span = 0 +align_nl_cont = true +align_pp_define_gap = 4 +align_pp_define_span = 3 +code_width = 0 +nl_collapse_empty_body = false +nl_class_leave_one_liners = true +nl_assign_leave_one_liners = true +nl_start_of_file = ignore +nl_start_of_file_min = 0 +nl_end_of_file = ignore +nl_end_of_file_min = 0 +nl_assign_brace = add +nl_func_var_def_blk = 1 +nl_fcall_brace = add +nl_enum_brace = add +nl_struct_brace = add +nl_union_brace = add +nl_if_brace = add +nl_brace_else = add +nl_elseif_brace = ignore +nl_else_brace = add +nl_brace_finally = ignore +nl_finally_brace = add +nl_try_brace = add +nl_getset_brace = ignore +nl_for_brace = add +nl_catch_brace = add +nl_brace_catch = ignore +nl_while_brace = add +nl_do_brace = add +nl_brace_while = remove +nl_switch_brace = add +nl_before_case = true +nl_after_case = false +nl_namespace_brace = ignore +nl_template_class = ignore +nl_class_brace = ignore +nl_class_init_args = ignore +nl_func_type_name = ignore +nl_func_decl_start = ignore +nl_func_decl_args = ignore +nl_func_decl_end = ignore +nl_fdef_brace = add +nl_after_return = true +nl_after_semicolon = true +nl_after_brace_open = true +nl_after_vbrace_open = true +nl_after_access_spec = 1 +nl_assign_leave_one_liners = true +nl_class_leave_one_liners = true +nl_enum_leave_one_liners = true +nl_getset_leave_one_liners = true +nl_define_macro = false +nl_squeeze_ifdef = true +nl_before_if = ignore +nl_after_if = ignore +nl_before_for = ignore +nl_after_for = ignore +nl_before_while = ignore +nl_after_while = ignore +nl_before_switch = ignore +nl_after_switch = ignore +nl_before_do = ignore +nl_after_do = ignore +nl_ds_struct_enum_cmt = false +pos_bool = ignore +pos_class_colon = ignore +ls_for_split_full = false +ls_func_split_full = false +nl_max = 0 +nl_after_func_proto = 0 +nl_after_func_proto_group = 0 +nl_after_func_body = 0 +nl_after_func_body_one_liner = 0 +nl_before_block_comment = 0 +nl_before_c_comment = 0 +nl_before_cpp_comment = 0 +eat_blanks_after_open_brace = true +eat_blanks_before_close_brace = true +mod_full_brace_do = add +mod_full_brace_for = add +mod_full_brace_function = ignore +mod_full_brace_if = add +mod_full_brace_nl = 0 +mod_full_brace_while = add +mod_paren_on_return = add +mod_pawn_semicolon = false +mod_full_paren_if_bool = false +cmt_cpp_group = false +cmt_cpp_nl_start = false +cmt_cpp_nl_end = false +cmt_cpp_to_c = false +cmt_star_cont = true +cmt_sp_before_star_cont = 0 +cmt_sp_after_star_cont = 0 +pp_indent = remove +pp_space = remove +sp_after_dc = remove +sp_before_dc = remove +sp_attribute_paren = remove +sp_defined_paren = force mod_add_long_function_closebrace_comment = 40 -mod_add_long_switch_closebrace_comment = 40 +mod_add_long_switch_closebrace_comment = 40 -sp_brace_typedef = force +sp_brace_typedef = force diff --git a/tests/config/clark.cfg b/tests/config/clark.cfg index 20c2996bf3..82caac5392 100644 --- a/tests/config/clark.cfg +++ b/tests/config/clark.cfg @@ -4,504 +4,504 @@ # # The type of line endings -newlines = auto # auto/lf/crlf/cr +newlines = auto # auto/lf/crlf/cr # The original size of tabs in the input -input_tab_size = 2 # number +input_tab_size = 2 # number # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 2 # number +output_tab_size = 2 # number # The ascii value of the string escape char, usually 92 (\). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # number # # Indenting # # The number of columns to indent per level (usually 2, 3, 4, or 8) -indent_columns = 2 # number +indent_columns = 2 # number # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # number # Whether to indent strings broken by '\' so that they line up -indent_align_string = false # false/true +indent_align_string = false # false/true # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # number # Whether braces are indented to the body level -indent_braces = true # false/true +indent_braces = true # false/true # Whether the 'namespace' body is indented -indent_namespace = true # false/true +indent_namespace = true # false/true # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # false/true # Whether to indent the stuff after a leading class colon -indent_class_colon = false # false/true +indent_class_colon = false # false/true # Whether to indent continued function call parameters one indent level (true) or aligns instead of indent (false) -indent_func_call_param = false # false/true +indent_func_call_param = false # false/true # The number of spaces to indent a continued '->' or '.' # Usually set to indent_columns. -indent_member = 2 # number +indent_member = 2 # number # indent single line ('//') comments on lines before code -indent_sing_line_comments = 2 # number +indent_sing_line_comments = 2 # number # Spaces to indent 'case' from 'switch' -indent_switch_case = 2 # number +indent_switch_case = 2 # number # Spaces to indent '{' from 'case' -indent_case_brace = 2 # number +indent_case_brace = 2 # number # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # false/true # How to indent goto labels (>0=absolute column where 1 is the leftmost column, <=0=subtract from brace indent) -indent_label = 1 # number +indent_label = 1 # number # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # false/true # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # false/true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = add # ignore/add/remove/force +sp_arith = add # ignore/add/remove/force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = add # ignore/add/remove/force +sp_assign = add # ignore/add/remove/force # Add or remove space around boolean operators '&&' and '||' -sp_bool = add # ignore/add/remove/force +sp_bool = add # ignore/add/remove/force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = add # ignore/add/remove/force +sp_compare = add # ignore/add/remove/force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # ignore/add/remove/force # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # ignore/add/remove/force # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # ignore/add/remove/force # Add or remove space before pointer star '*' -sp_before_ptr_star = ignore # ignore/add/remove/force +sp_before_ptr_star = ignore # ignore/add/remove/force # Add or remove space between pointer stars '*' -sp_between_ptr_star = ignore # ignore/add/remove/force +sp_between_ptr_star = ignore # ignore/add/remove/force # Add or remove space after pointer star '*' -sp_after_ptr_star = ignore # ignore/add/remove/force +sp_after_ptr_star = ignore # ignore/add/remove/force # Add or remove space before reference sign '&' -sp_before_byref = ignore # ignore/add/remove/force +sp_before_byref = ignore # ignore/add/remove/force # Add or remove space after reference sign '&' -sp_after_byref = ignore # ignore/add/remove/force +sp_after_byref = ignore # ignore/add/remove/force # Add or remove space before '<>' -sp_before_angle = add # ignore/add/remove/force +sp_before_angle = add # ignore/add/remove/force # Add or remove space after '<>' -sp_after_angle = add # ignore/add/remove/force +sp_after_angle = add # ignore/add/remove/force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = add # ignore/add/remove/force +sp_before_sparen = add # ignore/add/remove/force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # ignore/add/remove/force # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = ignore # ignore/add/remove/force +sp_after_sparen = ignore # ignore/add/remove/force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = ignore # ignore/add/remove/force +sp_sparen_brace = ignore # ignore/add/remove/force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # ignore/add/remove/force # Add or remove space before ';' -sp_before_semi = ignore # ignore/add/remove/force +sp_before_semi = ignore # ignore/add/remove/force # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # ignore/add/remove/force # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # ignore/add/remove/force # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # ignore/add/remove/force # Add or remove space after ',' -sp_after_comma = add # ignore/add/remove/force +sp_after_comma = add # ignore/add/remove/force # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # ignore/add/remove/force # Add or remove space after cast -sp_after_cast = ignore # ignore/add/remove/force +sp_after_cast = ignore # ignore/add/remove/force # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = ignore # ignore/add/remove/force +sp_sizeof_paren = ignore # ignore/add/remove/force # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # ignore/add/remove/force # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = ignore # ignore/add/remove/force +sp_inside_braces_enum = ignore # ignore/add/remove/force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = ignore # ignore/add/remove/force +sp_inside_braces_struct = ignore # ignore/add/remove/force # Add or remove space inside '{' and '}' -sp_inside_braces = force # ignore/add/remove/force +sp_inside_braces = force # ignore/add/remove/force # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # ignore/add/remove/force # Add or remove space between return type and function name (a minimum of 1 is forced except for pointer return types) -sp_type_func = ignore # ignore/add/remove/force +sp_type_func = ignore # ignore/add/remove/force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = ignore # ignore/add/remove/force +sp_func_proto_paren = ignore # ignore/add/remove/force # Add or remove space between function name and '(' on function definition -sp_func_def_paren = ignore # ignore/add/remove/force +sp_func_def_paren = ignore # ignore/add/remove/force # Add or remove space inside empty function '()' -sp_inside_fparens = ignore # ignore/add/remove/force +sp_inside_fparens = ignore # ignore/add/remove/force # Add or remove space inside function '(' and ')' -sp_inside_fparen = ignore # ignore/add/remove/force +sp_inside_fparen = ignore # ignore/add/remove/force # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # ignore/add/remove/force # Add or remove space between ')' and '{' of function -sp_fparen_brace = ignore # ignore/add/remove/force +sp_fparen_brace = ignore # ignore/add/remove/force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = ignore # ignore/add/remove/force +sp_func_call_paren = ignore # ignore/add/remove/force # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = ignore # ignore/add/remove/force +sp_func_class_paren = ignore # ignore/add/remove/force # Add or remove space between 'return' and '(' -sp_return_paren = ignore # ignore/add/remove/force +sp_return_paren = ignore # ignore/add/remove/force # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # ignore/add/remove/force # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # ignore/add/remove/force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # false/true # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # false/true # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # false/true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 0 # number +align_var_def_span = 0 # number # Whether the pointer star is part of the variable name or not -align_var_def_star_style = 2 # false/true +align_var_def_star_style = 2 # false/true # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # number # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # false/true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = false # false/true +align_var_def_inline = false # false/true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 0 # number +align_assign_span = 0 # number # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 # number # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 0 # number +align_enum_equ_span = 0 # number # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # number # The span for aligning struct/union (0=don't align) -align_var_struct_span = 0 # number +align_var_struct_span = 0 # number # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 0 # number +align_struct_init_span = 0 # number # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number +align_typedef_gap = 0 # number # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 0 # number +align_typedef_span = 0 # number # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type: typedef int * pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # number # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 0 # number +align_right_cmt_span = 0 # number # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # number # Whether to align macros wrapped with a backslash and a newline -align_nl_cont = false # false/true +align_nl_cont = false # false/true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 0 # number +align_pp_define_gap = 0 # number # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 0 # number +align_pp_define_span = 0 # number # # Newline adding and removing options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # number # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # false/true # Add or remove newlines at the start of the file -nl_start_of_file = ignore # ignore/add/remove/force +nl_start_of_file = ignore # ignore/add/remove/force # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # number # Add or remove newline at the end of the file -nl_end_of_file = ignore # ignore/add/remove/force +nl_end_of_file = ignore # ignore/add/remove/force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 0 # number +nl_end_of_file_min = 0 # number # Add or remove newline between '=' and '{' -nl_assign_brace = ignore # ignore/add/remove/force +nl_assign_brace = ignore # ignore/add/remove/force # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # number # Add or remove newline between function call and '(' -nl_fcall_brace = ignore # ignore/add/remove/force +nl_fcall_brace = ignore # ignore/add/remove/force # Add or remove newline between 'enum' and '{' -nl_enum_brace = ignore # ignore/add/remove/force +nl_enum_brace = ignore # ignore/add/remove/force # Add or remove newline between 'struct and '{' -nl_struct_brace = add # ignore/add/remove/force +nl_struct_brace = add # ignore/add/remove/force # Add or remove newline between 'union' and '{' -nl_union_brace = add # ignore/add/remove/force +nl_union_brace = add # ignore/add/remove/force # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # ignore/add/remove/force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = add # ignore/add/remove/force - -nl_before_if = force # ignore/add/remove/force -nl_after_if = force # ignore/add/remove/force -nl_before_for = force # ignore/add/remove/force -nl_after_for = force # ignore/add/remove/force -nl_before_while = force # ignore/add/remove/force -nl_after_while = force # ignore/add/remove/force -nl_before_switch = force # ignore/add/remove/force -nl_after_switch = force # ignore/add/remove/force -nl_before_do = force # ignore/add/remove/force -nl_after_do = force # ignore/add/remove/force +nl_elseif_brace = add # ignore/add/remove/force + +nl_before_if = force # ignore/add/remove/force +nl_after_if = force # ignore/add/remove/force +nl_before_for = force # ignore/add/remove/force +nl_after_for = force # ignore/add/remove/force +nl_before_while = force # ignore/add/remove/force +nl_after_while = force # ignore/add/remove/force +nl_before_switch = force # ignore/add/remove/force +nl_after_switch = force # ignore/add/remove/force +nl_before_do = force # ignore/add/remove/force +nl_after_do = force # ignore/add/remove/force # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # ignore/add/remove/force # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # ignore/add/remove/force # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # ignore/add/remove/force # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = add # ignore/add/remove/force +nl_brace_while = add # ignore/add/remove/force # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # ignore/add/remove/force # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # false/true # Whether to put a newline after 'case' statement -nl_after_case = false # false/true +nl_after_case = false # false/true # Newline between namespace and { -nl_namespace_brace = add # ignore/add/remove/force +nl_namespace_brace = add # ignore/add/remove/force # Add or remove newline between 'template<>' and 'class' -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # ignore/add/remove/force # Add or remove newline between 'class' and '{' -nl_class_brace = add # ignore/add/remove/force +nl_class_brace = add # ignore/add/remove/force # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # ignore/add/remove/force # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # ignore/add/remove/force # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # ignore/add/remove/force # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # ignore/add/remove/force # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # ignore/add/remove/force # Whether to put a newline after 'return' statement -nl_after_return = false # false/true +nl_after_return = false # false/true # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = false # false/true +nl_after_semicolon = false # false/true # Whether to put a newline after brace open -nl_after_brace_open = true # false/true +nl_after_brace_open = true # false/true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # false/true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true +nl_squeeze_ifdef = false # false/true # # Positioning options # # The position of boolean operators in wrapped expressions -pos_bool = ignore # ignore/lead/trail +pos_bool = ignore # ignore/lead/trail # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # ignore/lead/trail # # Blank line options # # The maximum consecutive newlines -nl_max = 0 # number +nl_max = 0 # number # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # number # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 0 # number +nl_after_func_proto_group = 0 # number # The number of newlines after '}' of the function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # number # The minimum number of newlines before a multi-line comment (doesn't apply if after a brace open) -nl_before_block_comment = 1 # number +nl_before_block_comment = 1 # number # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = false # false/true +eat_blanks_after_open_brace = false # false/true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = false # false/true +eat_blanks_before_close_brace = false # false/true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = remove # ignore/add/remove/force +mod_full_brace_do = remove # ignore/add/remove/force # Add or remove braces on single-line 'for' statement -mod_full_brace_for = remove # ignore/add/remove/force +mod_full_brace_for = remove # ignore/add/remove/force # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # ignore/add/remove/force # Add or remove braces on single-line 'if' statement -mod_full_brace_if = remove # ignore/add/remove/force +mod_full_brace_if = remove # ignore/add/remove/force # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 3 # number +mod_full_brace_nl = 3 # number # Add or remove braces on single-line 'while' statement -mod_full_brace_while = remove # ignore/add/remove/force +mod_full_brace_while = remove # ignore/add/remove/force # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = remove # ignore/add/remove/force +mod_paren_on_return = remove # ignore/add/remove/force # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # false/true # # Comment modifications # # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # false/true # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # false/true # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # false/true # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # false/true # # Preprocessor options # # Add or remove indent of preprocessor directives -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # ignore/add/remove/force # Add or remove space between # and, say, define -pp_space = ignore # ignore/add/remove/force -sp_after_tparen_close = remove +pp_space = ignore # ignore/add/remove/force +sp_after_tparen_close = remove diff --git a/tests/config/class-colon-pos-eol-add.cfg b/tests/config/class-colon-pos-eol-add.cfg index 4aab465fb3..e9d06030b9 100644 --- a/tests/config/class-colon-pos-eol-add.cfg +++ b/tests/config/class-colon-pos-eol-add.cfg @@ -2,24 +2,24 @@ # moves class colon ops to the end of line # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 3 # new tab size +indent_columns = output_tab_size -pos_class_colon = Trail -pos_comma = Trail -pos_class_comma = trail -indent_class_colon = True -nl_class_init_args = Add -nl_class_colon = Add +pos_class_colon = Trail +pos_comma = Trail +pos_class_comma = trail +indent_class_colon = True +nl_class_init_args = Add +nl_class_colon = Add -pos_constr_colon = Trail -pos_constr_comma = trail -indent_constr_colon = True -nl_constr_init_args = Add -nl_constr_colon = Add +pos_constr_colon = Trail +pos_constr_comma = trail +indent_constr_colon = True +nl_constr_init_args = Add +nl_constr_colon = Add -sp_after_dc = remove -sp_before_dc = remove +sp_after_dc = remove +sp_before_dc = remove diff --git a/tests/config/class-colon-pos-eol.cfg b/tests/config/class-colon-pos-eol.cfg index 9a789e0a6e..6513f697eb 100644 --- a/tests/config/class-colon-pos-eol.cfg +++ b/tests/config/class-colon-pos-eol.cfg @@ -2,17 +2,17 @@ # moves class colon ops to the end of line # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 3 # new tab size +indent_columns = output_tab_size -pos_class_colon = Trail -pos_constr_colon = Trail +pos_class_colon = Trail +pos_constr_colon = Trail -indent_class_colon = True -indent_constr_colon = True +indent_class_colon = True +indent_constr_colon = True -sp_after_dc = remove -sp_before_dc = remove +sp_after_dc = remove +sp_before_dc = remove diff --git a/tests/config/class-colon-pos-sol-add.cfg b/tests/config/class-colon-pos-sol-add.cfg index 8732b363b0..ad95f4852b 100644 --- a/tests/config/class-colon-pos-sol-add.cfg +++ b/tests/config/class-colon-pos-sol-add.cfg @@ -2,27 +2,27 @@ # moves class colon ops to the end of line # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 3 # new tab size +indent_columns = output_tab_size -pos_class_colon = Lead -pos_comma = Trail -pos_class_comma = trail -indent_class_colon = True -nl_class_init_args = Add -nl_class_colon = Add +pos_class_colon = Lead +pos_comma = Trail +pos_class_comma = trail +indent_class_colon = True +nl_class_init_args = Add +nl_class_colon = Add -pos_constr_colon = Lead -pos_constr_comma = trail -indent_constr_colon = True -nl_constr_init_args = Add -nl_constr_colon = Add +pos_constr_colon = Lead +pos_constr_comma = trail +indent_constr_colon = True +nl_constr_init_args = Add +nl_constr_colon = Add -sp_inside_fparen = force +sp_inside_fparen = force sp_paren_paren = force -sp_after_dc = remove -sp_before_dc = remove +sp_after_dc = remove +sp_before_dc = remove sp_before_nl_cont = force diff --git a/tests/config/class-colon-pos-sol.cfg b/tests/config/class-colon-pos-sol.cfg index 288b11c34e..1205d47fee 100644 --- a/tests/config/class-colon-pos-sol.cfg +++ b/tests/config/class-colon-pos-sol.cfg @@ -2,17 +2,17 @@ # moves class colon ops to the end of line # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 3 # new tab size +indent_columns = output_tab_size -pos_class_colon = Lead -pos_constr_colon = Lead +pos_class_colon = Lead +pos_constr_colon = Lead -indent_class_colon = True -indent_constr_colon = True +indent_class_colon = True +indent_constr_colon = True -sp_after_dc = remove -sp_before_dc = remove +sp_after_dc = remove +sp_before_dc = remove diff --git a/tests/config/class-nl_func-add.cfg b/tests/config/class-nl_func-add.cfg index 2ff07d3df7..3646daaf8c 100644 --- a/tests/config/class-nl_func-add.cfg +++ b/tests/config/class-nl_func-add.cfg @@ -2,26 +2,26 @@ # moves class colon ops to the end of line # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 3 # new tab size +indent_columns = output_tab_size -pos_class_colon = Trail -pos_comma = Trail -pos_class_comma = trail -indent_class_colon = True -nl_class_init_args = Add -nl_class_colon = Add +pos_class_colon = Trail +pos_comma = Trail +pos_class_comma = trail +indent_class_colon = True +nl_class_init_args = Add +nl_class_colon = Add -nl_fdef_brace = force +nl_fdef_brace = force -sp_after_dc = remove -sp_before_dc = remove +sp_after_dc = remove +sp_before_dc = remove -pos_constr_colon = trail -pos_constr_comma = trail -indent_constr_colon = True -nl_constr_init_args = Add -nl_constr_colon = Add +pos_constr_colon = trail +pos_constr_comma = trail +indent_constr_colon = True +nl_constr_init_args = Add +nl_constr_colon = Add diff --git a/tests/config/class-nl_func-add2.cfg b/tests/config/class-nl_func-add2.cfg index 712a05ff9e..5599d87038 100644 --- a/tests/config/class-nl_func-add2.cfg +++ b/tests/config/class-nl_func-add2.cfg @@ -1,28 +1,28 @@ # # moves class colon ops to the end of line # -include ben.cfg +include ben.cfg -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 3 # new tab size +indent_columns = output_tab_size -pos_class_colon = Trail -pos_comma = Trail -pos_class_comma = trail -indent_class_colon = True -nl_class_init_args = Add -nl_class_colon = Add +pos_class_colon = Trail +pos_comma = Trail +pos_class_comma = trail +indent_class_colon = True +nl_class_init_args = Add +nl_class_colon = Add -nl_fdef_brace = force +nl_fdef_brace = force -sp_after_dc = remove -sp_before_dc = remove +sp_after_dc = remove +sp_before_dc = remove -pos_constr_colon = lead -pos_constr_comma = lead -indent_constr_colon = True -nl_constr_init_args = remove -nl_constr_colon = remove +pos_constr_colon = lead +pos_constr_comma = lead +indent_constr_colon = True +nl_constr_init_args = remove +nl_constr_colon = remove diff --git a/tests/config/class-nl_func-del.cfg b/tests/config/class-nl_func-del.cfg index c06dc2ccad..5ab7689504 100644 --- a/tests/config/class-nl_func-del.cfg +++ b/tests/config/class-nl_func-del.cfg @@ -2,27 +2,27 @@ # moves class colon ops to the end of line # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 3 # new tab size +indent_columns = output_tab_size -pos_class_colon = Trail -pos_comma = Trail -pos_class_comma = trail -indent_class_colon = True -nl_class_init_args = Add -nl_class_colon = Add +pos_class_colon = Trail +pos_comma = Trail +pos_class_comma = trail +indent_class_colon = True +nl_class_init_args = Add +nl_class_colon = Add -nl_fdef_brace = remove -sp_fparen_brace = force +nl_fdef_brace = remove +sp_fparen_brace = force -sp_after_dc = remove -sp_before_dc = remove +sp_after_dc = remove +sp_before_dc = remove -pos_constr_colon = Trail -pos_constr_comma = trail -indent_constr_colon = True -nl_constr_init_args = Add -nl_constr_colon = Add +pos_constr_colon = Trail +pos_constr_comma = trail +indent_constr_colon = True +nl_constr_init_args = Add +nl_constr_colon = Add diff --git a/tests/config/class-on-colon-indent.cfg b/tests/config/class-on-colon-indent.cfg index e9d1904cd7..7c72ae9c44 100644 --- a/tests/config/class-on-colon-indent.cfg +++ b/tests/config/class-on-colon-indent.cfg @@ -2,33 +2,33 @@ # moves class colon ops to the end of line # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 3 # new tab size +indent_columns = output_tab_size -pos_class_colon = join -pos_comma = Trail -pos_class_comma = lead -indent_class_colon = True -nl_class_init_args = Add -nl_class_colon = Remove +pos_class_colon = join +pos_comma = Trail +pos_class_comma = lead +indent_class_colon = True +nl_class_init_args = Add +nl_class_colon = Remove -pos_constr_colon = lead_force -pos_constr_comma = lead -indent_class_colon = True -indent_constr_colon = True -indent_class_on_colon = True -indent_ctor_init_leading = 0 -nl_constr_init_args = Add -nl_constr_colon = Add +pos_constr_colon = lead_force +pos_constr_comma = lead +indent_class_colon = True +indent_constr_colon = True +indent_class_on_colon = True +indent_ctor_init_leading = 0 +nl_constr_init_args = Add +nl_constr_colon = Add -sp_after_class_colon = force -sp_before_class_colon = force -sp_after_constr_colon = force -sp_after_comma = force +sp_after_class_colon = force +sp_before_class_colon = force +sp_after_constr_colon = force +sp_after_comma = force -sp_inside_fparen = force -sp_paren_paren = force -sp_after_dc = remove -sp_before_dc = remove +sp_inside_fparen = force +sp_paren_paren = force +sp_after_dc = remove +sp_before_dc = remove diff --git a/tests/config/cmt_indent-1.cfg b/tests/config/cmt_indent-1.cfg index d701a57d91..54d5dabb5b 100644 --- a/tests/config/cmt_indent-1.cfg +++ b/tests/config/cmt_indent-1.cfg @@ -1,6 +1,6 @@ -indent_with_tabs = 2 -indent_columns = 2 -indent_namespace = true -indent_class = true -nl_collapse_empty_body = true +indent_with_tabs = 2 +indent_columns = 2 +indent_namespace = true +indent_class = true +nl_collapse_empty_body = true diff --git a/tests/config/cmt_indent-2.cfg b/tests/config/cmt_indent-2.cfg index e7c8699c92..491b8c8c54 100644 --- a/tests/config/cmt_indent-2.cfg +++ b/tests/config/cmt_indent-2.cfg @@ -1,7 +1,7 @@ -indent_with_tabs = 2 -indent_columns = 2 -indent_namespace = true -indent_class = true -nl_collapse_empty_body = true -cmt_indent_multi = false +indent_with_tabs = 2 +indent_columns = 2 +indent_namespace = true +indent_class = true +nl_collapse_empty_body = true +cmt_indent_multi = false diff --git a/tests/config/cmt_indent-3.cfg b/tests/config/cmt_indent-3.cfg index 69682efbcb..3a0a8a30cf 100644 --- a/tests/config/cmt_indent-3.cfg +++ b/tests/config/cmt_indent-3.cfg @@ -1,8 +1,8 @@ -indent_with_tabs = 2 -indent_columns = 2 -indent_namespace = true -indent_class = true -nl_collapse_empty_body = true -cmt_indent_multi = true -cmt_star_cont = true +indent_with_tabs = 2 +indent_columns = 2 +indent_namespace = true +indent_class = true +nl_collapse_empty_body = true +cmt_indent_multi = true +cmt_star_cont = true diff --git a/tests/config/cmt_indent_pp.cfg b/tests/config/cmt_indent_pp.cfg index 2b627de580..f55786c502 100644 --- a/tests/config/cmt_indent_pp.cfg +++ b/tests/config/cmt_indent_pp.cfg @@ -1,7 +1,7 @@ -indent_with_tabs = 0 -input_tab_size = 4 -indent_columns = 4 -indent_namespace = true -indent_class = true -indent_cmt_with_tabs = false -align_right_cmt_mix = false +indent_with_tabs = 0 +input_tab_size = 4 +indent_columns = 4 +indent_namespace = true +indent_class = true +indent_cmt_with_tabs = false +align_right_cmt_mix = false diff --git a/tests/config/cmt_insert-0.cfg b/tests/config/cmt_insert-0.cfg index b15b18c37e..bf79e5d89f 100644 --- a/tests/config/cmt_insert-0.cfg +++ b/tests/config/cmt_insert-0.cfg @@ -1,9 +1,9 @@ -cmt_insert_file_header = file-header.h -cmt_insert_func_header = func-header.h -cmt_insert_class_header = class-header.h -cmt_insert_oc_msg_header = msg-header.h +cmt_insert_file_header = file-header.h +cmt_insert_func_header = func-header.h +cmt_insert_class_header = class-header.h +cmt_insert_oc_msg_header = msg-header.h -cmt_insert_before_preproc = true -cmt_insert_before_inlines = false -cmt_insert_before_ctor_dtor = false +cmt_insert_before_preproc = true +cmt_insert_before_inlines = false +cmt_insert_before_ctor_dtor = false diff --git a/tests/config/cmt_insert-1.cfg b/tests/config/cmt_insert-1.cfg index f26b6e3d75..024adaf99f 100644 --- a/tests/config/cmt_insert-1.cfg +++ b/tests/config/cmt_insert-1.cfg @@ -1,9 +1,9 @@ -cmt_insert_file_header = file-header.h -cmt_insert_func_header = func-header.h -cmt_insert_class_header = class-header.h -cmt_insert_oc_msg_header = msg-header.h +cmt_insert_file_header = file-header.h +cmt_insert_func_header = func-header.h +cmt_insert_class_header = class-header.h +cmt_insert_oc_msg_header = msg-header.h -cmt_insert_before_preproc = true -cmt_insert_before_inlines = true -cmt_insert_before_ctor_dtor = true +cmt_insert_before_preproc = true +cmt_insert_before_inlines = true +cmt_insert_before_ctor_dtor = true diff --git a/tests/config/cmt_multi-1.cfg b/tests/config/cmt_multi-1.cfg index a7ff3c6a1e..d3c9af4929 100644 --- a/tests/config/cmt_multi-1.cfg +++ b/tests/config/cmt_multi-1.cfg @@ -1,3 +1,3 @@ -indent_columns = 4 -cmt_multi_check_last = false +indent_columns = 4 +cmt_multi_check_last = false diff --git a/tests/config/cmt_multi-2.cfg b/tests/config/cmt_multi-2.cfg index 566efeb7bf..dc6003db7c 100644 --- a/tests/config/cmt_multi-2.cfg +++ b/tests/config/cmt_multi-2.cfg @@ -1,3 +1,3 @@ -indent_columns = 4 -cmt_multi_check_last = true +indent_columns = 4 +cmt_multi_check_last = true diff --git a/tests/config/cmt_nl_end.cfg b/tests/config/cmt_nl_end.cfg index 6f5fa06edd..03a114a9a0 100644 --- a/tests/config/cmt_nl_end.cfg +++ b/tests/config/cmt_nl_end.cfg @@ -1,7 +1,7 @@ -indent_columns=3 -indent_with_tabs=0 -input_tab_size=3 -nl_end_of_file_min=1 -nl_after_if=force # X+1 -nl_before_if=force # x+y +indent_columns = 3 +indent_with_tabs = 0 +input_tab_size = 3 +nl_end_of_file_min = 1 +nl_after_if = force # X+1 +nl_before_if = force # x+y diff --git a/tests/config/cmt_right.cfg b/tests/config/cmt_right.cfg index ef9f042790..80e41bd37f 100644 --- a/tests/config/cmt_right.cfg +++ b/tests/config/cmt_right.cfg @@ -1,2 +1,2 @@ -indent_columns = 4 -align_right_cmt_span = 5 +indent_columns = 4 +align_right_cmt_span = 5 diff --git a/tests/config/code_width-25.cfg b/tests/config/code_width-25.cfg index dc8d9d8d2d..6b459a5943 100644 --- a/tests/config/code_width-25.cfg +++ b/tests/config/code_width-25.cfg @@ -1 +1 @@ -code_width = 25 \ No newline at end of file +code_width = 25 diff --git a/tests/config/comment-align.cfg b/tests/config/comment-align.cfg index 397723eed3..ce2af696d8 100644 --- a/tests/config/comment-align.cfg +++ b/tests/config/comment-align.cfg @@ -1,4 +1,4 @@ -indent_columns = 4 -sp_inside_braces = force -align_right_cmt_span = 6 +indent_columns = 4 +sp_inside_braces = force +align_right_cmt_span = 6 diff --git a/tests/config/comment_tab_f.cfg b/tests/config/comment_tab_f.cfg index f947b6f9c1..7ad731ea29 100644 --- a/tests/config/comment_tab_f.cfg +++ b/tests/config/comment_tab_f.cfg @@ -1 +1 @@ -cmt_convert_tab_to_spaces=false +cmt_convert_tab_to_spaces = false diff --git a/tests/config/comment_tab_t.cfg b/tests/config/comment_tab_t.cfg index fa2559742c..9e38458a1a 100644 --- a/tests/config/comment_tab_t.cfg +++ b/tests/config/comment_tab_t.cfg @@ -1 +1 @@ -cmt_convert_tab_to_spaces=true +cmt_convert_tab_to_spaces = true diff --git a/tests/config/cond-1.cfg b/tests/config/cond-1.cfg index 29b18457df..9563abc4c6 100644 --- a/tests/config/cond-1.cfg +++ b/tests/config/cond-1.cfg @@ -1,5 +1,5 @@ -indent_columns = 3 -sp_cond_colon = force -sp_cond_question = force +indent_columns = 3 +sp_cond_colon = force +sp_cond_question = force diff --git a/tests/config/cond-2.cfg b/tests/config/cond-2.cfg index 0d8ac0fbbe..5ebc04fbb3 100644 --- a/tests/config/cond-2.cfg +++ b/tests/config/cond-2.cfg @@ -1,5 +1,5 @@ -indent_columns = 3 -sp_cond_colon = add -sp_cond_question = add +indent_columns = 3 +sp_cond_colon = add +sp_cond_question = add diff --git a/tests/config/const_throw.cfg b/tests/config/const_throw.cfg index 40a9463bea..c93e2675fc 100644 --- a/tests/config/const_throw.cfg +++ b/tests/config/const_throw.cfg @@ -1,11 +1,11 @@ # Indentation column for standalone 'const' function decl/proto qualifier # e.g., int GetFoo(void)\n const\n { return (m_Foo); } -indent_func_const = 69 # number +indent_func_const = 69 # number # Indentation column for standalone 'throw' function decl/proto qualifier # e.g., int GetFoo(void)\n throw (std::bad_alloc)\n { return (m_Foo); } -indent_func_throw = 41 # number +indent_func_throw = 41 # number #indent class memeber function declarations. This is to test #that a 'const' qualifier is continuation indented -indent_class = true +indent_class = true diff --git a/tests/config/cpp_move.cfg b/tests/config/cpp_move.cfg index 925fc09a25..ad9ec84f43 100644 --- a/tests/config/cpp_move.cfg +++ b/tests/config/cpp_move.cfg @@ -1,6 +1,6 @@ -sp_pp_concat = force -sp_pp_stringify = remove -sp_before_pp_stringify = force -sp_bool = force -sp_arith = force +sp_pp_concat = force +sp_pp_stringify = remove +sp_before_pp_stringify = force +sp_bool = force +sp_arith = force diff --git a/tests/config/cpp_to_c-1.cfg b/tests/config/cpp_to_c-1.cfg index 0bb5bf58d4..2e0da69c2a 100644 --- a/tests/config/cpp_to_c-1.cfg +++ b/tests/config/cpp_to_c-1.cfg @@ -2,17 +2,17 @@ # CPP to C comment conversion # -indent_with_tabs = 0 -input_tab_size = 4 -indent_columns = 4 +indent_with_tabs = 0 +input_tab_size = 4 +indent_columns = 4 -cmt_star_cont = true -cmt_cpp_to_c = true +cmt_star_cont = true +cmt_cpp_to_c = true # cmt_cpp_group = true # cmt_cpp_nl_start = true # cmt_cpp_nl_end = true -align_right_cmt_span = 2 +align_right_cmt_span = 2 -code_width = 80 +code_width = 80 diff --git a/tests/config/cpp_to_c-2.cfg b/tests/config/cpp_to_c-2.cfg index 70a204d6a8..59e8b14961 100644 --- a/tests/config/cpp_to_c-2.cfg +++ b/tests/config/cpp_to_c-2.cfg @@ -2,15 +2,15 @@ # CPP to C comment conversion # -indent_with_tabs = 0 -input_tab_size = 4 -indent_columns = 4 +indent_with_tabs = 0 +input_tab_size = 4 +indent_columns = 4 -cmt_star_cont = true -cmt_cpp_to_c = true -cmt_cpp_group = true +cmt_star_cont = true +cmt_cpp_to_c = true +cmt_cpp_group = true # cmt_cpp_nl_start = true # cmt_cpp_nl_end = true -align_right_cmt_span = 2 +align_right_cmt_span = 2 diff --git a/tests/config/cpp_to_c-3.cfg b/tests/config/cpp_to_c-3.cfg index 59baccfa98..7a3f9694db 100644 --- a/tests/config/cpp_to_c-3.cfg +++ b/tests/config/cpp_to_c-3.cfg @@ -2,17 +2,17 @@ # CPP to C comment conversion # -indent_with_tabs = 0 -input_tab_size = 4 -indent_columns = 4 +indent_with_tabs = 0 +input_tab_size = 4 +indent_columns = 4 -cmt_star_cont = true -cmt_cpp_to_c = true -cmt_cpp_group = true -cmt_cpp_nl_start = true -cmt_cpp_nl_end = true +cmt_star_cont = true +cmt_cpp_to_c = true +cmt_cpp_group = true +cmt_cpp_nl_start = true +cmt_cpp_nl_end = true -align_right_cmt_span = 2 +align_right_cmt_span = 2 -nl_after_multiline_comment = true +nl_after_multiline_comment = true diff --git a/tests/config/cs_delegate_default.cfg b/tests/config/cs_delegate_default.cfg index 29505d41c9..69c060f8ce 100644 --- a/tests/config/cs_delegate_default.cfg +++ b/tests/config/cs_delegate_default.cfg @@ -1 +1 @@ -indent_cs_delegate_brace=false +indent_cs_delegate_brace = false diff --git a/tests/config/cs_delegate_indent.cfg b/tests/config/cs_delegate_indent.cfg index 4dcce33a86..cea29c2753 100644 --- a/tests/config/cs_delegate_indent.cfg +++ b/tests/config/cs_delegate_indent.cfg @@ -1 +1 @@ -indent_cs_delegate_brace=true +indent_cs_delegate_brace = true diff --git a/tests/config/cs_generics.cfg b/tests/config/cs_generics.cfg index 77117dc7ca..305202bc70 100644 --- a/tests/config/cs_generics.cfg +++ b/tests/config/cs_generics.cfg @@ -1,7 +1,7 @@ -sp_before_angle = remove -sp_inside_angle = remove -sp_angle_paren = remove -sp_angle_paren_empty = remove -sp_compare = force -sp_sizeof_paren = remove -sp_angle_shift = remove +sp_before_angle = remove +sp_inside_angle = remove +sp_angle_paren = remove +sp_angle_paren_empty = remove +sp_compare = force +sp_sizeof_paren = remove +sp_angle_shift = remove diff --git a/tests/config/cu.cfg b/tests/config/cu.cfg index dfd94dca65..af6caf3010 100644 --- a/tests/config/cu.cfg +++ b/tests/config/cu.cfg @@ -9,107 +9,107 @@ # # -input_tab_size = 2 # original tab size - -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -indent_columns = 2 -indent_align_string = true -indent_braces = false -indent_namespace = true -indent_class = true -indent_class_colon = true -indent_func_call_param = true -indent_func_def_param = true -indent_func_proto_param = true -indent_func_class_param = true -indent_func_ctor_var_param = true -indent_template_param = true -indent_member = 0 -indent_switch_case = 2 -indent_access_spec = -2 -indent_paren_nl = false -indent_paren_close = 1 -indent_comma_paren = true +input_tab_size = 2 # original tab size + +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +indent_columns = 2 +indent_align_string = true +indent_braces = false +indent_namespace = true +indent_class = true +indent_class_colon = true +indent_func_call_param = true +indent_func_def_param = true +indent_func_proto_param = true +indent_func_class_param = true +indent_func_ctor_var_param = true +indent_template_param = true +indent_member = 0 +indent_switch_case = 2 +indent_access_spec = -2 +indent_paren_nl = false +indent_paren_close = 1 +indent_comma_paren = true ## ## inter-character spacing options ## -sp_arith = add -sp_assign = add -sp_enum_assign = add -sp_bool = add -sp_compare = add -sp_inside_paren = remove -sp_balance_nested_parens = false -sp_before_ptr_star = remove -sp_before_unnamed_ptr_star = remove -sp_between_ptr_star = remove -sp_after_ptr_star = add -sp_before_byref = remove -sp_before_unnamed_byref = ignore -sp_after_byref = add -sp_after_type = add -sp_template_angle = remove -sp_before_angle = remove -sp_inside_angle = remove -sp_after_angle = remove -sp_angle_paren = remove -sp_angle_paren_empty = remove -sp_angle_word = add -sp_before_sparen = add -sp_inside_sparen = remove -sp_after_sparen = remove -sp_before_square = remove -sp_before_squares = remove -sp_inside_square = remove -sp_after_comma = add -sp_before_comma = remove -sp_after_class_colon = add -sp_before_class_colon = add -sp_after_operator = remove -sp_after_operator_sym = remove -sp_after_cast = add -sp_inside_paren_cast = remove -sp_sizeof_paren = remove -sp_inside_braces_enum = remove -sp_inside_braces_struct = remove -sp_inside_braces = remove -sp_inside_braces_empty = add -sp_func_proto_paren = remove -sp_func_def_paren = remove -sp_inside_fparens = remove -sp_inside_fparen = remove -sp_square_fparen = remove -sp_func_call_paren = remove -sp_func_class_paren = remove -sp_return_paren = add -sp_attribute_paren = add -sp_defined_paren = add -sp_before_dc = remove -sp_after_dc = remove -sp_not = remove -sp_inv = remove -sp_addr = remove -sp_member = remove -sp_deref = remove -sp_sign = remove -sp_incdec = remove +sp_arith = add +sp_assign = add +sp_enum_assign = add +sp_bool = add +sp_compare = add +sp_inside_paren = remove +sp_balance_nested_parens = false +sp_before_ptr_star = remove +sp_before_unnamed_ptr_star = remove +sp_between_ptr_star = remove +sp_after_ptr_star = add +sp_before_byref = remove +sp_before_unnamed_byref = ignore +sp_after_byref = add +sp_after_type = add +sp_template_angle = remove +sp_before_angle = remove +sp_inside_angle = remove +sp_after_angle = remove +sp_angle_paren = remove +sp_angle_paren_empty = remove +sp_angle_word = add +sp_before_sparen = add +sp_inside_sparen = remove +sp_after_sparen = remove +sp_before_square = remove +sp_before_squares = remove +sp_inside_square = remove +sp_after_comma = add +sp_before_comma = remove +sp_after_class_colon = add +sp_before_class_colon = add +sp_after_operator = remove +sp_after_operator_sym = remove +sp_after_cast = add +sp_inside_paren_cast = remove +sp_sizeof_paren = remove +sp_inside_braces_enum = remove +sp_inside_braces_struct = remove +sp_inside_braces = remove +sp_inside_braces_empty = add +sp_func_proto_paren = remove +sp_func_def_paren = remove +sp_inside_fparens = remove +sp_inside_fparen = remove +sp_square_fparen = remove +sp_func_call_paren = remove +sp_func_class_paren = remove +sp_return_paren = add +sp_attribute_paren = add +sp_defined_paren = add +sp_before_dc = remove +sp_after_dc = remove +sp_not = remove +sp_inv = remove +sp_addr = remove +sp_member = remove +sp_deref = remove +sp_sign = remove +sp_incdec = remove ## ## Aligning stuff ## -align_with_tabs = false -align_on_tabstop = true -align_keep_tabs = true -align_with_tabs = false -align_on_tabstop = false -align_number_right = true -align_func_params = true +align_with_tabs = false +align_on_tabstop = true +align_keep_tabs = true +align_with_tabs = false +align_on_tabstop = false +align_number_right = true +align_func_params = true #align_same_func_call_params = true -align_var_def_span = 0 +align_var_def_span = 0 #align_var_def_star_style = 0 #align_var_def_amp_style = 0 @@ -118,64 +118,64 @@ align_var_def_span = 0 # New Line # -nl_collapse_empty_body = false -nl_func_leave_one_liners = false -nl_if_leave_one_liners = false -nl_enum_brace = add -nl_struct_brace = add -nl_union_brace = add -nl_if_brace = add -nl_brace_else = add -nl_elseif_brace = add -nl_else_brace = add -nl_else_if = add -nl_try_brace = add -nl_for_brace = add -nl_catch_brace = add -nl_brace_catch = add -nl_while_brace = add -nl_do_brace = add -nl_brace_while = add -nl_switch_brace = add +nl_collapse_empty_body = false +nl_func_leave_one_liners = false +nl_if_leave_one_liners = false +nl_enum_brace = add +nl_struct_brace = add +nl_union_brace = add +nl_if_brace = add +nl_brace_else = add +nl_elseif_brace = add +nl_else_brace = add +nl_else_if = add +nl_try_brace = add +nl_for_brace = add +nl_catch_brace = add +nl_brace_catch = add +nl_while_brace = add +nl_do_brace = add +nl_brace_while = add +nl_switch_brace = add #nl_multi_line_cond = true -nl_before_case = true -nl_before_throw = add -nl_after_case = true -nl_namespace_brace = add -nl_template_class = add -nl_class_brace = add -nl_class_init_args = ignore -nl_func_type_name = add -nl_func_proto_type_name = add -nl_func_paren = remove +nl_before_case = true +nl_before_throw = add +nl_after_case = true +nl_namespace_brace = add +nl_template_class = add +nl_class_brace = add +nl_class_init_args = ignore +nl_func_type_name = add +nl_func_proto_type_name = add +nl_func_paren = remove #nl_func_decl_start -nl_fdef_brace = add -nl_after_semicolon = true -nl_after_vbrace_open = true -nl_create_if_one_liner = false -nl_create_for_one_liner = false -nl_create_while_one_liner = false -nl_after_access_spec = 1 +nl_fdef_brace = add +nl_after_semicolon = true +nl_after_vbrace_open = true +nl_create_if_one_liner = false +nl_create_for_one_liner = false +nl_create_while_one_liner = false +nl_after_access_spec = 1 # # # -code_width = 78 -ls_for_split_full = true -ls_func_split_full = true -nl_after_access_spec = 1 -eat_blanks_after_open_brace = true +code_width = 78 +ls_for_split_full = true +ls_func_split_full = true +nl_after_access_spec = 1 +eat_blanks_after_open_brace = true # # Code modifying options (non-whitespace) # -mod_full_brace_do = add -mod_full_brace_for = add -mod_full_brace_function = add -mod_full_brace_if = add -mod_full_brace_while = add -mod_paren_on_return = remove -mod_remove_extra_semicolon = true +mod_full_brace_do = add +mod_full_brace_for = add +mod_full_brace_function = add +mod_full_brace_if = add +mod_full_brace_while = add +mod_paren_on_return = remove +mod_remove_extra_semicolon = true diff --git a/tests/config/custom-open.cfg b/tests/config/custom-open.cfg index 9a91a25c0e..269e28a937 100644 --- a/tests/config/custom-open.cfg +++ b/tests/config/custom-open.cfg @@ -1,24 +1,24 @@ # -indent_columns = 4 -output_tab_size = indent_columns +indent_columns = 4 +output_tab_size = indent_columns -indent_with_tabs = 1 +indent_with_tabs = 1 # Spaces to indent 'case' from 'switch' -indent_switch_case = indent_columns # number +indent_switch_case = indent_columns # number # Spaces to indent '{' from 'case' -indent_case_brace = 0 # indent_columns # number +indent_case_brace = 0 # indent_columns # number -align_assign_span = 1 -align_assign_thresh = 16 +align_assign_span = 1 +align_assign_thresh = 16 -macro-open MACRO_BEGIN_STUFF -macro-else MACRO_ELSE_STUFF -macro-close MACRO_END_STUFF -macro-open MACRO2_BEGIN_STUFF -macro-else MACRO2_ELSE_STUFF -macro-close MACRO2_END_STUFF -type foorbar_t -define MYDEFINE 1 +macro-open MACRO_BEGIN_STUFF +macro-else MACRO_ELSE_STUFF +macro-close MACRO_END_STUFF +macro-open MACRO2_BEGIN_STUFF +macro-else MACRO2_ELSE_STUFF +macro-close MACRO2_END_STUFF +type foorbar_t +define MYDEFINE 1 diff --git a/tests/config/custom-open2.cfg b/tests/config/custom-open2.cfg index 515cdac3cd..ff78c7effa 100644 --- a/tests/config/custom-open2.cfg +++ b/tests/config/custom-open2.cfg @@ -1,24 +1,24 @@ # -indent_columns = 4 -output_tab_size = indent_columns +indent_columns = 4 +output_tab_size = indent_columns -indent_with_tabs = 0 +indent_with_tabs = 0 # Spaces to indent 'case' from 'switch' -indent_switch_case = indent_columns # number +indent_switch_case = indent_columns # number # Spaces to indent '{' from 'case' -indent_case_brace = 0 # indent_columns # number +indent_case_brace = 0 # indent_columns # number -align_assign_span = 1 -align_assign_thresh = 16 +align_assign_span = 1 +align_assign_thresh = 16 -macro-open MACRO_BEGIN_STUFF -macro-else MACRO_ELSE_STUFF -macro-close MACRO_END_STUFF -macro-open MACRO2_BEGIN_STUFF -macro-else MACRO2_ELSE_STUFF -macro-close MACRO2_END_STUFF -type foorbar_t -define MYDEFINE 1 +macro-open MACRO_BEGIN_STUFF +macro-else MACRO_ELSE_STUFF +macro-close MACRO_END_STUFF +macro-open MACRO2_BEGIN_STUFF +macro-else MACRO2_ELSE_STUFF +macro-close MACRO2_END_STUFF +type foorbar_t +define MYDEFINE 1 diff --git a/tests/config/custom_types_ssl.cfg b/tests/config/custom_types_ssl.cfg index cd1991b8ce..0ad14386ab 100644 --- a/tests/config/custom_types_ssl.cfg +++ b/tests/config/custom_types_ssl.cfg @@ -1,62 +1,62 @@ # patch 20090404-xxx needed to cope with such custom types as these: -input_tab_size = 8 -output_tab_size = 4 -indent_with_tabs = 1 -indent_columns = 4 +input_tab_size = 8 +output_tab_size = 4 +indent_with_tabs = 1 +indent_columns = 4 -align_func_params = true +align_func_params = true -indent_func_call_param = true -indent_func_def_param = true -indent_func_proto_param = true +indent_func_call_param = true +indent_func_def_param = true +indent_func_proto_param = true -sp_arith = add -sp_assign = add +sp_arith = add +sp_assign = add # Add or remove space around preprocessor '##' concatenation operator -sp_pp_concat = remove +sp_pp_concat = remove # Add or remove space after preprocessor '#' stringify operator -sp_pp_stringify = remove +sp_pp_stringify = remove # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = true # false/true +align_right_cmt_mix = true # false/true # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. -align_right_cmt_gap = 1 # number +align_right_cmt_gap = 1 # number # Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore) -align_right_cmt_at_col = 0 # number +align_right_cmt_at_col = 0 # number -sp_bool = add -sp_compare = add +sp_bool = add +sp_compare = add # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = remove +sp_after_ptr_star = remove # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = remove +sp_after_ptr_star_func = remove # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = add +sp_before_ptr_star_func = add # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = add +sp_func_proto_paren = add # Add or remove space between function name and '(' on function definition -sp_func_def_paren = add +sp_func_def_paren = add # Add or remove space inside function '(' and ')' -sp_inside_fparen = add +sp_inside_fparen = add @@ -64,63 +64,63 @@ sp_inside_fparen = add # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 3 # number +align_enum_equ_span = 3 # number # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 5 # number +align_enum_equ_thresh = 5 # number # The span for aligning struct/union (0=don't align) -align_var_struct_span = 2 # number +align_var_struct_span = 2 # number # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 5 # number +align_var_struct_thresh = 5 # number # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # number # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 3 # number +align_struct_init_span = 3 # number # If false, disable all multi-line comment changes, including cmt_width and leading chars. # Default is true. -cmt_indent_multi = true # false/true +cmt_indent_multi = true # false/true # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # false/true # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = true # false/true +cmt_c_nl_start = true # false/true # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = true # false/true +cmt_c_nl_end = true # false/true # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = true # false/true +cmt_cpp_group = true # false/true # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # false/true # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # false/true # Whether to put a star on subsequent comment lines -cmt_star_cont = true # false/true +cmt_star_cont = true # false/true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # number # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # number # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true # false/true -set type_wrap STACK_OF LHASH_OF +set type_wrap STACK_OF LHASH_OF diff --git a/tests/config/d-tst2.cfg b/tests/config/d-tst2.cfg index 8bc2baaf51..e723ffcd9e 100644 --- a/tests/config/d-tst2.cfg +++ b/tests/config/d-tst2.cfg @@ -2,100 +2,100 @@ # My favorite format # -newlines = LF # AUTO (default), DOS, MAC, or UNIX +newlines = LF # AUTO (default), DOS, MAC, or UNIX -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 4 # new tab size -indent_columns = output_tab_size -indent_label = 1 # pos: absolute col, neg: relative column -indent_align_string = False # align broken strings -indent_brace = 0 -indent_func_call_param = TRUE +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 4 # new tab size +indent_columns = output_tab_size +indent_label = 1 # pos: absolute col, neg: relative column +indent_align_string = False # align broken strings +indent_brace = 0 +indent_func_call_param = TRUE -nl_start_of_file = remove +nl_start_of_file = remove # nl_start_of_file_min = 0 -nl_end_of_file = force -nl_end_of_file_min = 1 +nl_end_of_file = force +nl_end_of_file_min = 1 -nl_assign_brace = remove # "= {" vs "= \n {" -nl_enum_brace = remove # "enum {" vs "enum \n {" -nl_union_brace = remove # "union {" vs "union \n {" -nl_struct_brace = remove # "struct {" vs "struct \n {" -nl_do_brace = remove # "do {" vs "do \n {" -nl_if_brace = remove # "if () {" vs "if () \n {" -nl_for_brace = remove # "for () {" vs "for () \n {" -nl_else_brace = remove # "else {" vs "else \n {" -nl_while_brace = remove # "while () {" vs "while () \n {" -nl_switch_brace = remove # "switch () {" vs "switch () \n {" -nl_func_var_def_blk = 1 -nl_before_case = 1 -nl_fcall_brace = remove # "foo() {" vs "foo()\n{" -nl_fdef_brace = remove # "int foo() {" vs "int foo()\n{" -nl_after_return = TRUE -nl_brace_while = remove -nl_brace_else = add -nl_squeeze_ifdef = TRUE -nl_after_case = TRUE +nl_assign_brace = remove # "= {" vs "= \n {" +nl_enum_brace = remove # "enum {" vs "enum \n {" +nl_union_brace = remove # "union {" vs "union \n {" +nl_struct_brace = remove # "struct {" vs "struct \n {" +nl_do_brace = remove # "do {" vs "do \n {" +nl_if_brace = remove # "if () {" vs "if () \n {" +nl_for_brace = remove # "for () {" vs "for () \n {" +nl_else_brace = remove # "else {" vs "else \n {" +nl_while_brace = remove # "while () {" vs "while () \n {" +nl_switch_brace = remove # "switch () {" vs "switch () \n {" +nl_func_var_def_blk = 1 +nl_before_case = 1 +nl_fcall_brace = remove # "foo() {" vs "foo()\n{" +nl_fdef_brace = remove # "int foo() {" vs "int foo()\n{" +nl_after_return = TRUE +nl_brace_while = remove +nl_brace_else = add +nl_squeeze_ifdef = TRUE +nl_after_case = TRUE -mod_paren_on_return = add # "return 1;" vs "return (1);" -mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" -mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" +mod_paren_on_return = add # "return 1;" vs "return (1);" +mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" +mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" +mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" +mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" -sp_before_byref = remove -sp_before_semi = remove -sp_paren_paren = remove # space between (( and )) -sp_return_paren = remove # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" -sp_inside_paren = remove -sp_inside_fparen = remove -sp_inside_sparen = remove -sp_inside_square = remove +sp_before_byref = remove +sp_before_semi = remove +sp_paren_paren = remove # space between (( and )) +sp_return_paren = remove # "return (1);" vs "return(1);" +sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" +sp_before_sparen = force # "if (" vs "if(" +sp_after_sparen = force # "if () {" vs "if (){" +sp_after_cast = remove # "(int) a" vs "(int)a" +sp_inside_braces = force # "{ 1 }" vs "{1}" +sp_inside_braces_struct = force # "{ 1 }" vs "{1}" +sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_inside_paren = remove +sp_inside_fparen = remove +sp_inside_sparen = remove +sp_inside_square = remove #sp_type_func = ignore -sp_assign = force -sp_arith = force -sp_bool = force -sp_compare = force -sp_assign = force -sp_after_comma = force -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" -sp_func_class_paren = remove -sp_before_angle = force -sp_after_angle = force -sp_inside_angle = remove +sp_assign = force +sp_arith = force +sp_bool = force +sp_compare = force +sp_assign = force +sp_after_comma = force +sp_func_def_paren = remove # "int foo (){" vs "int foo(){" +sp_func_call_paren = remove # "foo (" vs "foo(" +sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_func_class_paren = remove +sp_before_angle = force +sp_after_angle = force +sp_inside_angle = remove -align_with_tabs = FALSE # use tabs to align -align_on_tabstop = FALSE # align on tabstops -align_enum_equ_span = 4 -align_nl_cont = TRUE -align_var_def_span = 2 -align_var_def_inline = TRUE -align_var_def_star_style = 1 -align_var_def_colon = TRUE -align_assign_span = 1 -align_struct_init_span = 3 -align_var_struct_span = 99 -align_right_cmt_span = 3 -align_pp_define_span = 3 -align_pp_define_gap = 4 -align_number_right = TRUE -align_typedef_span = 5 -align_typedef_gap = 3 +align_with_tabs = FALSE # use tabs to align +align_on_tabstop = FALSE # align on tabstops +align_enum_equ_span = 4 +align_nl_cont = TRUE +align_var_def_span = 2 +align_var_def_inline = TRUE +align_var_def_star_style = 1 +align_var_def_colon = TRUE +align_assign_span = 1 +align_struct_init_span = 3 +align_var_struct_span = 99 +align_right_cmt_span = 3 +align_pp_define_span = 3 +align_pp_define_gap = 4 +align_number_right = TRUE +align_typedef_span = 5 +align_typedef_gap = 3 -cmt_star_cont = TRUE +cmt_star_cont = TRUE -eat_blanks_before_close_brace = TRUE -eat_blanks_after_open_brace = TRUE +eat_blanks_before_close_brace = TRUE +eat_blanks_after_open_brace = TRUE # indent_square_nl = false diff --git a/tests/config/d.cfg b/tests/config/d.cfg index 866becec73..5b142ef176 100644 --- a/tests/config/d.cfg +++ b/tests/config/d.cfg @@ -2,34 +2,34 @@ # My favorite format # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 4 # new tab size -indent_columns = output_tab_size -indent_label = 2 # pos: absolute col, neg: relative column -indent_align_string = False # align broken strings -indent_brace = 0 -indent_case_brace = indent_columns -indent_class = true +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 4 # new tab size +indent_columns = output_tab_size +indent_label = 2 # pos: absolute col, neg: relative column +indent_align_string = False # align broken strings +indent_brace = 0 +indent_case_brace = indent_columns +indent_class = true -nl_enum_brace = add # "enum {" vs "enum \n {" -nl_union_brace = add # "union {" vs "union \n {" -nl_struct_brace = add # "struct {" vs "struct \n {" -nl_do_brace = add # "do {" vs "do \n {" -nl_if_brace = add # "if () {" vs "if () \n {" -nl_for_brace = add # "for () {" vs "for () \n {" -nl_else_brace = add # "else {" vs "else \n {" -nl_else_if = remove -nl_while_brace = add # "while () {" vs "while () \n {" -nl_switch_brace = add # "switch () {" vs "switch () \n {" -nl_func_var_def_blk = 1 -nl_before_case = 1 -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" -nl_after_return = TRUE -nl_brace_while = remove -nl_brace_else = add -nl_squeeze_ifdef = TRUE +nl_enum_brace = add # "enum {" vs "enum \n {" +nl_union_brace = add # "union {" vs "union \n {" +nl_struct_brace = add # "struct {" vs "struct \n {" +nl_do_brace = add # "do {" vs "do \n {" +nl_if_brace = add # "if () {" vs "if () \n {" +nl_for_brace = add # "for () {" vs "for () \n {" +nl_else_brace = add # "else {" vs "else \n {" +nl_else_if = remove +nl_while_brace = add # "while () {" vs "while () \n {" +nl_switch_brace = add # "switch () {" vs "switch () \n {" +nl_func_var_def_blk = 1 +nl_before_case = 1 +nl_fcall_brace = add # "foo() {" vs "foo()\n{" +nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_after_return = TRUE +nl_brace_while = remove +nl_brace_else = add +nl_squeeze_ifdef = TRUE nl_after_brace_open = TRUE #nl_func_leave_one_liners = FALSE #nl_class_leave_one_liners = TRUE @@ -40,60 +40,60 @@ nl_after_brace_open = TRUE # mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" # mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" -sp_before_square = remove -sp_before_squares = remove -sp_before_semi = remove -sp_paren_paren = remove # space between (( and )) -sp_return_paren = remove # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" -sp_inside_paren = remove -sp_inside_fparen = remove -sp_inside_sparen = remove +sp_before_square = remove +sp_before_squares = remove +sp_before_semi = remove +sp_paren_paren = remove # space between (( and )) +sp_return_paren = remove # "return (1);" vs "return(1);" +sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" +sp_before_sparen = force # "if (" vs "if(" +sp_after_sparen = force # "if () {" vs "if (){" +sp_after_cast = remove # "(int) a" vs "(int)a" +sp_inside_braces = force # "{ 1 }" vs "{1}" +sp_inside_braces_struct = force # "{ 1 }" vs "{1}" +sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_inside_paren = remove +sp_inside_fparen = remove +sp_inside_sparen = remove #sp_type_func = ignore -sp_assign = force -sp_arith = force -sp_bool = force -sp_compare = force -sp_assign = force -sp_after_comma = force -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" -sp_after_ptr_star = remove -sp_before_ptr_star = force -sp_between_ptr_star = remove +sp_assign = force +sp_arith = force +sp_bool = force +sp_compare = force +sp_assign = force +sp_after_comma = force +sp_func_def_paren = remove # "int foo (){" vs "int foo(){" +sp_func_call_paren = remove # "foo (" vs "foo(" +sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_after_ptr_star = remove +sp_before_ptr_star = force +sp_between_ptr_star = remove sp_range = force sp_before_template_paren = remove -align_with_tabs = FALSE # use tabs to align -align_on_tabstop = FALSE # align on tabstops -align_enum_equ_span = 4 -align_nl_cont = TRUE -align_var_def_span = 2 -align_var_class_span = 2 -align_var_def_inline = TRUE -align_var_def_star_style = 1 -align_var_def_colon = TRUE -align_assign_span = 1 -align_struct_init_span = 3 -align_var_struct_span = 3 -align_right_cmt_span = 3 -align_pp_define_span = 3 -align_pp_define_gap = 4 -align_number_right = TRUE -align_typedef_span = 5 -align_typedef_gap = 3 +align_with_tabs = FALSE # use tabs to align +align_on_tabstop = FALSE # align on tabstops +align_enum_equ_span = 4 +align_nl_cont = TRUE +align_var_def_span = 2 +align_var_class_span = 2 +align_var_def_inline = TRUE +align_var_def_star_style = 1 +align_var_def_colon = TRUE +align_assign_span = 1 +align_struct_init_span = 3 +align_var_struct_span = 3 +align_right_cmt_span = 3 +align_pp_define_span = 3 +align_pp_define_gap = 4 +align_number_right = TRUE +align_typedef_span = 5 +align_typedef_gap = 3 align_typedef_star_style = 1 # cmt_star_cont = TRUE -eat_blanks_before_close_brace = TRUE -eat_blanks_after_open_brace = TRUE +eat_blanks_before_close_brace = TRUE +eat_blanks_after_open_brace = TRUE -indent_paren_nl = TRUE +indent_paren_nl = TRUE diff --git a/tests/config/d2.cfg b/tests/config/d2.cfg index 1a0f2e8ee6..119c08afaf 100644 --- a/tests/config/d2.cfg +++ b/tests/config/d2.cfg @@ -2,110 +2,110 @@ # My favorite format # -newlines = auto # AUTO (default), DOS, MAC, or UNIX +newlines = auto # AUTO (default), DOS, MAC, or UNIX -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 4 # new tab size -indent_columns = output_tab_size -indent_label = 1 # pos: absolute col, neg: relative column -indent_align_string = False # align broken strings -indent_brace = 0 -indent_case_brace = indent_columns -indent_class = true +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 4 # new tab size +indent_columns = output_tab_size +indent_label = 1 # pos: absolute col, neg: relative column +indent_align_string = False # align broken strings +indent_brace = 0 +indent_case_brace = indent_columns +indent_class = true -nl_start_of_file = remove +nl_start_of_file = remove # nl_start_of_file_min = 0 -nl_end_of_file = force -nl_end_of_file_min = 1 +nl_end_of_file = force +nl_end_of_file_min = 1 -nl_assign_brace = remove # "= {" vs "= \n {" -nl_enum_brace = remove # "enum {" vs "enum \n {" -nl_union_brace = remove # "union {" vs "union \n {" -nl_struct_brace = remove # "struct {" vs "struct \n {" -nl_do_brace = remove # "do {" vs "do \n {" -nl_if_brace = remove # "if () {" vs "if () \n {" -nl_for_brace = remove # "for () {" vs "for () \n {" -nl_else_brace = remove # "else {" vs "else \n {" -nl_while_brace = remove # "while () {" vs "while () \n {" -nl_switch_brace = remove # "switch () {" vs "switch () \n {" -nl_func_var_def_blk = 1 -nl_before_case = 1 -nl_fcall_brace = remove # "foo() {" vs "foo()\n{" -nl_fdef_brace = remove # "int foo() {" vs "int foo()\n{" -nl_after_return = TRUE -nl_brace_while = remove -nl_brace_else = add -nl_squeeze_ifdef = TRUE +nl_assign_brace = remove # "= {" vs "= \n {" +nl_enum_brace = remove # "enum {" vs "enum \n {" +nl_union_brace = remove # "union {" vs "union \n {" +nl_struct_brace = remove # "struct {" vs "struct \n {" +nl_do_brace = remove # "do {" vs "do \n {" +nl_if_brace = remove # "if () {" vs "if () \n {" +nl_for_brace = remove # "for () {" vs "for () \n {" +nl_else_brace = remove # "else {" vs "else \n {" +nl_while_brace = remove # "while () {" vs "while () \n {" +nl_switch_brace = remove # "switch () {" vs "switch () \n {" +nl_func_var_def_blk = 1 +nl_before_case = 1 +nl_fcall_brace = remove # "foo() {" vs "foo()\n{" +nl_fdef_brace = remove # "int foo() {" vs "int foo()\n{" +nl_after_return = TRUE +nl_brace_while = remove +nl_brace_else = add +nl_squeeze_ifdef = TRUE nl_after_brace_open = TRUE -mod_paren_on_return = add # "return 1;" vs "return (1);" -mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" -mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" +mod_paren_on_return = add # "return 1;" vs "return (1);" +mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" +mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" +mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" +mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" -sp_before_byref = remove -sp_before_semi = remove -sp_paren_paren = remove # space between (( and )) -sp_return_paren = remove # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" -sp_inside_paren = remove -sp_inside_fparen = remove -sp_inside_sparen = remove -sp_inside_square = remove +sp_before_byref = remove +sp_before_semi = remove +sp_paren_paren = remove # space between (( and )) +sp_return_paren = remove # "return (1);" vs "return(1);" +sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" +sp_before_sparen = force # "if (" vs "if(" +sp_after_sparen = force # "if () {" vs "if (){" +sp_after_cast = remove # "(int) a" vs "(int)a" +sp_inside_braces = force # "{ 1 }" vs "{1}" +sp_inside_braces_struct = force # "{ 1 }" vs "{1}" +sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_inside_paren = remove +sp_inside_fparen = remove +sp_inside_sparen = remove +sp_inside_square = remove #sp_type_func = ignore -sp_assign = force -sp_arith = force -sp_bool = force -sp_compare = force -sp_assign = force -sp_after_comma = force -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" -sp_func_class_paren = remove -sp_before_angle = force -sp_after_angle = force -sp_inside_angle = remove -sp_else_brace = force +sp_assign = force +sp_arith = force +sp_bool = force +sp_compare = force +sp_assign = force +sp_after_comma = force +sp_func_def_paren = remove # "int foo (){" vs "int foo(){" +sp_func_call_paren = remove # "foo (" vs "foo(" +sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_func_class_paren = remove +sp_before_angle = force +sp_after_angle = force +sp_inside_angle = remove +sp_else_brace = force sp_paren_brace = force sp_fparen_brace = force sp_range = remove sp_before_template_paren = force -align_with_tabs = FALSE # use tabs to align -align_on_tabstop = FALSE # align on tabstops -align_enum_equ_span = 4 -align_nl_cont = TRUE -align_var_def_span = 2 -align_var_class_span = 2 -align_var_def_inline = TRUE -align_var_def_star_style = 1 -align_var_def_colon = TRUE -align_assign_span = 1 -align_struct_init_span = 3 -align_var_struct_span = 99 -align_right_cmt_span = 3 -align_pp_define_span = 3 -align_pp_define_gap = 4 -align_number_right = TRUE -align_typedef_span = 5 -align_typedef_gap = 3 +align_with_tabs = FALSE # use tabs to align +align_on_tabstop = FALSE # align on tabstops +align_enum_equ_span = 4 +align_nl_cont = TRUE +align_var_def_span = 2 +align_var_class_span = 2 +align_var_def_inline = TRUE +align_var_def_star_style = 1 +align_var_def_colon = TRUE +align_assign_span = 1 +align_struct_init_span = 3 +align_var_struct_span = 99 +align_right_cmt_span = 3 +align_pp_define_span = 3 +align_pp_define_gap = 4 +align_number_right = TRUE +align_typedef_span = 5 +align_typedef_gap = 3 -cmt_star_cont = TRUE +cmt_star_cont = TRUE -eat_blanks_before_close_brace = TRUE -eat_blanks_after_open_brace = TRUE -nl_assign_square = remove -sp_inside_square = remove -sp_d_array_colon = force -nl_after_square_assign = force +eat_blanks_before_close_brace = TRUE +eat_blanks_after_open_brace = TRUE +nl_assign_square = remove +sp_inside_square = remove +sp_d_array_colon = force +nl_after_square_assign = force diff --git a/tests/config/d3.cfg b/tests/config/d3.cfg index 2730362bd4..f8d8ab3681 100644 --- a/tests/config/d3.cfg +++ b/tests/config/d3.cfg @@ -2,32 +2,32 @@ # $Id: d.cfg 803 2007-07-25 00:36:25Z bengardner $ # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 4 # new tab size -indent_columns = output_tab_size -indent_label = 2 # pos: absolute col, neg: relative column -indent_align_string = False # align broken strings -indent_brace = 0 -indent_case_brace = indent_columns +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 4 # new tab size +indent_columns = output_tab_size +indent_label = 2 # pos: absolute col, neg: relative column +indent_align_string = False # align broken strings +indent_brace = 0 +indent_case_brace = indent_columns -nl_enum_brace = add # "enum {" vs "enum \n {" -nl_union_brace = add # "union {" vs "union \n {" -nl_struct_brace = add # "struct {" vs "struct \n {" -nl_do_brace = add # "do {" vs "do \n {" -nl_if_brace = add # "if () {" vs "if () \n {" -nl_for_brace = add # "for () {" vs "for () \n {" -nl_else_brace = add # "else {" vs "else \n {" -nl_while_brace = add # "while () {" vs "while () \n {" -nl_switch_brace = add # "switch () {" vs "switch () \n {" -nl_func_var_def_blk = 1 -nl_before_case = 1 -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" -nl_after_return = TRUE -nl_brace_while = remove -nl_brace_else = add -nl_squeeze_ifdef = TRUE +nl_enum_brace = add # "enum {" vs "enum \n {" +nl_union_brace = add # "union {" vs "union \n {" +nl_struct_brace = add # "struct {" vs "struct \n {" +nl_do_brace = add # "do {" vs "do \n {" +nl_if_brace = add # "if () {" vs "if () \n {" +nl_for_brace = add # "for () {" vs "for () \n {" +nl_else_brace = add # "else {" vs "else \n {" +nl_while_brace = add # "while () {" vs "while () \n {" +nl_switch_brace = add # "switch () {" vs "switch () \n {" +nl_func_var_def_blk = 1 +nl_before_case = 1 +nl_fcall_brace = add # "foo() {" vs "foo()\n{" +nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_after_return = TRUE +nl_brace_while = remove +nl_brace_else = add +nl_squeeze_ifdef = TRUE # mod_paren_on_return = add # "return 1;" vs "return (1);" # mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" @@ -35,61 +35,61 @@ nl_squeeze_ifdef = TRUE # mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" # mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" -sp_before_square = remove -sp_before_squares = remove -sp_before_semi = remove -sp_paren_paren = remove # space between (( and )) -sp_return_paren = remove # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" -sp_inside_paren = remove -sp_inside_fparen = remove -sp_inside_sparen = remove +sp_before_square = remove +sp_before_squares = remove +sp_before_semi = remove +sp_paren_paren = remove # space between (( and )) +sp_return_paren = remove # "return (1);" vs "return(1);" +sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" +sp_before_sparen = force # "if (" vs "if(" +sp_after_sparen = force # "if () {" vs "if (){" +sp_after_cast = remove # "(int) a" vs "(int)a" +sp_inside_braces = force # "{ 1 }" vs "{1}" +sp_inside_braces_struct = force # "{ 1 }" vs "{1}" +sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_inside_paren = remove +sp_inside_fparen = remove +sp_inside_sparen = remove #sp_type_func = ignore -sp_assign = force -sp_arith = force -sp_bool = force -sp_compare = force -sp_assign = force -sp_after_comma = force -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" -sp_after_ptr_star = remove -sp_before_ptr_star = force -sp_between_ptr_star = remove +sp_assign = force +sp_arith = force +sp_bool = force +sp_compare = force +sp_assign = force +sp_after_comma = force +sp_func_def_paren = remove # "int foo (){" vs "int foo(){" +sp_func_call_paren = remove # "foo (" vs "foo(" +sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_after_ptr_star = remove +sp_before_ptr_star = force +sp_between_ptr_star = remove -align_with_tabs = FALSE # use tabs to align -align_on_tabstop = FALSE # align on tabstops -align_enum_equ_span = 4 -align_nl_cont = TRUE -align_var_def_span = 2 -align_var_def_inline = TRUE -align_var_def_star_style = 1 -align_var_def_colon = TRUE -align_assign_span = 1 -align_struct_init_span = 3 -align_var_struct_span = 3 -align_right_cmt_span = 3 -align_pp_define_span = 3 -align_pp_define_gap = 4 -align_number_right = TRUE -align_typedef_span = 5 -align_typedef_gap = 3 +align_with_tabs = FALSE # use tabs to align +align_on_tabstop = FALSE # align on tabstops +align_enum_equ_span = 4 +align_nl_cont = TRUE +align_var_def_span = 2 +align_var_def_inline = TRUE +align_var_def_star_style = 1 +align_var_def_colon = TRUE +align_assign_span = 1 +align_struct_init_span = 3 +align_var_struct_span = 3 +align_right_cmt_span = 3 +align_pp_define_span = 3 +align_pp_define_gap = 4 +align_number_right = TRUE +align_typedef_span = 5 +align_typedef_gap = 3 align_typedef_star_style = 1 # cmt_star_cont = TRUE -eat_blanks_before_close_brace = TRUE -eat_blanks_after_open_brace = TRUE +eat_blanks_before_close_brace = TRUE +eat_blanks_after_open_brace = TRUE -indent_paren_nl = TRUE +indent_paren_nl = TRUE -nl_assign_square = remove +nl_assign_square = remove diff --git a/tests/config/d3a.cfg b/tests/config/d3a.cfg index f315fb9e29..731f9badf8 100644 --- a/tests/config/d3a.cfg +++ b/tests/config/d3a.cfg @@ -2,32 +2,32 @@ # $Id: d.cfg 803 2007-07-25 00:36:25Z bengardner $ # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 4 # new tab size -indent_columns = output_tab_size -indent_label = 2 # pos: absolute col, neg: relative column -indent_align_string = False # align broken strings -indent_brace = 0 -indent_case_brace = indent_columns +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 4 # new tab size +indent_columns = output_tab_size +indent_label = 2 # pos: absolute col, neg: relative column +indent_align_string = False # align broken strings +indent_brace = 0 +indent_case_brace = indent_columns -nl_enum_brace = add # "enum {" vs "enum \n {" -nl_union_brace = add # "union {" vs "union \n {" -nl_struct_brace = add # "struct {" vs "struct \n {" -nl_do_brace = add # "do {" vs "do \n {" -nl_if_brace = add # "if () {" vs "if () \n {" -nl_for_brace = add # "for () {" vs "for () \n {" -nl_else_brace = add # "else {" vs "else \n {" -nl_while_brace = add # "while () {" vs "while () \n {" -nl_switch_brace = add # "switch () {" vs "switch () \n {" -nl_func_var_def_blk = 1 -nl_before_case = 1 -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" -nl_after_return = TRUE -nl_brace_while = remove -nl_brace_else = add -nl_squeeze_ifdef = TRUE +nl_enum_brace = add # "enum {" vs "enum \n {" +nl_union_brace = add # "union {" vs "union \n {" +nl_struct_brace = add # "struct {" vs "struct \n {" +nl_do_brace = add # "do {" vs "do \n {" +nl_if_brace = add # "if () {" vs "if () \n {" +nl_for_brace = add # "for () {" vs "for () \n {" +nl_else_brace = add # "else {" vs "else \n {" +nl_while_brace = add # "while () {" vs "while () \n {" +nl_switch_brace = add # "switch () {" vs "switch () \n {" +nl_func_var_def_blk = 1 +nl_before_case = 1 +nl_fcall_brace = add # "foo() {" vs "foo()\n{" +nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_after_return = TRUE +nl_brace_while = remove +nl_brace_else = add +nl_squeeze_ifdef = TRUE # mod_paren_on_return = add # "return 1;" vs "return (1);" # mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" @@ -35,66 +35,66 @@ nl_squeeze_ifdef = TRUE # mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" # mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" -sp_before_square = remove -sp_before_squares = remove -sp_before_semi = remove -sp_paren_paren = remove # space between (( and )) -sp_return_paren = remove # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" -sp_inside_paren = remove -sp_inside_fparen = remove -sp_inside_sparen = remove +sp_before_square = remove +sp_before_squares = remove +sp_before_semi = remove +sp_paren_paren = remove # space between (( and )) +sp_return_paren = remove # "return (1);" vs "return(1);" +sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" +sp_before_sparen = force # "if (" vs "if(" +sp_after_sparen = force # "if () {" vs "if (){" +sp_after_cast = remove # "(int) a" vs "(int)a" +sp_inside_braces = force # "{ 1 }" vs "{1}" +sp_inside_braces_struct = force # "{ 1 }" vs "{1}" +sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_inside_paren = remove +sp_inside_fparen = remove +sp_inside_sparen = remove #sp_type_func = ignore -sp_assign = force -sp_arith = force -sp_bool = force -sp_compare = force -sp_assign = force -sp_after_comma = force -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" -sp_after_ptr_star = remove -sp_before_ptr_star = force -sp_between_ptr_star = remove +sp_assign = force +sp_arith = force +sp_bool = force +sp_compare = force +sp_assign = force +sp_after_comma = force +sp_func_def_paren = remove # "int foo (){" vs "int foo(){" +sp_func_call_paren = remove # "foo (" vs "foo(" +sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_after_ptr_star = remove +sp_before_ptr_star = force +sp_between_ptr_star = remove -align_with_tabs = FALSE # use tabs to align -align_on_tabstop = FALSE # align on tabstops -align_enum_equ_span = 4 -align_nl_cont = TRUE -align_var_def_span = 2 -align_var_def_inline = TRUE -align_var_def_star_style = 1 -align_var_def_colon = TRUE -align_assign_span = 1 -align_struct_init_span = 3 -align_var_struct_span = 3 -align_right_cmt_span = 3 -align_pp_define_span = 3 -align_pp_define_gap = 4 -align_number_right = TRUE -align_typedef_span = 5 -align_typedef_gap = 3 +align_with_tabs = FALSE # use tabs to align +align_on_tabstop = FALSE # align on tabstops +align_enum_equ_span = 4 +align_nl_cont = TRUE +align_var_def_span = 2 +align_var_def_inline = TRUE +align_var_def_star_style = 1 +align_var_def_colon = TRUE +align_assign_span = 1 +align_struct_init_span = 3 +align_var_struct_span = 3 +align_right_cmt_span = 3 +align_pp_define_span = 3 +align_pp_define_gap = 4 +align_number_right = TRUE +align_typedef_span = 5 +align_typedef_gap = 3 align_typedef_star_style = 1 # cmt_star_cont = TRUE -eat_blanks_before_close_brace = TRUE -eat_blanks_after_open_brace = TRUE +eat_blanks_before_close_brace = TRUE +eat_blanks_after_open_brace = TRUE -indent_paren_nl = TRUE +indent_paren_nl = TRUE -nl_assign_square = force -sp_inside_square = force +nl_assign_square = force +sp_inside_square = force -sp_d_array_colon = remove +sp_d_array_colon = remove -align_var_def_span = 2 -align_var_def_colon = true +align_var_def_span = 2 +align_var_def_colon = true diff --git a/tests/config/d_sp_paren.cfg b/tests/config/d_sp_paren.cfg index fef456b500..bbec9715e8 100644 --- a/tests/config/d_sp_paren.cfg +++ b/tests/config/d_sp_paren.cfg @@ -1,7 +1,7 @@ #sp_catch_paren = force -sp_catch_paren = remove -sp_throw_paren = remove -sp_version_paren = remove -sp_scope_paren = remove -sp_before_sparen = force +sp_catch_paren = remove +sp_throw_paren = remove +sp_version_paren = remove +sp_scope_paren = remove +sp_before_sparen = force diff --git a/tests/config/del_semicolon.cfg b/tests/config/del_semicolon.cfg index b06fbf1187..957aa93d98 100644 --- a/tests/config/del_semicolon.cfg +++ b/tests/config/del_semicolon.cfg @@ -1,7 +1,7 @@ # -mod_remove_extra_semicolon = true -sp_after_semi_for = remove -sp_special_semi=force +mod_remove_extra_semicolon = true +sp_after_semi_for = remove +sp_special_semi = force # #sp_before_semi = ignore -sp_before_semi = remove +sp_before_semi = remove diff --git a/tests/config/delete.cfg b/tests/config/delete.cfg index efc95b383b..3e984294aa 100644 --- a/tests/config/delete.cfg +++ b/tests/config/delete.cfg @@ -1,3 +1,3 @@ -indent_columns = 2 -sp_arith = force +indent_columns = 2 +sp_arith = force diff --git a/tests/config/digraph.cfg b/tests/config/digraph.cfg index 2245dccdd0..fae029e5a2 100644 --- a/tests/config/digraph.cfg +++ b/tests/config/digraph.cfg @@ -1,2 +1,2 @@ -sp_inside_angle=remove -enable_digraphs=true +sp_inside_angle = remove +enable_digraphs = true diff --git a/tests/config/dont-detab-strings.cfg b/tests/config/dont-detab-strings.cfg index 85bbb3ceea..ddaa7cc78c 100644 --- a/tests/config/dont-detab-strings.cfg +++ b/tests/config/dont-detab-strings.cfg @@ -1 +1 @@ -string_replace_tab_chars=true +string_replace_tab_chars = true diff --git a/tests/config/doxy-comment-no.cfg b/tests/config/doxy-comment-no.cfg index 2331a784cd..7faf757838 100644 --- a/tests/config/doxy-comment-no.cfg +++ b/tests/config/doxy-comment-no.cfg @@ -1,498 +1,498 @@ # Uncrustify 0.61 -newlines = auto -input_tab_size = 8 -output_tab_size = 8 -string_escape_char = 92 -string_escape_char2 = 0 -string_replace_tab_chars = false -tok_split_gte = false +newlines = auto +input_tab_size = 8 +output_tab_size = 8 +string_escape_char = 92 +string_escape_char2 = 0 +string_replace_tab_chars = false +tok_split_gte = false # The following new configuration option is buggy and kills proper handling of comments! #disable_processing_cmt = "" -enable_processing_cmt = "" -utf8_bom = ignore -utf8_byte = false -utf8_force = false -indent_columns = 1 -indent_continue = 0 -indent_with_tabs = 0 -indent_cmt_with_tabs = false -indent_align_string = false -indent_xml_string = 0 -indent_brace = 0 -indent_braces = false -indent_braces_no_func = false -indent_braces_no_class = false -indent_braces_no_struct = false -indent_brace_parent = false -indent_paren_open_brace = false -indent_namespace = true -indent_namespace_single_indent = false -indent_namespace_level = 1 -indent_namespace_limit = 0 -indent_extern = true -indent_class = true -indent_class_colon = true -indent_class_on_colon = false -indent_constr_colon = true -indent_ctor_init_leading = 2 -indent_ctor_init = 0 -indent_else_if = false -indent_var_def_blk = 0 -indent_var_def_cont = false -indent_func_def_force_col1 = false -indent_func_call_param = false -indent_func_def_param = false -indent_func_proto_param = false -indent_func_class_param = false -indent_func_ctor_var_param = false -indent_template_param = false -indent_func_param_double = false -indent_func_const = 0 -indent_func_throw = 0 -indent_member = 0 -indent_sing_line_comments = 0 -indent_relative_single_line_comments = false -indent_switch_case = 5 -indent_case_brace = 1 -indent_col1_comment = false -indent_label = 1 -indent_access_spec = 0 -indent_access_spec_body = true -indent_paren_nl = true -indent_paren_close = 1 -indent_comma_paren = false -indent_bool_paren = false -indent_first_bool_expr = false -indent_square_nl = false -indent_preserve_sql = false -indent_align_assign = true -indent_oc_block = false -indent_oc_block_msg = 0 -indent_oc_msg_colon = 0 -indent_oc_msg_prioritize_first_colon = true -indent_oc_block_msg_xcode_style = false -indent_oc_block_msg_from_keyword = false -indent_oc_block_msg_from_colon = false -indent_oc_block_msg_from_caret = false -indent_oc_block_msg_from_brace = false -sp_arith = add -sp_assign = add -sp_cpp_lambda_assign = add -sp_cpp_lambda_paren = add -sp_assign_default = add -sp_before_assign = add -sp_after_assign = add -sp_enum_paren = ignore -sp_enum_assign = add -sp_enum_before_assign = ignore -sp_enum_after_assign = ignore -sp_pp_concat = add -sp_pp_stringify = remove -sp_before_pp_stringify = add -sp_bool = add -sp_compare = ignore -sp_inside_paren = add -sp_paren_paren = add -sp_cparen_oparen = remove -sp_balance_nested_parens = false -sp_paren_brace = add -sp_before_ptr_star = add -sp_before_unnamed_ptr_star = ignore -sp_between_ptr_star = remove -sp_after_ptr_star = remove -sp_after_ptr_star_qualifier = remove -sp_after_ptr_star_func = remove -sp_ptr_star_paren = remove -sp_before_ptr_star_func = add -sp_before_byref = add -sp_before_unnamed_byref = ignore -sp_after_byref = remove -sp_after_byref_func = remove -sp_before_byref_func = remove -sp_after_type = add -sp_before_template_paren = add -sp_template_angle = add -sp_before_angle = remove -sp_inside_angle = remove -sp_after_angle = add -sp_angle_paren = remove -sp_angle_paren_empty = remove -sp_angle_word = add -sp_angle_shift = add -sp_permit_cpp11_shift = false -sp_before_sparen = add -sp_inside_sparen = add -sp_inside_sparen_close = ignore -sp_inside_sparen_open = ignore -sp_after_sparen = add -sp_sparen_brace = add -sp_invariant_paren = ignore -sp_after_invariant_paren = ignore -sp_special_semi = add -sp_before_semi = remove -sp_before_semi_for = add -sp_before_semi_for_empty = remove -sp_after_semi = add -sp_after_semi_for = force -sp_after_semi_for_empty = remove -sp_before_square = remove -sp_before_squares = remove -sp_inside_square = add -sp_after_comma = add -sp_before_comma = remove -sp_after_mdatype_commas = ignore -sp_before_mdatype_commas = ignore -sp_between_mdatype_commas = ignore -sp_paren_comma = force -sp_before_ellipsis = add -sp_after_class_colon = add -sp_before_class_colon = add -sp_after_constr_colon = add -sp_before_constr_colon = add -sp_before_case_colon = remove -sp_after_operator = remove -sp_after_operator_sym = remove -sp_after_cast = remove -sp_inside_paren_cast = remove -sp_cpp_cast_paren = remove -sp_sizeof_paren = remove -sp_after_tag = ignore -sp_inside_braces_enum = add -sp_inside_braces_struct = add -sp_inside_braces = add -sp_inside_braces_empty = remove -sp_type_func = add -sp_func_proto_paren = remove -sp_func_def_paren = remove -sp_inside_fparens = remove -sp_inside_fparen = add -sp_inside_tparen = remove -sp_after_tparen_close = remove -sp_square_fparen = remove -sp_fparen_brace = add -sp_fparen_dbrace = ignore -sp_func_call_paren = remove -sp_func_call_paren_empty = ignore -sp_func_call_user_paren = ignore -sp_func_class_paren = remove -sp_return_paren = add -sp_attribute_paren = add -sp_defined_paren = add -sp_throw_paren = add -sp_after_throw = add -sp_catch_paren = add -sp_version_paren = ignore -sp_scope_paren = ignore -sp_macro = add -sp_macro_func = add -sp_else_brace = add -sp_brace_else = add -sp_brace_typedef = add -sp_catch_brace = add -sp_brace_catch = add -sp_finally_brace = add -sp_brace_finally = add -sp_try_brace = add -sp_getset_brace = add -sp_word_brace = add -sp_word_brace_ns = add -sp_before_dc = remove -sp_after_dc = remove -sp_d_array_colon = ignore -sp_not = remove -sp_inv = remove -sp_addr = remove -sp_member = remove -sp_deref = remove -sp_sign = remove -sp_incdec = remove -sp_before_nl_cont = add -sp_after_oc_scope = add -sp_after_oc_colon = add -sp_before_oc_colon = ignore -sp_after_oc_dict_colon = ignore -sp_before_oc_dict_colon = ignore -sp_after_send_oc_colon = ignore -sp_before_send_oc_colon = ignore -sp_after_oc_type = ignore -sp_after_oc_return_type = ignore -sp_after_oc_at_sel = ignore -sp_after_oc_at_sel_parens = ignore -sp_inside_oc_at_sel_parens = ignore -sp_before_oc_block_caret = ignore -sp_after_oc_block_caret = ignore -sp_after_oc_msg_receiver = ignore -sp_after_oc_property = ignore -sp_cond_colon = add -sp_cond_colon_before = ignore -sp_cond_colon_after = ignore -sp_cond_question = add -sp_cond_question_before = ignore -sp_cond_question_after = ignore -sp_cond_ternary_short = ignore -sp_case_label = force -sp_range = ignore -sp_after_for_colon = ignore -sp_before_for_colon = ignore -sp_extern_paren = ignore -sp_cmt_cpp_start = add -sp_cmt_cpp_doxygen = false -sp_endif_cmt = add -sp_after_new = add -sp_before_tr_emb_cmt = add -sp_num_before_tr_emb_cmt = 0 -sp_annotation_paren = ignore -align_keep_tabs = false -align_with_tabs = false -align_on_tabstop = true -align_number_right = false -align_keep_extra_space = false -align_func_params = true -align_same_func_call_params = false -align_var_def_span = 8 -align_var_def_star_style = 1 -align_var_def_amp_style = 1 -align_var_def_thresh = 0 -align_var_def_gap = 8 -align_var_def_colon = false -align_var_def_attribute = false -align_var_def_inline = true -align_assign_span = 8 -align_assign_thresh = 0 -align_enum_equ_span = 8 -align_enum_equ_thresh = 0 -align_var_struct_span = 8 -align_var_struct_thresh = 0 -align_var_struct_gap = 8 -align_struct_init_span = 8 -align_typedef_gap = 8 -align_typedef_span = 8 -align_typedef_func = 0 -align_typedef_star_style = 1 -align_typedef_amp_style = 1 -align_right_cmt_span = 16 -align_right_cmt_mix = true -align_right_cmt_gap = 0 -align_right_cmt_at_col = 64 -align_func_proto_span = 16 -align_func_proto_gap = 0 -align_on_operator = true -align_mix_var_proto = false -align_single_line_func = true -align_single_line_brace = false -align_single_line_brace_gap = 0 -align_oc_msg_spec_span = 0 -align_nl_cont = true -align_pp_define_together = false -align_pp_define_gap = 1 -align_pp_define_span = 8 -align_left_shift = true -align_oc_msg_colon_span = 0 -align_oc_msg_colon_first = false -align_oc_decl_colon = false -nl_collapse_empty_body = true -nl_assign_leave_one_liners = false -nl_class_leave_one_liners = false -nl_enum_leave_one_liners = false -nl_getset_leave_one_liners = false -nl_func_leave_one_liners = false -nl_cpp_lambda_leave_one_liners = false -nl_if_leave_one_liners = false -nl_oc_msg_leave_one_liner = false -nl_start_of_file = add -nl_start_of_file_min = 5 -nl_end_of_file = add -nl_end_of_file_min = 2 -nl_assign_brace = ignore -nl_assign_square = ignore -nl_after_square_assign = ignore -nl_func_var_def_blk = 2 -nl_typedef_blk_start = 0 -nl_typedef_blk_end = 0 -nl_typedef_blk_in = 0 -nl_var_def_blk_start = 0 -nl_var_def_blk_end = 0 -nl_var_def_blk_in = 2 -nl_fcall_brace = force -nl_enum_brace = remove -nl_struct_brace = remove -nl_union_brace = remove -nl_if_brace = remove -nl_brace_else = add -nl_elseif_brace = remove -nl_else_brace = remove -nl_else_if = remove -nl_brace_finally = force -nl_finally_brace = remove -nl_try_brace = remove -nl_getset_brace = remove -nl_for_brace = remove -nl_catch_brace = remove -nl_brace_catch = force -nl_brace_square = ignore -nl_brace_fparen = ignore -nl_while_brace = remove -nl_scope_brace = ignore -nl_unittest_brace = ignore -nl_version_brace = ignore -nl_using_brace = remove -nl_brace_brace = force -nl_do_brace = remove -nl_brace_while = remove -nl_switch_brace = remove -nl_multi_line_cond = true -nl_multi_line_define = true -nl_before_case = false -nl_before_throw = remove -nl_after_case = false -nl_case_colon_brace = force -nl_namespace_brace = remove -nl_template_class = force -nl_class_brace = remove -nl_class_init_args = ignore -nl_constr_init_args = ignore -nl_func_type_name = ignore -nl_func_type_name_class = ignore -nl_func_scope_name = ignore -nl_func_proto_type_name = ignore -nl_func_paren = remove -nl_func_def_paren = remove -nl_func_decl_start = ignore -nl_func_def_start = ignore -nl_func_decl_start_single = remove -nl_func_def_start_single = remove -nl_func_decl_args = ignore -nl_func_def_args = ignore -nl_func_decl_end = ignore -nl_func_def_end = ignore -nl_func_decl_end_single = remove -nl_func_def_end_single = remove -nl_func_decl_empty = remove -nl_func_def_empty = remove -nl_oc_msg_args = false -nl_fdef_brace = force -nl_cpp_ldef_brace = ignore -nl_return_expr = remove -nl_after_semicolon = false -nl_paren_dbrace_open = ignore -nl_after_brace_open = false -nl_after_brace_open_cmt = false -nl_after_vbrace_open = false -nl_after_vbrace_open_empty = false -nl_after_brace_close = false -nl_after_vbrace_close = false -nl_brace_struct_var = remove -nl_define_macro = true -nl_squeeze_ifdef = false -nl_before_if = ignore -nl_after_if = ignore -nl_before_for = ignore -nl_after_for = ignore -nl_before_while = ignore -nl_after_while = ignore -nl_before_switch = ignore -nl_after_switch = ignore -nl_before_do = ignore -nl_after_do = ignore -nl_ds_struct_enum_cmt = false -nl_ds_struct_enum_close_brace = false -nl_class_colon = ignore -nl_constr_colon = ignore -nl_create_if_one_liner = false -nl_create_for_one_liner = false -nl_create_while_one_liner = false -pos_arith = ignore -pos_assign = ignore -pos_bool = ignore -pos_compare = ignore -pos_conditional = ignore -pos_comma = ignore -pos_class_comma = ignore -pos_constr_comma = ignore -pos_class_colon = ignore -pos_constr_colon = ignore -code_width = 140 -ls_for_split_full = true -ls_func_split_full = true -ls_code_width = true -nl_max = 6 -nl_after_func_proto = 0 -nl_after_func_proto_group = 0 -nl_after_func_body = 3 -nl_after_func_body_class = 3 -nl_after_func_body_one_liner = 2 -nl_before_block_comment = 0 -nl_before_c_comment = 0 -nl_before_cpp_comment = 0 -nl_after_multiline_comment = false -nl_after_label_colon = false -nl_after_struct = 3 -nl_after_class = 3 -nl_before_access_spec = 1 -nl_after_access_spec = 0 -nl_comment_func_def = 0 -nl_after_try_catch_finally = 0 -nl_around_cs_property = 0 -nl_between_get_set = 0 -nl_property_brace = ignore -eat_blanks_after_open_brace = false -eat_blanks_before_close_brace = false -nl_remove_extra_newlines = 0 -nl_before_return = false -nl_after_return = false -nl_after_annotation = ignore -nl_between_annotation = ignore -mod_full_brace_do = ignore -mod_full_brace_for = ignore -mod_full_brace_function = ignore -mod_full_brace_if = ignore -mod_full_brace_if_chain = false -mod_full_brace_nl = 0 -mod_full_brace_while = ignore -mod_full_brace_using = ignore -mod_paren_on_return = ignore -mod_pawn_semicolon = false -mod_full_paren_if_bool = false -mod_remove_extra_semicolon = false -mod_add_long_function_closebrace_comment = 0 +enable_processing_cmt = "" +utf8_bom = ignore +utf8_byte = false +utf8_force = false +indent_columns = 1 +indent_continue = 0 +indent_with_tabs = 0 +indent_cmt_with_tabs = false +indent_align_string = false +indent_xml_string = 0 +indent_brace = 0 +indent_braces = false +indent_braces_no_func = false +indent_braces_no_class = false +indent_braces_no_struct = false +indent_brace_parent = false +indent_paren_open_brace = false +indent_namespace = true +indent_namespace_single_indent = false +indent_namespace_level = 1 +indent_namespace_limit = 0 +indent_extern = true +indent_class = true +indent_class_colon = true +indent_class_on_colon = false +indent_constr_colon = true +indent_ctor_init_leading = 2 +indent_ctor_init = 0 +indent_else_if = false +indent_var_def_blk = 0 +indent_var_def_cont = false +indent_func_def_force_col1 = false +indent_func_call_param = false +indent_func_def_param = false +indent_func_proto_param = false +indent_func_class_param = false +indent_func_ctor_var_param = false +indent_template_param = false +indent_func_param_double = false +indent_func_const = 0 +indent_func_throw = 0 +indent_member = 0 +indent_sing_line_comments = 0 +indent_relative_single_line_comments = false +indent_switch_case = 5 +indent_case_brace = 1 +indent_col1_comment = false +indent_label = 1 +indent_access_spec = 0 +indent_access_spec_body = true +indent_paren_nl = true +indent_paren_close = 1 +indent_comma_paren = false +indent_bool_paren = false +indent_first_bool_expr = false +indent_square_nl = false +indent_preserve_sql = false +indent_align_assign = true +indent_oc_block = false +indent_oc_block_msg = 0 +indent_oc_msg_colon = 0 +indent_oc_msg_prioritize_first_colon = true +indent_oc_block_msg_xcode_style = false +indent_oc_block_msg_from_keyword = false +indent_oc_block_msg_from_colon = false +indent_oc_block_msg_from_caret = false +indent_oc_block_msg_from_brace = false +sp_arith = add +sp_assign = add +sp_cpp_lambda_assign = add +sp_cpp_lambda_paren = add +sp_assign_default = add +sp_before_assign = add +sp_after_assign = add +sp_enum_paren = ignore +sp_enum_assign = add +sp_enum_before_assign = ignore +sp_enum_after_assign = ignore +sp_pp_concat = add +sp_pp_stringify = remove +sp_before_pp_stringify = add +sp_bool = add +sp_compare = ignore +sp_inside_paren = add +sp_paren_paren = add +sp_cparen_oparen = remove +sp_balance_nested_parens = false +sp_paren_brace = add +sp_before_ptr_star = add +sp_before_unnamed_ptr_star = ignore +sp_between_ptr_star = remove +sp_after_ptr_star = remove +sp_after_ptr_star_qualifier = remove +sp_after_ptr_star_func = remove +sp_ptr_star_paren = remove +sp_before_ptr_star_func = add +sp_before_byref = add +sp_before_unnamed_byref = ignore +sp_after_byref = remove +sp_after_byref_func = remove +sp_before_byref_func = remove +sp_after_type = add +sp_before_template_paren = add +sp_template_angle = add +sp_before_angle = remove +sp_inside_angle = remove +sp_after_angle = add +sp_angle_paren = remove +sp_angle_paren_empty = remove +sp_angle_word = add +sp_angle_shift = add +sp_permit_cpp11_shift = false +sp_before_sparen = add +sp_inside_sparen = add +sp_inside_sparen_close = ignore +sp_inside_sparen_open = ignore +sp_after_sparen = add +sp_sparen_brace = add +sp_invariant_paren = ignore +sp_after_invariant_paren = ignore +sp_special_semi = add +sp_before_semi = remove +sp_before_semi_for = add +sp_before_semi_for_empty = remove +sp_after_semi = add +sp_after_semi_for = force +sp_after_semi_for_empty = remove +sp_before_square = remove +sp_before_squares = remove +sp_inside_square = add +sp_after_comma = add +sp_before_comma = remove +sp_after_mdatype_commas = ignore +sp_before_mdatype_commas = ignore +sp_between_mdatype_commas = ignore +sp_paren_comma = force +sp_before_ellipsis = add +sp_after_class_colon = add +sp_before_class_colon = add +sp_after_constr_colon = add +sp_before_constr_colon = add +sp_before_case_colon = remove +sp_after_operator = remove +sp_after_operator_sym = remove +sp_after_cast = remove +sp_inside_paren_cast = remove +sp_cpp_cast_paren = remove +sp_sizeof_paren = remove +sp_after_tag = ignore +sp_inside_braces_enum = add +sp_inside_braces_struct = add +sp_inside_braces = add +sp_inside_braces_empty = remove +sp_type_func = add +sp_func_proto_paren = remove +sp_func_def_paren = remove +sp_inside_fparens = remove +sp_inside_fparen = add +sp_inside_tparen = remove +sp_after_tparen_close = remove +sp_square_fparen = remove +sp_fparen_brace = add +sp_fparen_dbrace = ignore +sp_func_call_paren = remove +sp_func_call_paren_empty = ignore +sp_func_call_user_paren = ignore +sp_func_class_paren = remove +sp_return_paren = add +sp_attribute_paren = add +sp_defined_paren = add +sp_throw_paren = add +sp_after_throw = add +sp_catch_paren = add +sp_version_paren = ignore +sp_scope_paren = ignore +sp_macro = add +sp_macro_func = add +sp_else_brace = add +sp_brace_else = add +sp_brace_typedef = add +sp_catch_brace = add +sp_brace_catch = add +sp_finally_brace = add +sp_brace_finally = add +sp_try_brace = add +sp_getset_brace = add +sp_word_brace = add +sp_word_brace_ns = add +sp_before_dc = remove +sp_after_dc = remove +sp_d_array_colon = ignore +sp_not = remove +sp_inv = remove +sp_addr = remove +sp_member = remove +sp_deref = remove +sp_sign = remove +sp_incdec = remove +sp_before_nl_cont = add +sp_after_oc_scope = add +sp_after_oc_colon = add +sp_before_oc_colon = ignore +sp_after_oc_dict_colon = ignore +sp_before_oc_dict_colon = ignore +sp_after_send_oc_colon = ignore +sp_before_send_oc_colon = ignore +sp_after_oc_type = ignore +sp_after_oc_return_type = ignore +sp_after_oc_at_sel = ignore +sp_after_oc_at_sel_parens = ignore +sp_inside_oc_at_sel_parens = ignore +sp_before_oc_block_caret = ignore +sp_after_oc_block_caret = ignore +sp_after_oc_msg_receiver = ignore +sp_after_oc_property = ignore +sp_cond_colon = add +sp_cond_colon_before = ignore +sp_cond_colon_after = ignore +sp_cond_question = add +sp_cond_question_before = ignore +sp_cond_question_after = ignore +sp_cond_ternary_short = ignore +sp_case_label = force +sp_range = ignore +sp_after_for_colon = ignore +sp_before_for_colon = ignore +sp_extern_paren = ignore +sp_cmt_cpp_start = add +sp_cmt_cpp_doxygen = false +sp_endif_cmt = add +sp_after_new = add +sp_before_tr_emb_cmt = add +sp_num_before_tr_emb_cmt = 0 +sp_annotation_paren = ignore +align_keep_tabs = false +align_with_tabs = false +align_on_tabstop = true +align_number_right = false +align_keep_extra_space = false +align_func_params = true +align_same_func_call_params = false +align_var_def_span = 8 +align_var_def_star_style = 1 +align_var_def_amp_style = 1 +align_var_def_thresh = 0 +align_var_def_gap = 8 +align_var_def_colon = false +align_var_def_attribute = false +align_var_def_inline = true +align_assign_span = 8 +align_assign_thresh = 0 +align_enum_equ_span = 8 +align_enum_equ_thresh = 0 +align_var_struct_span = 8 +align_var_struct_thresh = 0 +align_var_struct_gap = 8 +align_struct_init_span = 8 +align_typedef_gap = 8 +align_typedef_span = 8 +align_typedef_func = 0 +align_typedef_star_style = 1 +align_typedef_amp_style = 1 +align_right_cmt_span = 16 +align_right_cmt_mix = true +align_right_cmt_gap = 0 +align_right_cmt_at_col = 64 +align_func_proto_span = 16 +align_func_proto_gap = 0 +align_on_operator = true +align_mix_var_proto = false +align_single_line_func = true +align_single_line_brace = false +align_single_line_brace_gap = 0 +align_oc_msg_spec_span = 0 +align_nl_cont = true +align_pp_define_together = false +align_pp_define_gap = 1 +align_pp_define_span = 8 +align_left_shift = true +align_oc_msg_colon_span = 0 +align_oc_msg_colon_first = false +align_oc_decl_colon = false +nl_collapse_empty_body = true +nl_assign_leave_one_liners = false +nl_class_leave_one_liners = false +nl_enum_leave_one_liners = false +nl_getset_leave_one_liners = false +nl_func_leave_one_liners = false +nl_cpp_lambda_leave_one_liners = false +nl_if_leave_one_liners = false +nl_oc_msg_leave_one_liner = false +nl_start_of_file = add +nl_start_of_file_min = 5 +nl_end_of_file = add +nl_end_of_file_min = 2 +nl_assign_brace = ignore +nl_assign_square = ignore +nl_after_square_assign = ignore +nl_func_var_def_blk = 2 +nl_typedef_blk_start = 0 +nl_typedef_blk_end = 0 +nl_typedef_blk_in = 0 +nl_var_def_blk_start = 0 +nl_var_def_blk_end = 0 +nl_var_def_blk_in = 2 +nl_fcall_brace = force +nl_enum_brace = remove +nl_struct_brace = remove +nl_union_brace = remove +nl_if_brace = remove +nl_brace_else = add +nl_elseif_brace = remove +nl_else_brace = remove +nl_else_if = remove +nl_brace_finally = force +nl_finally_brace = remove +nl_try_brace = remove +nl_getset_brace = remove +nl_for_brace = remove +nl_catch_brace = remove +nl_brace_catch = force +nl_brace_square = ignore +nl_brace_fparen = ignore +nl_while_brace = remove +nl_scope_brace = ignore +nl_unittest_brace = ignore +nl_version_brace = ignore +nl_using_brace = remove +nl_brace_brace = force +nl_do_brace = remove +nl_brace_while = remove +nl_switch_brace = remove +nl_multi_line_cond = true +nl_multi_line_define = true +nl_before_case = false +nl_before_throw = remove +nl_after_case = false +nl_case_colon_brace = force +nl_namespace_brace = remove +nl_template_class = force +nl_class_brace = remove +nl_class_init_args = ignore +nl_constr_init_args = ignore +nl_func_type_name = ignore +nl_func_type_name_class = ignore +nl_func_scope_name = ignore +nl_func_proto_type_name = ignore +nl_func_paren = remove +nl_func_def_paren = remove +nl_func_decl_start = ignore +nl_func_def_start = ignore +nl_func_decl_start_single = remove +nl_func_def_start_single = remove +nl_func_decl_args = ignore +nl_func_def_args = ignore +nl_func_decl_end = ignore +nl_func_def_end = ignore +nl_func_decl_end_single = remove +nl_func_def_end_single = remove +nl_func_decl_empty = remove +nl_func_def_empty = remove +nl_oc_msg_args = false +nl_fdef_brace = force +nl_cpp_ldef_brace = ignore +nl_return_expr = remove +nl_after_semicolon = false +nl_paren_dbrace_open = ignore +nl_after_brace_open = false +nl_after_brace_open_cmt = false +nl_after_vbrace_open = false +nl_after_vbrace_open_empty = false +nl_after_brace_close = false +nl_after_vbrace_close = false +nl_brace_struct_var = remove +nl_define_macro = true +nl_squeeze_ifdef = false +nl_before_if = ignore +nl_after_if = ignore +nl_before_for = ignore +nl_after_for = ignore +nl_before_while = ignore +nl_after_while = ignore +nl_before_switch = ignore +nl_after_switch = ignore +nl_before_do = ignore +nl_after_do = ignore +nl_ds_struct_enum_cmt = false +nl_ds_struct_enum_close_brace = false +nl_class_colon = ignore +nl_constr_colon = ignore +nl_create_if_one_liner = false +nl_create_for_one_liner = false +nl_create_while_one_liner = false +pos_arith = ignore +pos_assign = ignore +pos_bool = ignore +pos_compare = ignore +pos_conditional = ignore +pos_comma = ignore +pos_class_comma = ignore +pos_constr_comma = ignore +pos_class_colon = ignore +pos_constr_colon = ignore +code_width = 140 +ls_for_split_full = true +ls_func_split_full = true +ls_code_width = true +nl_max = 6 +nl_after_func_proto = 0 +nl_after_func_proto_group = 0 +nl_after_func_body = 3 +nl_after_func_body_class = 3 +nl_after_func_body_one_liner = 2 +nl_before_block_comment = 0 +nl_before_c_comment = 0 +nl_before_cpp_comment = 0 +nl_after_multiline_comment = false +nl_after_label_colon = false +nl_after_struct = 3 +nl_after_class = 3 +nl_before_access_spec = 1 +nl_after_access_spec = 0 +nl_comment_func_def = 0 +nl_after_try_catch_finally = 0 +nl_around_cs_property = 0 +nl_between_get_set = 0 +nl_property_brace = ignore +eat_blanks_after_open_brace = false +eat_blanks_before_close_brace = false +nl_remove_extra_newlines = 0 +nl_before_return = false +nl_after_return = false +nl_after_annotation = ignore +nl_between_annotation = ignore +mod_full_brace_do = ignore +mod_full_brace_for = ignore +mod_full_brace_function = ignore +mod_full_brace_if = ignore +mod_full_brace_if_chain = false +mod_full_brace_nl = 0 +mod_full_brace_while = ignore +mod_full_brace_using = ignore +mod_paren_on_return = ignore +mod_pawn_semicolon = false +mod_full_paren_if_bool = false +mod_remove_extra_semicolon = false +mod_add_long_function_closebrace_comment = 0 mod_add_long_namespace_closebrace_comment = 0 -mod_add_long_switch_closebrace_comment = 0 -mod_add_long_ifdef_endif_comment = 0 -mod_add_long_ifdef_else_comment = 0 -mod_sort_import = false -mod_sort_using = false -mod_sort_include = false -mod_move_case_break = false -mod_case_brace = ignore -mod_remove_empty_return = false -cmt_width = 0 -cmt_reflow_mode = 0 -cmt_convert_tab_to_spaces = true -cmt_indent_multi = true -cmt_c_group = false -cmt_c_nl_start = false -cmt_c_nl_end = false -cmt_cpp_group = false -cmt_cpp_nl_start = false -cmt_cpp_nl_end = false -cmt_cpp_to_c = false -cmt_star_cont = false -cmt_sp_before_star_cont = 0 -cmt_sp_after_star_cont = 0 -cmt_multi_check_last = true -cmt_insert_file_header = "" -cmt_insert_file_footer = "" -cmt_insert_func_header = "" -cmt_insert_class_header = "" -cmt_insert_oc_msg_header = "" -cmt_insert_before_preproc = false -pp_indent = force -pp_indent_at_level = false -pp_indent_count = 1 -pp_space = ignore -pp_space_count = 0 -pp_indent_region = 0 -pp_region_indent_code = false -pp_indent_if = 0 -pp_if_indent_code = false -pp_define_at_level = false +mod_add_long_switch_closebrace_comment = 0 +mod_add_long_ifdef_endif_comment = 0 +mod_add_long_ifdef_else_comment = 0 +mod_sort_import = false +mod_sort_using = false +mod_sort_include = false +mod_move_case_break = false +mod_case_brace = ignore +mod_remove_empty_return = false +cmt_width = 0 +cmt_reflow_mode = 0 +cmt_convert_tab_to_spaces = true +cmt_indent_multi = true +cmt_c_group = false +cmt_c_nl_start = false +cmt_c_nl_end = false +cmt_cpp_group = false +cmt_cpp_nl_start = false +cmt_cpp_nl_end = false +cmt_cpp_to_c = false +cmt_star_cont = false +cmt_sp_before_star_cont = 0 +cmt_sp_after_star_cont = 0 +cmt_multi_check_last = true +cmt_insert_file_header = "" +cmt_insert_file_footer = "" +cmt_insert_func_header = "" +cmt_insert_class_header = "" +cmt_insert_oc_msg_header = "" +cmt_insert_before_preproc = false +pp_indent = force +pp_indent_at_level = false +pp_indent_count = 1 +pp_space = ignore +pp_space_count = 0 +pp_indent_region = 0 +pp_region_indent_code = false +pp_indent_if = 0 +pp_if_indent_code = false +pp_define_at_level = false diff --git a/tests/config/doxy-comment-yes.cfg b/tests/config/doxy-comment-yes.cfg index 75bcb63137..0cbb3c2ffa 100644 --- a/tests/config/doxy-comment-yes.cfg +++ b/tests/config/doxy-comment-yes.cfg @@ -1,498 +1,498 @@ # Uncrustify 0.61 -newlines = auto -input_tab_size = 8 -output_tab_size = 8 -string_escape_char = 92 -string_escape_char2 = 0 -string_replace_tab_chars = false -tok_split_gte = false +newlines = auto +input_tab_size = 8 +output_tab_size = 8 +string_escape_char = 92 +string_escape_char2 = 0 +string_replace_tab_chars = false +tok_split_gte = false # The following new configuration option is buggy and kills proper handling of comments! #disable_processing_cmt = "" -enable_processing_cmt = "" -utf8_bom = ignore -utf8_byte = false -utf8_force = false -indent_columns = 1 -indent_continue = 0 -indent_with_tabs = 0 -indent_cmt_with_tabs = false -indent_align_string = false -indent_xml_string = 0 -indent_brace = 0 -indent_braces = false -indent_braces_no_func = false -indent_braces_no_class = false -indent_braces_no_struct = false -indent_brace_parent = false -indent_paren_open_brace = false -indent_namespace = true -indent_namespace_single_indent = false -indent_namespace_level = 1 -indent_namespace_limit = 0 -indent_extern = true -indent_class = true -indent_class_colon = true -indent_class_on_colon = false -indent_constr_colon = true -indent_ctor_init_leading = 2 -indent_ctor_init = 0 -indent_else_if = false -indent_var_def_blk = 0 -indent_var_def_cont = false -indent_func_def_force_col1 = false -indent_func_call_param = false -indent_func_def_param = false -indent_func_proto_param = false -indent_func_class_param = false -indent_func_ctor_var_param = false -indent_template_param = false -indent_func_param_double = false -indent_func_const = 0 -indent_func_throw = 0 -indent_member = 0 -indent_sing_line_comments = 0 -indent_relative_single_line_comments = false -indent_switch_case = 5 -indent_case_brace = 1 -indent_col1_comment = false -indent_label = 1 -indent_access_spec = 0 -indent_access_spec_body = true -indent_paren_nl = true -indent_paren_close = 1 -indent_comma_paren = false -indent_bool_paren = false -indent_first_bool_expr = false -indent_square_nl = false -indent_preserve_sql = false -indent_align_assign = true -indent_oc_block = false -indent_oc_block_msg = 0 -indent_oc_msg_colon = 0 -indent_oc_msg_prioritize_first_colon = true -indent_oc_block_msg_xcode_style = false -indent_oc_block_msg_from_keyword = false -indent_oc_block_msg_from_colon = false -indent_oc_block_msg_from_caret = false -indent_oc_block_msg_from_brace = false -sp_arith = add -sp_assign = add -sp_cpp_lambda_assign = add -sp_cpp_lambda_paren = add -sp_assign_default = add -sp_before_assign = add -sp_after_assign = add -sp_enum_paren = ignore -sp_enum_assign = add -sp_enum_before_assign = ignore -sp_enum_after_assign = ignore -sp_pp_concat = add -sp_pp_stringify = remove -sp_before_pp_stringify = add -sp_bool = add -sp_compare = ignore -sp_inside_paren = add -sp_paren_paren = add -sp_cparen_oparen = remove -sp_balance_nested_parens = false -sp_paren_brace = add -sp_before_ptr_star = add -sp_before_unnamed_ptr_star = ignore -sp_between_ptr_star = remove -sp_after_ptr_star = remove -sp_after_ptr_star_qualifier = remove -sp_after_ptr_star_func = remove -sp_ptr_star_paren = remove -sp_before_ptr_star_func = add -sp_before_byref = add -sp_before_unnamed_byref = ignore -sp_after_byref = remove -sp_after_byref_func = remove -sp_before_byref_func = remove -sp_after_type = add -sp_before_template_paren = add -sp_template_angle = add -sp_before_angle = remove -sp_inside_angle = remove -sp_after_angle = add -sp_angle_paren = remove -sp_angle_paren_empty = remove -sp_angle_word = add -sp_angle_shift = add -sp_permit_cpp11_shift = false -sp_before_sparen = add -sp_inside_sparen = add -sp_inside_sparen_close = ignore -sp_inside_sparen_open = ignore -sp_after_sparen = add -sp_sparen_brace = add -sp_invariant_paren = ignore -sp_after_invariant_paren = ignore -sp_special_semi = add -sp_before_semi = remove -sp_before_semi_for = add -sp_before_semi_for_empty = remove -sp_after_semi = add -sp_after_semi_for = force -sp_after_semi_for_empty = remove -sp_before_square = remove -sp_before_squares = remove -sp_inside_square = add -sp_after_comma = add -sp_before_comma = remove -sp_after_mdatype_commas = ignore -sp_before_mdatype_commas = ignore -sp_between_mdatype_commas = ignore -sp_paren_comma = force -sp_before_ellipsis = add -sp_after_class_colon = add -sp_before_class_colon = add -sp_after_constr_colon = add -sp_before_constr_colon = add -sp_before_case_colon = remove -sp_after_operator = remove -sp_after_operator_sym = remove -sp_after_cast = remove -sp_inside_paren_cast = remove -sp_cpp_cast_paren = remove -sp_sizeof_paren = remove -sp_after_tag = ignore -sp_inside_braces_enum = add -sp_inside_braces_struct = add -sp_inside_braces = add -sp_inside_braces_empty = remove -sp_type_func = add -sp_func_proto_paren = remove -sp_func_def_paren = remove -sp_inside_fparens = remove -sp_inside_fparen = add -sp_inside_tparen = remove -sp_after_tparen_close = remove -sp_square_fparen = remove -sp_fparen_brace = add -sp_fparen_dbrace = ignore -sp_func_call_paren = remove -sp_func_call_paren_empty = ignore -sp_func_call_user_paren = ignore -sp_func_class_paren = remove -sp_return_paren = add -sp_attribute_paren = add -sp_defined_paren = add -sp_throw_paren = add -sp_after_throw = add -sp_catch_paren = add -sp_version_paren = ignore -sp_scope_paren = ignore -sp_macro = add -sp_macro_func = add -sp_else_brace = add -sp_brace_else = add -sp_brace_typedef = add -sp_catch_brace = add -sp_brace_catch = add -sp_finally_brace = add -sp_brace_finally = add -sp_try_brace = add -sp_getset_brace = add -sp_word_brace = add -sp_word_brace_ns = add -sp_before_dc = remove -sp_after_dc = remove -sp_d_array_colon = ignore -sp_not = remove -sp_inv = remove -sp_addr = remove -sp_member = remove -sp_deref = remove -sp_sign = remove -sp_incdec = remove -sp_before_nl_cont = add -sp_after_oc_scope = add -sp_after_oc_colon = add -sp_before_oc_colon = ignore -sp_after_oc_dict_colon = ignore -sp_before_oc_dict_colon = ignore -sp_after_send_oc_colon = ignore -sp_before_send_oc_colon = ignore -sp_after_oc_type = ignore -sp_after_oc_return_type = ignore -sp_after_oc_at_sel = ignore -sp_after_oc_at_sel_parens = ignore -sp_inside_oc_at_sel_parens = ignore -sp_before_oc_block_caret = ignore -sp_after_oc_block_caret = ignore -sp_after_oc_msg_receiver = ignore -sp_after_oc_property = ignore -sp_cond_colon = add -sp_cond_colon_before = ignore -sp_cond_colon_after = ignore -sp_cond_question = add -sp_cond_question_before = ignore -sp_cond_question_after = ignore -sp_cond_ternary_short = ignore -sp_case_label = force -sp_range = ignore -sp_after_for_colon = ignore -sp_before_for_colon = ignore -sp_extern_paren = ignore -sp_cmt_cpp_start = add -sp_cmt_cpp_doxygen = true -sp_endif_cmt = add -sp_after_new = add -sp_before_tr_emb_cmt = add -sp_num_before_tr_emb_cmt = 0 -sp_annotation_paren = ignore -align_keep_tabs = false -align_with_tabs = false -align_on_tabstop = true -align_number_right = false -align_keep_extra_space = false -align_func_params = true -align_same_func_call_params = false -align_var_def_span = 8 -align_var_def_star_style = 1 -align_var_def_amp_style = 1 -align_var_def_thresh = 0 -align_var_def_gap = 8 -align_var_def_colon = false -align_var_def_attribute = false -align_var_def_inline = true -align_assign_span = 8 -align_assign_thresh = 0 -align_enum_equ_span = 8 -align_enum_equ_thresh = 0 -align_var_struct_span = 8 -align_var_struct_thresh = 0 -align_var_struct_gap = 8 -align_struct_init_span = 8 -align_typedef_gap = 8 -align_typedef_span = 8 -align_typedef_func = 0 -align_typedef_star_style = 1 -align_typedef_amp_style = 1 -align_right_cmt_span = 16 -align_right_cmt_mix = true -align_right_cmt_gap = 0 -align_right_cmt_at_col = 64 -align_func_proto_span = 16 -align_func_proto_gap = 0 -align_on_operator = true -align_mix_var_proto = false -align_single_line_func = true -align_single_line_brace = false -align_single_line_brace_gap = 0 -align_oc_msg_spec_span = 0 -align_nl_cont = true -align_pp_define_together = false -align_pp_define_gap = 1 -align_pp_define_span = 8 -align_left_shift = true -align_oc_msg_colon_span = 0 -align_oc_msg_colon_first = false -align_oc_decl_colon = false -nl_collapse_empty_body = true -nl_assign_leave_one_liners = false -nl_class_leave_one_liners = false -nl_enum_leave_one_liners = false -nl_getset_leave_one_liners = false -nl_func_leave_one_liners = false -nl_cpp_lambda_leave_one_liners = false -nl_if_leave_one_liners = false -nl_oc_msg_leave_one_liner = false -nl_start_of_file = add -nl_start_of_file_min = 5 -nl_end_of_file = add -nl_end_of_file_min = 2 -nl_assign_brace = ignore -nl_assign_square = ignore -nl_after_square_assign = ignore -nl_func_var_def_blk = 2 -nl_typedef_blk_start = 0 -nl_typedef_blk_end = 0 -nl_typedef_blk_in = 0 -nl_var_def_blk_start = 0 -nl_var_def_blk_end = 0 -nl_var_def_blk_in = 2 -nl_fcall_brace = force -nl_enum_brace = remove -nl_struct_brace = remove -nl_union_brace = remove -nl_if_brace = remove -nl_brace_else = add -nl_elseif_brace = remove -nl_else_brace = remove -nl_else_if = remove -nl_brace_finally = force -nl_finally_brace = remove -nl_try_brace = remove -nl_getset_brace = remove -nl_for_brace = remove -nl_catch_brace = remove -nl_brace_catch = force -nl_brace_square = ignore -nl_brace_fparen = ignore -nl_while_brace = remove -nl_scope_brace = ignore -nl_unittest_brace = ignore -nl_version_brace = ignore -nl_using_brace = remove -nl_brace_brace = force -nl_do_brace = remove -nl_brace_while = remove -nl_switch_brace = remove -nl_multi_line_cond = true -nl_multi_line_define = true -nl_before_case = false -nl_before_throw = remove -nl_after_case = false -nl_case_colon_brace = force -nl_namespace_brace = remove -nl_template_class = force -nl_class_brace = remove -nl_class_init_args = ignore -nl_constr_init_args = ignore -nl_func_type_name = ignore -nl_func_type_name_class = ignore -nl_func_scope_name = ignore -nl_func_proto_type_name = ignore -nl_func_paren = remove -nl_func_def_paren = remove -nl_func_decl_start = ignore -nl_func_def_start = ignore -nl_func_decl_start_single = remove -nl_func_def_start_single = remove -nl_func_decl_args = ignore -nl_func_def_args = ignore -nl_func_decl_end = ignore -nl_func_def_end = ignore -nl_func_decl_end_single = remove -nl_func_def_end_single = remove -nl_func_decl_empty = remove -nl_func_def_empty = remove -nl_oc_msg_args = false -nl_fdef_brace = force -nl_cpp_ldef_brace = ignore -nl_return_expr = remove -nl_after_semicolon = false -nl_paren_dbrace_open = ignore -nl_after_brace_open = false -nl_after_brace_open_cmt = false -nl_after_vbrace_open = false -nl_after_vbrace_open_empty = false -nl_after_brace_close = false -nl_after_vbrace_close = false -nl_brace_struct_var = remove -nl_define_macro = true -nl_squeeze_ifdef = false -nl_before_if = ignore -nl_after_if = ignore -nl_before_for = ignore -nl_after_for = ignore -nl_before_while = ignore -nl_after_while = ignore -nl_before_switch = ignore -nl_after_switch = ignore -nl_before_do = ignore -nl_after_do = ignore -nl_ds_struct_enum_cmt = false -nl_ds_struct_enum_close_brace = false -nl_class_colon = ignore -nl_constr_colon = ignore -nl_create_if_one_liner = false -nl_create_for_one_liner = false -nl_create_while_one_liner = false -pos_arith = ignore -pos_assign = ignore -pos_bool = ignore -pos_compare = ignore -pos_conditional = ignore -pos_comma = ignore -pos_class_comma = ignore -pos_constr_comma = ignore -pos_class_colon = ignore -pos_constr_colon = ignore -code_width = 140 -ls_for_split_full = true -ls_func_split_full = true -ls_code_width = true -nl_max = 6 -nl_after_func_proto = 0 -nl_after_func_proto_group = 0 -nl_after_func_body = 3 -nl_after_func_body_class = 3 -nl_after_func_body_one_liner = 2 -nl_before_block_comment = 0 -nl_before_c_comment = 0 -nl_before_cpp_comment = 0 -nl_after_multiline_comment = false -nl_after_label_colon = false -nl_after_struct = 3 -nl_after_class = 3 -nl_before_access_spec = 1 -nl_after_access_spec = 0 -nl_comment_func_def = 0 -nl_after_try_catch_finally = 0 -nl_around_cs_property = 0 -nl_between_get_set = 0 -nl_property_brace = ignore -eat_blanks_after_open_brace = false -eat_blanks_before_close_brace = false -nl_remove_extra_newlines = 0 -nl_before_return = false -nl_after_return = false -nl_after_annotation = ignore -nl_between_annotation = ignore -mod_full_brace_do = ignore -mod_full_brace_for = ignore -mod_full_brace_function = ignore -mod_full_brace_if = ignore -mod_full_brace_if_chain = false -mod_full_brace_nl = 0 -mod_full_brace_while = ignore -mod_full_brace_using = ignore -mod_paren_on_return = ignore -mod_pawn_semicolon = false -mod_full_paren_if_bool = false -mod_remove_extra_semicolon = false -mod_add_long_function_closebrace_comment = 0 +enable_processing_cmt = "" +utf8_bom = ignore +utf8_byte = false +utf8_force = false +indent_columns = 1 +indent_continue = 0 +indent_with_tabs = 0 +indent_cmt_with_tabs = false +indent_align_string = false +indent_xml_string = 0 +indent_brace = 0 +indent_braces = false +indent_braces_no_func = false +indent_braces_no_class = false +indent_braces_no_struct = false +indent_brace_parent = false +indent_paren_open_brace = false +indent_namespace = true +indent_namespace_single_indent = false +indent_namespace_level = 1 +indent_namespace_limit = 0 +indent_extern = true +indent_class = true +indent_class_colon = true +indent_class_on_colon = false +indent_constr_colon = true +indent_ctor_init_leading = 2 +indent_ctor_init = 0 +indent_else_if = false +indent_var_def_blk = 0 +indent_var_def_cont = false +indent_func_def_force_col1 = false +indent_func_call_param = false +indent_func_def_param = false +indent_func_proto_param = false +indent_func_class_param = false +indent_func_ctor_var_param = false +indent_template_param = false +indent_func_param_double = false +indent_func_const = 0 +indent_func_throw = 0 +indent_member = 0 +indent_sing_line_comments = 0 +indent_relative_single_line_comments = false +indent_switch_case = 5 +indent_case_brace = 1 +indent_col1_comment = false +indent_label = 1 +indent_access_spec = 0 +indent_access_spec_body = true +indent_paren_nl = true +indent_paren_close = 1 +indent_comma_paren = false +indent_bool_paren = false +indent_first_bool_expr = false +indent_square_nl = false +indent_preserve_sql = false +indent_align_assign = true +indent_oc_block = false +indent_oc_block_msg = 0 +indent_oc_msg_colon = 0 +indent_oc_msg_prioritize_first_colon = true +indent_oc_block_msg_xcode_style = false +indent_oc_block_msg_from_keyword = false +indent_oc_block_msg_from_colon = false +indent_oc_block_msg_from_caret = false +indent_oc_block_msg_from_brace = false +sp_arith = add +sp_assign = add +sp_cpp_lambda_assign = add +sp_cpp_lambda_paren = add +sp_assign_default = add +sp_before_assign = add +sp_after_assign = add +sp_enum_paren = ignore +sp_enum_assign = add +sp_enum_before_assign = ignore +sp_enum_after_assign = ignore +sp_pp_concat = add +sp_pp_stringify = remove +sp_before_pp_stringify = add +sp_bool = add +sp_compare = ignore +sp_inside_paren = add +sp_paren_paren = add +sp_cparen_oparen = remove +sp_balance_nested_parens = false +sp_paren_brace = add +sp_before_ptr_star = add +sp_before_unnamed_ptr_star = ignore +sp_between_ptr_star = remove +sp_after_ptr_star = remove +sp_after_ptr_star_qualifier = remove +sp_after_ptr_star_func = remove +sp_ptr_star_paren = remove +sp_before_ptr_star_func = add +sp_before_byref = add +sp_before_unnamed_byref = ignore +sp_after_byref = remove +sp_after_byref_func = remove +sp_before_byref_func = remove +sp_after_type = add +sp_before_template_paren = add +sp_template_angle = add +sp_before_angle = remove +sp_inside_angle = remove +sp_after_angle = add +sp_angle_paren = remove +sp_angle_paren_empty = remove +sp_angle_word = add +sp_angle_shift = add +sp_permit_cpp11_shift = false +sp_before_sparen = add +sp_inside_sparen = add +sp_inside_sparen_close = ignore +sp_inside_sparen_open = ignore +sp_after_sparen = add +sp_sparen_brace = add +sp_invariant_paren = ignore +sp_after_invariant_paren = ignore +sp_special_semi = add +sp_before_semi = remove +sp_before_semi_for = add +sp_before_semi_for_empty = remove +sp_after_semi = add +sp_after_semi_for = force +sp_after_semi_for_empty = remove +sp_before_square = remove +sp_before_squares = remove +sp_inside_square = add +sp_after_comma = add +sp_before_comma = remove +sp_after_mdatype_commas = ignore +sp_before_mdatype_commas = ignore +sp_between_mdatype_commas = ignore +sp_paren_comma = force +sp_before_ellipsis = add +sp_after_class_colon = add +sp_before_class_colon = add +sp_after_constr_colon = add +sp_before_constr_colon = add +sp_before_case_colon = remove +sp_after_operator = remove +sp_after_operator_sym = remove +sp_after_cast = remove +sp_inside_paren_cast = remove +sp_cpp_cast_paren = remove +sp_sizeof_paren = remove +sp_after_tag = ignore +sp_inside_braces_enum = add +sp_inside_braces_struct = add +sp_inside_braces = add +sp_inside_braces_empty = remove +sp_type_func = add +sp_func_proto_paren = remove +sp_func_def_paren = remove +sp_inside_fparens = remove +sp_inside_fparen = add +sp_inside_tparen = remove +sp_after_tparen_close = remove +sp_square_fparen = remove +sp_fparen_brace = add +sp_fparen_dbrace = ignore +sp_func_call_paren = remove +sp_func_call_paren_empty = ignore +sp_func_call_user_paren = ignore +sp_func_class_paren = remove +sp_return_paren = add +sp_attribute_paren = add +sp_defined_paren = add +sp_throw_paren = add +sp_after_throw = add +sp_catch_paren = add +sp_version_paren = ignore +sp_scope_paren = ignore +sp_macro = add +sp_macro_func = add +sp_else_brace = add +sp_brace_else = add +sp_brace_typedef = add +sp_catch_brace = add +sp_brace_catch = add +sp_finally_brace = add +sp_brace_finally = add +sp_try_brace = add +sp_getset_brace = add +sp_word_brace = add +sp_word_brace_ns = add +sp_before_dc = remove +sp_after_dc = remove +sp_d_array_colon = ignore +sp_not = remove +sp_inv = remove +sp_addr = remove +sp_member = remove +sp_deref = remove +sp_sign = remove +sp_incdec = remove +sp_before_nl_cont = add +sp_after_oc_scope = add +sp_after_oc_colon = add +sp_before_oc_colon = ignore +sp_after_oc_dict_colon = ignore +sp_before_oc_dict_colon = ignore +sp_after_send_oc_colon = ignore +sp_before_send_oc_colon = ignore +sp_after_oc_type = ignore +sp_after_oc_return_type = ignore +sp_after_oc_at_sel = ignore +sp_after_oc_at_sel_parens = ignore +sp_inside_oc_at_sel_parens = ignore +sp_before_oc_block_caret = ignore +sp_after_oc_block_caret = ignore +sp_after_oc_msg_receiver = ignore +sp_after_oc_property = ignore +sp_cond_colon = add +sp_cond_colon_before = ignore +sp_cond_colon_after = ignore +sp_cond_question = add +sp_cond_question_before = ignore +sp_cond_question_after = ignore +sp_cond_ternary_short = ignore +sp_case_label = force +sp_range = ignore +sp_after_for_colon = ignore +sp_before_for_colon = ignore +sp_extern_paren = ignore +sp_cmt_cpp_start = add +sp_cmt_cpp_doxygen = true +sp_endif_cmt = add +sp_after_new = add +sp_before_tr_emb_cmt = add +sp_num_before_tr_emb_cmt = 0 +sp_annotation_paren = ignore +align_keep_tabs = false +align_with_tabs = false +align_on_tabstop = true +align_number_right = false +align_keep_extra_space = false +align_func_params = true +align_same_func_call_params = false +align_var_def_span = 8 +align_var_def_star_style = 1 +align_var_def_amp_style = 1 +align_var_def_thresh = 0 +align_var_def_gap = 8 +align_var_def_colon = false +align_var_def_attribute = false +align_var_def_inline = true +align_assign_span = 8 +align_assign_thresh = 0 +align_enum_equ_span = 8 +align_enum_equ_thresh = 0 +align_var_struct_span = 8 +align_var_struct_thresh = 0 +align_var_struct_gap = 8 +align_struct_init_span = 8 +align_typedef_gap = 8 +align_typedef_span = 8 +align_typedef_func = 0 +align_typedef_star_style = 1 +align_typedef_amp_style = 1 +align_right_cmt_span = 16 +align_right_cmt_mix = true +align_right_cmt_gap = 0 +align_right_cmt_at_col = 64 +align_func_proto_span = 16 +align_func_proto_gap = 0 +align_on_operator = true +align_mix_var_proto = false +align_single_line_func = true +align_single_line_brace = false +align_single_line_brace_gap = 0 +align_oc_msg_spec_span = 0 +align_nl_cont = true +align_pp_define_together = false +align_pp_define_gap = 1 +align_pp_define_span = 8 +align_left_shift = true +align_oc_msg_colon_span = 0 +align_oc_msg_colon_first = false +align_oc_decl_colon = false +nl_collapse_empty_body = true +nl_assign_leave_one_liners = false +nl_class_leave_one_liners = false +nl_enum_leave_one_liners = false +nl_getset_leave_one_liners = false +nl_func_leave_one_liners = false +nl_cpp_lambda_leave_one_liners = false +nl_if_leave_one_liners = false +nl_oc_msg_leave_one_liner = false +nl_start_of_file = add +nl_start_of_file_min = 5 +nl_end_of_file = add +nl_end_of_file_min = 2 +nl_assign_brace = ignore +nl_assign_square = ignore +nl_after_square_assign = ignore +nl_func_var_def_blk = 2 +nl_typedef_blk_start = 0 +nl_typedef_blk_end = 0 +nl_typedef_blk_in = 0 +nl_var_def_blk_start = 0 +nl_var_def_blk_end = 0 +nl_var_def_blk_in = 2 +nl_fcall_brace = force +nl_enum_brace = remove +nl_struct_brace = remove +nl_union_brace = remove +nl_if_brace = remove +nl_brace_else = add +nl_elseif_brace = remove +nl_else_brace = remove +nl_else_if = remove +nl_brace_finally = force +nl_finally_brace = remove +nl_try_brace = remove +nl_getset_brace = remove +nl_for_brace = remove +nl_catch_brace = remove +nl_brace_catch = force +nl_brace_square = ignore +nl_brace_fparen = ignore +nl_while_brace = remove +nl_scope_brace = ignore +nl_unittest_brace = ignore +nl_version_brace = ignore +nl_using_brace = remove +nl_brace_brace = force +nl_do_brace = remove +nl_brace_while = remove +nl_switch_brace = remove +nl_multi_line_cond = true +nl_multi_line_define = true +nl_before_case = false +nl_before_throw = remove +nl_after_case = false +nl_case_colon_brace = force +nl_namespace_brace = remove +nl_template_class = force +nl_class_brace = remove +nl_class_init_args = ignore +nl_constr_init_args = ignore +nl_func_type_name = ignore +nl_func_type_name_class = ignore +nl_func_scope_name = ignore +nl_func_proto_type_name = ignore +nl_func_paren = remove +nl_func_def_paren = remove +nl_func_decl_start = ignore +nl_func_def_start = ignore +nl_func_decl_start_single = remove +nl_func_def_start_single = remove +nl_func_decl_args = ignore +nl_func_def_args = ignore +nl_func_decl_end = ignore +nl_func_def_end = ignore +nl_func_decl_end_single = remove +nl_func_def_end_single = remove +nl_func_decl_empty = remove +nl_func_def_empty = remove +nl_oc_msg_args = false +nl_fdef_brace = force +nl_cpp_ldef_brace = ignore +nl_return_expr = remove +nl_after_semicolon = false +nl_paren_dbrace_open = ignore +nl_after_brace_open = false +nl_after_brace_open_cmt = false +nl_after_vbrace_open = false +nl_after_vbrace_open_empty = false +nl_after_brace_close = false +nl_after_vbrace_close = false +nl_brace_struct_var = remove +nl_define_macro = true +nl_squeeze_ifdef = false +nl_before_if = ignore +nl_after_if = ignore +nl_before_for = ignore +nl_after_for = ignore +nl_before_while = ignore +nl_after_while = ignore +nl_before_switch = ignore +nl_after_switch = ignore +nl_before_do = ignore +nl_after_do = ignore +nl_ds_struct_enum_cmt = false +nl_ds_struct_enum_close_brace = false +nl_class_colon = ignore +nl_constr_colon = ignore +nl_create_if_one_liner = false +nl_create_for_one_liner = false +nl_create_while_one_liner = false +pos_arith = ignore +pos_assign = ignore +pos_bool = ignore +pos_compare = ignore +pos_conditional = ignore +pos_comma = ignore +pos_class_comma = ignore +pos_constr_comma = ignore +pos_class_colon = ignore +pos_constr_colon = ignore +code_width = 140 +ls_for_split_full = true +ls_func_split_full = true +ls_code_width = true +nl_max = 6 +nl_after_func_proto = 0 +nl_after_func_proto_group = 0 +nl_after_func_body = 3 +nl_after_func_body_class = 3 +nl_after_func_body_one_liner = 2 +nl_before_block_comment = 0 +nl_before_c_comment = 0 +nl_before_cpp_comment = 0 +nl_after_multiline_comment = false +nl_after_label_colon = false +nl_after_struct = 3 +nl_after_class = 3 +nl_before_access_spec = 1 +nl_after_access_spec = 0 +nl_comment_func_def = 0 +nl_after_try_catch_finally = 0 +nl_around_cs_property = 0 +nl_between_get_set = 0 +nl_property_brace = ignore +eat_blanks_after_open_brace = false +eat_blanks_before_close_brace = false +nl_remove_extra_newlines = 0 +nl_before_return = false +nl_after_return = false +nl_after_annotation = ignore +nl_between_annotation = ignore +mod_full_brace_do = ignore +mod_full_brace_for = ignore +mod_full_brace_function = ignore +mod_full_brace_if = ignore +mod_full_brace_if_chain = false +mod_full_brace_nl = 0 +mod_full_brace_while = ignore +mod_full_brace_using = ignore +mod_paren_on_return = ignore +mod_pawn_semicolon = false +mod_full_paren_if_bool = false +mod_remove_extra_semicolon = false +mod_add_long_function_closebrace_comment = 0 mod_add_long_namespace_closebrace_comment = 0 -mod_add_long_switch_closebrace_comment = 0 -mod_add_long_ifdef_endif_comment = 0 -mod_add_long_ifdef_else_comment = 0 -mod_sort_import = false -mod_sort_using = false -mod_sort_include = false -mod_move_case_break = false -mod_case_brace = ignore -mod_remove_empty_return = false -cmt_width = 0 -cmt_reflow_mode = 0 -cmt_convert_tab_to_spaces = true -cmt_indent_multi = true -cmt_c_group = false -cmt_c_nl_start = false -cmt_c_nl_end = false -cmt_cpp_group = false -cmt_cpp_nl_start = false -cmt_cpp_nl_end = false -cmt_cpp_to_c = false -cmt_star_cont = false -cmt_sp_before_star_cont = 0 -cmt_sp_after_star_cont = 0 -cmt_multi_check_last = true -cmt_insert_file_header = "" -cmt_insert_file_footer = "" -cmt_insert_func_header = "" -cmt_insert_class_header = "" -cmt_insert_oc_msg_header = "" -cmt_insert_before_preproc = false -pp_indent = force -pp_indent_at_level = false -pp_indent_count = 1 -pp_space = ignore -pp_space_count = 0 -pp_indent_region = 0 -pp_region_indent_code = false -pp_indent_if = 0 -pp_if_indent_code = false -pp_define_at_level = false +mod_add_long_switch_closebrace_comment = 0 +mod_add_long_ifdef_endif_comment = 0 +mod_add_long_ifdef_else_comment = 0 +mod_sort_import = false +mod_sort_using = false +mod_sort_include = false +mod_move_case_break = false +mod_case_brace = ignore +mod_remove_empty_return = false +cmt_width = 0 +cmt_reflow_mode = 0 +cmt_convert_tab_to_spaces = true +cmt_indent_multi = true +cmt_c_group = false +cmt_c_nl_start = false +cmt_c_nl_end = false +cmt_cpp_group = false +cmt_cpp_nl_start = false +cmt_cpp_nl_end = false +cmt_cpp_to_c = false +cmt_star_cont = false +cmt_sp_before_star_cont = 0 +cmt_sp_after_star_cont = 0 +cmt_multi_check_last = true +cmt_insert_file_header = "" +cmt_insert_file_footer = "" +cmt_insert_func_header = "" +cmt_insert_class_header = "" +cmt_insert_oc_msg_header = "" +cmt_insert_before_preproc = false +pp_indent = force +pp_indent_at_level = false +pp_indent_count = 1 +pp_space = ignore +pp_space_count = 0 +pp_indent_region = 0 +pp_region_indent_code = false +pp_indent_if = 0 +pp_if_indent_code = false +pp_define_at_level = false diff --git a/tests/config/else-if-1.cfg b/tests/config/else-if-1.cfg index 222740afcf..38232a2fc9 100644 --- a/tests/config/else-if-1.cfg +++ b/tests/config/else-if-1.cfg @@ -1,5 +1,5 @@ -indent_with_tabs = 2 -indent_columns = 2 -nl_else_if = remove -indent_else_if = false +indent_with_tabs = 2 +indent_columns = 2 +nl_else_if = remove +indent_else_if = false diff --git a/tests/config/else-if-2.cfg b/tests/config/else-if-2.cfg index 4db08c13ce..c6714de7f7 100644 --- a/tests/config/else-if-2.cfg +++ b/tests/config/else-if-2.cfg @@ -1,5 +1,5 @@ -indent_with_tabs = 2 -indent_columns = 2 -nl_else_if = remove -indent_else_if = true +indent_with_tabs = 2 +indent_columns = 2 +nl_else_if = remove +indent_else_if = true diff --git a/tests/config/empty.cfg b/tests/config/empty.cfg index 1823e0cb94..c21f178fd3 100644 --- a/tests/config/empty.cfg +++ b/tests/config/empty.cfg @@ -2,4 +2,4 @@ # https://github.com/uncrustify/uncrustify/issues/1121 -# do not split '->' punctuator into '- >' in JAVA \ No newline at end of file +# do not split '->' punctuator into '- >' in JAVA diff --git a/tests/config/empty_body.cfg b/tests/config/empty_body.cfg index 13b446f393..a5485939f1 100644 --- a/tests/config/empty_body.cfg +++ b/tests/config/empty_body.cfg @@ -1,13 +1,13 @@ # -indent_with_tabs = 0 -input_tab_size = 8 -indent_columns = 4 +indent_with_tabs = 0 +input_tab_size = 8 +indent_columns = 4 -sp_arith = force -sp_after_ptr_star = force -sp_before_ptr_star = remove -sp_between_ptr_star = remove +sp_arith = force +sp_after_ptr_star = force +sp_before_ptr_star = remove +sp_between_ptr_star = remove -nl_collapse_empty_body = True +nl_collapse_empty_body = True diff --git a/tests/config/enable_processing_cmt-empty.cfg b/tests/config/enable_processing_cmt-empty.cfg index 8a06131b9e..80d5481ed1 100644 --- a/tests/config/enable_processing_cmt-empty.cfg +++ b/tests/config/enable_processing_cmt-empty.cfg @@ -1 +1 @@ -enable_processing_cmt = "" \ No newline at end of file +enable_processing_cmt = "" diff --git a/tests/config/endif.cfg b/tests/config/endif.cfg index 30bbc84443..74803cdea2 100644 --- a/tests/config/endif.cfg +++ b/tests/config/endif.cfg @@ -1,88 +1,88 @@ -indent_func_def_param=true -indent_paren_nl=true -nl_after_brace_open=true -nl_after_return=true -nl_after_semicolon=true -nl_after_vbrace_open=true -nl_assign_leave_one_liners=true -nl_before_case=true -nl_collapse_empty_body=true -pp_define_at_level=true -pp_if_indent_code=true -pp_indent_at_level=true -pp_region_indent_code=true -indent_columns=3 -indent_with_tabs=0 -nl_end_of_file_min=1 -nl_func_var_def_blk=1 -pp_indent_region=3 -pp_space_count=3 -mod_full_brace_while=add -mod_paren_on_return=force -nl_after_do=force -nl_after_for=force -nl_after_if=force -nl_after_switch=force -nl_after_while=force -nl_before_do=force -nl_before_for=force -nl_before_if=force -nl_before_switch=force -nl_before_while=force -nl_brace_else=force -nl_brace_while=force -nl_class_brace=force -nl_else_brace=force -nl_elseif_brace=force -nl_end_of_file=force -nl_fcall_brace=force -nl_fdef_brace=force -nl_for_brace=force -nl_func_decl_args=force -nl_func_decl_end=add -nl_func_decl_start=force -nl_func_paren=force -nl_func_proto_type_name=remove -nl_func_type_name=remove -nl_if_brace=force -nl_while_brace=add -pos_class_comma=trail -pos_comma=trail -pp_indent=force -sp_after_cast=remove -sp_after_comma=force -sp_after_oc_type=remove -sp_after_ptr_star=add -sp_after_sparen=force -sp_arith=force -sp_assign=force -sp_before_comma=remove -sp_before_ptr_star=remove -sp_before_semi=remove -sp_before_semi_for=remove -sp_before_semi_for_empty=remove -sp_before_sparen=remove -sp_before_square=remove -sp_before_squares=remove -sp_bool=force -sp_brace_else=force -sp_compare=force -sp_deref=remove -sp_fparen_brace=force -sp_func_call_paren=remove -sp_func_def_paren=remove -sp_func_proto_paren=remove -sp_incdec=remove -sp_inside_braces=force -sp_inside_fparen=remove -sp_inside_fparens=remove -sp_inside_paren=remove -sp_inside_paren_cast=remove -sp_inside_sparen=remove -sp_macro=force -sp_macro_func=force -sp_member=remove -sp_not=remove -sp_paren_paren=remove -sp_return_paren=force -sp_type_func=force +indent_func_def_param = true +indent_paren_nl = true +nl_after_brace_open = true +nl_after_return = true +nl_after_semicolon = true +nl_after_vbrace_open = true +nl_assign_leave_one_liners = true +nl_before_case = true +nl_collapse_empty_body = true +pp_define_at_level = true +pp_if_indent_code = true +pp_indent_at_level = true +pp_region_indent_code = true +indent_columns = 3 +indent_with_tabs = 0 +nl_end_of_file_min = 1 +nl_func_var_def_blk = 1 +pp_indent_region = 3 +pp_space_count = 3 +mod_full_brace_while = add +mod_paren_on_return = force +nl_after_do = force +nl_after_for = force +nl_after_if = force +nl_after_switch = force +nl_after_while = force +nl_before_do = force +nl_before_for = force +nl_before_if = force +nl_before_switch = force +nl_before_while = force +nl_brace_else = force +nl_brace_while = force +nl_class_brace = force +nl_else_brace = force +nl_elseif_brace = force +nl_end_of_file = force +nl_fcall_brace = force +nl_fdef_brace = force +nl_for_brace = force +nl_func_decl_args = force +nl_func_decl_end = add +nl_func_decl_start = force +nl_func_paren = force +nl_func_proto_type_name = remove +nl_func_type_name = remove +nl_if_brace = force +nl_while_brace = add +pos_class_comma = trail +pos_comma = trail +pp_indent = force +sp_after_cast = remove +sp_after_comma = force +sp_after_oc_type = remove +sp_after_ptr_star = add +sp_after_sparen = force +sp_arith = force +sp_assign = force +sp_before_comma = remove +sp_before_ptr_star = remove +sp_before_semi = remove +sp_before_semi_for = remove +sp_before_semi_for_empty = remove +sp_before_sparen = remove +sp_before_square = remove +sp_before_squares = remove +sp_bool = force +sp_brace_else = force +sp_compare = force +sp_deref = remove +sp_fparen_brace = force +sp_func_call_paren = remove +sp_func_def_paren = remove +sp_func_proto_paren = remove +sp_incdec = remove +sp_inside_braces = force +sp_inside_fparen = remove +sp_inside_fparens = remove +sp_inside_paren = remove +sp_inside_paren_cast = remove +sp_inside_sparen = remove +sp_macro = force +sp_macro_func = force +sp_member = remove +sp_not = remove +sp_paren_paren = remove +sp_return_paren = force +sp_type_func = force diff --git a/tests/config/enum.cfg b/tests/config/enum.cfg index eb9004248d..758a27b45c 100644 --- a/tests/config/enum.cfg +++ b/tests/config/enum.cfg @@ -1,14 +1,14 @@ -indent_columns = 3 +indent_columns = 3 -align_enum_equ_span = 4 -align_enum_equ_thresh = 8 -align_right_cmt_span = 3 -nl_enum_brace = force -nl_enum_class = remove -nl_enum_class_identifier = remove -nl_enum_identifier_colon = remove -nl_enum_colon_type = remove -nl_max = 3 -pos_enum_comma = trail_force -sp_enum_assign = force -sp_enum_colon = force +align_enum_equ_span = 4 +align_enum_equ_thresh = 8 +align_right_cmt_span = 3 +nl_enum_brace = force +nl_enum_class = remove +nl_enum_class_identifier = remove +nl_enum_identifier_colon = remove +nl_enum_colon_type = remove +nl_max = 3 +pos_enum_comma = trail_force +sp_enum_assign = force +sp_enum_colon = force diff --git a/tests/config/enum_comma-1.cfg b/tests/config/enum_comma-1.cfg index abb6dde804..33bbdb9d37 100644 --- a/tests/config/enum_comma-1.cfg +++ b/tests/config/enum_comma-1.cfg @@ -1,2 +1,2 @@ -pos_comma = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force -pos_enum_comma = trail_force # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_comma = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_enum_comma = trail_force # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force diff --git a/tests/config/enum_comma-2.cfg b/tests/config/enum_comma-2.cfg index dbabc089d3..4f6d7d0722 100644 --- a/tests/config/enum_comma-2.cfg +++ b/tests/config/enum_comma-2.cfg @@ -1,2 +1,2 @@ -pos_comma = lead_force # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force -pos_enum_comma = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_comma = lead_force # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_enum_comma = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force diff --git a/tests/config/enum_comma-3.cfg b/tests/config/enum_comma-3.cfg index 1ae1bee0fd..5eec9719c6 100644 --- a/tests/config/enum_comma-3.cfg +++ b/tests/config/enum_comma-3.cfg @@ -1,2 +1,2 @@ -pos_comma = lead_break # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force -pos_enum_comma = trail_break # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_comma = lead_break # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_enum_comma = trail_break # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force diff --git a/tests/config/enum_comma-4.cfg b/tests/config/enum_comma-4.cfg index 13515ecb7f..5cbe21e0d2 100644 --- a/tests/config/enum_comma-4.cfg +++ b/tests/config/enum_comma-4.cfg @@ -1,2 +1,2 @@ -pos_comma = trail_force # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force -pos_enum_comma = lead # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_comma = trail_force # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_enum_comma = lead # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force diff --git a/tests/config/enum_comma-5.cfg b/tests/config/enum_comma-5.cfg index 352430e41d..5e2e4a768a 100644 --- a/tests/config/enum_comma-5.cfg +++ b/tests/config/enum_comma-5.cfg @@ -1,2 +1,2 @@ -pos_comma = trail_break # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force -pos_enum_comma = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_comma = trail_break # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_enum_comma = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force diff --git a/tests/config/enum_comma-6.cfg b/tests/config/enum_comma-6.cfg index 7f0d40c56f..c38beca22f 100644 --- a/tests/config/enum_comma-6.cfg +++ b/tests/config/enum_comma-6.cfg @@ -1,3 +1,3 @@ -pos_comma = trail_break # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force -pos_enum_comma = lead_break # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force -sp_after_comma = Force +pos_comma = trail_break # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_enum_comma = lead_break # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +sp_after_comma = Force diff --git a/tests/config/first_len_minimum.cfg b/tests/config/first_len_minimum.cfg index 7f65fc0cf6..2acc2e2050 100644 --- a/tests/config/first_len_minimum.cfg +++ b/tests/config/first_len_minimum.cfg @@ -1 +1 @@ -cmt_multi_first_len_minimum = 1 +cmt_multi_first_len_minimum = 1 diff --git a/tests/config/for_auto.cfg b/tests/config/for_auto.cfg index 7e6c4e74b3..879b6c9311 100644 --- a/tests/config/for_auto.cfg +++ b/tests/config/for_auto.cfg @@ -1,4 +1,4 @@ -input_tab_size = 4 -indent_columns = 4 -indent_with_tabs = 0 -sp_arith = add +input_tab_size = 4 +indent_columns = 4 +indent_with_tabs = 0 +sp_arith = add diff --git a/tests/config/freebsd.cfg b/tests/config/freebsd.cfg index 7b8e362025..ed20b3bd98 100644 --- a/tests/config/freebsd.cfg +++ b/tests/config/freebsd.cfg @@ -5,19 +5,19 @@ # # The type of line endings -newlines = lf # auto/lf/crlf/cr +newlines = lf # auto/lf/crlf/cr # The original size of tabs in the input -input_tab_size = 8 # number +input_tab_size = 8 # number # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 8 # number +output_tab_size = 8 # number # The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # number # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # number # # Indenting @@ -25,1232 +25,1232 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 8 # number +indent_columns = 8 # number # The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents. # For FreeBSD, this is set to 4. -indent_continue = 4 # number +indent_continue = 4 # number # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 2 # number +indent_with_tabs = 2 # number # Whether to indent strings broken by '\' so that they line up -indent_align_string = false # false/true +indent_align_string = false # false/true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # number # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # number # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # false/true # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # false/true # Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # false/true # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # false/true # The number of spaces to indent a namespace block -indent_namespace_level = 0 # number +indent_namespace_level = 0 # number # If the body of the namespace is longer than this number, it won't be indented. # Requires indent_namespace=true. Default=0 (no limit) -indent_namespace_limit = 0 # number +indent_namespace_limit = 0 # number # Whether the 'extern "C"' body is indented -indent_extern = false # false/true +indent_extern = false # false/true # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # false/true # Whether to indent the stuff after a leading class colon -indent_class_colon = true # false/true +indent_class_colon = true # false/true # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level -indent_else_if = false # false/true +indent_else_if = false # false/true # Amount to indent variable declarations after a open brace. neg=relative, pos=absolute -indent_var_def_blk = 0 # number +indent_var_def_blk = 0 # number # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = false # false/true +indent_func_call_param = false # false/true # Same as indent_func_call_param, but for function defs -indent_func_def_param = false # false/true +indent_func_def_param = false # false/true # Same as indent_func_call_param, but for function protos -indent_func_proto_param = false # false/true +indent_func_proto_param = false # false/true # Same as indent_func_call_param, but for class declarations -indent_func_class_param = false # false/true +indent_func_class_param = false # false/true # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = false # false/true +indent_func_ctor_var_param = false # false/true # Same as indent_func_call_param, but for templates -indent_template_param = false # false/true +indent_template_param = false # false/true # Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true +indent_func_param_double = false # false/true # Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 0 # number +indent_func_const = 0 # number # Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 0 # number +indent_func_throw = 0 # number # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 0 # number +indent_member = 0 # number # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # number # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = false # false/true +indent_relative_single_line_comments = false # false/true # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 0 # number +indent_switch_case = 0 # number # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # number # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 0 # number +indent_case_brace = 0 # number # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # false/true # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # number # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # number # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # false/true # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # false/true # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 0 # number +indent_paren_close = 0 # number # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # false/true # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # false/true # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # false/true # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # false/true # Align continued statements at the '='. Default=True # If FALSE or the '=' is followed by a newline, the next line is indent one tab. -indent_align_assign = true # false/true +indent_align_assign = true # false/true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # ignore/add/remove/force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # ignore/add/remove/force # Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. -sp_before_assign = ignore # ignore/add/remove/force +sp_before_assign = ignore # ignore/add/remove/force # Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. -sp_after_assign = ignore # ignore/add/remove/force +sp_after_assign = ignore # ignore/add/remove/force # Add or remove space around assignment '=' in enum -sp_enum_assign = ignore # ignore/add/remove/force +sp_enum_assign = ignore # ignore/add/remove/force # Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_before_assign = ignore # ignore/add/remove/force +sp_enum_before_assign = ignore # ignore/add/remove/force # Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_after_assign = ignore # ignore/add/remove/force +sp_enum_after_assign = ignore # ignore/add/remove/force # Add or remove space around preprocessor '##' concatenation operator. Default=Add -sp_pp_concat = add # ignore/add/remove/force +sp_pp_concat = add # ignore/add/remove/force # Add or remove space after preprocessor '#' stringify operator. Default=Add -sp_pp_stringify = add # ignore/add/remove/force +sp_pp_stringify = add # ignore/add/remove/force # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # ignore/add/remove/force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # ignore/add/remove/force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # ignore/add/remove/force # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # ignore/add/remove/force # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # false/true # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # ignore/add/remove/force # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # ignore/add/remove/force # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force +sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # ignore/add/remove/force # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # ignore/add/remove/force # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = ignore # ignore/add/remove/force +sp_after_ptr_star_func = ignore # ignore/add/remove/force # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = ignore # ignore/add/remove/force +sp_before_ptr_star_func = ignore # ignore/add/remove/force # Add or remove space before a reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # ignore/add/remove/force # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force +sp_before_unnamed_byref = ignore # ignore/add/remove/force # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = force # ignore/add/remove/force +sp_after_byref = force # ignore/add/remove/force # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = ignore # ignore/add/remove/force +sp_after_byref_func = ignore # ignore/add/remove/force # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = ignore # ignore/add/remove/force +sp_before_byref_func = ignore # ignore/add/remove/force # Add or remove space between type and word. Default=Force -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # ignore/add/remove/force # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. -sp_template_angle = ignore # ignore/add/remove/force +sp_template_angle = ignore # ignore/add/remove/force # Add or remove space before '<>' -sp_before_angle = remove # ignore/add/remove/force +sp_before_angle = remove # ignore/add/remove/force # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # ignore/add/remove/force # Add or remove space after '<>' -sp_after_angle = force # ignore/add/remove/force +sp_after_angle = force # ignore/add/remove/force # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = ignore # ignore/add/remove/force +sp_angle_paren = ignore # ignore/add/remove/force # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = ignore # ignore/add/remove/force +sp_angle_word = ignore # ignore/add/remove/force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # ignore/add/remove/force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # ignore/add/remove/force # Add or remove space before if-condition ')'. Overrides sp_inside_sparen. -sp_inside_sparen_close = ignore # ignore/add/remove/force +sp_inside_sparen_close = ignore # ignore/add/remove/force # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # ignore/add/remove/force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = add # ignore/add/remove/force +sp_sparen_brace = add # ignore/add/remove/force # Add or remove space between 'invariant' and '(' in the D language. -sp_invariant_paren = ignore # ignore/add/remove/force +sp_invariant_paren = ignore # ignore/add/remove/force # Add or remove space after the ')' in 'invariant (C) c' in the D language. -sp_after_invariant_paren = ignore # ignore/add/remove/force +sp_after_invariant_paren = ignore # ignore/add/remove/force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # ignore/add/remove/force # Add or remove space before ';'. Default=Remove -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # ignore/add/remove/force # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = ignore # ignore/add/remove/force +sp_before_semi_for = ignore # ignore/add/remove/force # Add or remove space before a semicolon of an empty part of a for statement. -sp_before_semi_for_empty = force # ignore/add/remove/force +sp_before_semi_for_empty = force # ignore/add/remove/force # Add or remove space after ';', except when followed by a comment. Default=Add -sp_after_semi = add # ignore/add/remove/force +sp_after_semi = add # ignore/add/remove/force # Add or remove space after ';' in non-empty 'for' statements. Default=Force -sp_after_semi_for = force # ignore/add/remove/force +sp_after_semi_for = force # ignore/add/remove/force # Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; ). -sp_after_semi_for_empty = force # ignore/add/remove/force +sp_after_semi_for_empty = force # ignore/add/remove/force # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # ignore/add/remove/force # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # ignore/add/remove/force # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # ignore/add/remove/force # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # ignore/add/remove/force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # ignore/add/remove/force # Add or remove space before the variadic '...' when preceded by a non-punctuator -sp_before_ellipsis = ignore # ignore/add/remove/force +sp_before_ellipsis = ignore # ignore/add/remove/force # Add or remove space after class ':' -sp_after_class_colon = ignore # ignore/add/remove/force +sp_after_class_colon = ignore # ignore/add/remove/force # Add or remove space before class ':' -sp_before_class_colon = ignore # ignore/add/remove/force +sp_before_class_colon = ignore # ignore/add/remove/force # Add or remove space before case ':'. Default=Remove -sp_before_case_colon = remove # ignore/add/remove/force +sp_before_case_colon = remove # ignore/add/remove/force # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # ignore/add/remove/force # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = ignore # ignore/add/remove/force +sp_after_operator_sym = ignore # ignore/add/remove/force # Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # ignore/add/remove/force # Add or remove spaces inside cast parens -sp_inside_paren_cast = ignore # ignore/add/remove/force +sp_inside_paren_cast = ignore # ignore/add/remove/force # Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = ignore # ignore/add/remove/force +sp_cpp_cast_paren = ignore # ignore/add/remove/force # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # ignore/add/remove/force # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # ignore/add/remove/force # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = force # ignore/add/remove/force +sp_inside_braces_enum = force # ignore/add/remove/force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = force # ignore/add/remove/force +sp_inside_braces_struct = force # ignore/add/remove/force # Add or remove space inside '{' and '}' -sp_inside_braces = force # ignore/add/remove/force +sp_inside_braces = force # ignore/add/remove/force # Add or remove space inside '{}' -sp_inside_braces_empty = ignore # ignore/add/remove/force +sp_inside_braces_empty = ignore # ignore/add/remove/force # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = force # ignore/add/remove/force +sp_type_func = force # ignore/add/remove/force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # ignore/add/remove/force # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # ignore/add/remove/force # Add or remove space inside empty function '()' -sp_inside_fparens = ignore # ignore/add/remove/force +sp_inside_fparens = ignore # ignore/add/remove/force # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # ignore/add/remove/force # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # ignore/add/remove/force # Add or remove space between ')' and '{' of function -sp_fparen_brace = add # ignore/add/remove/force +sp_fparen_brace = add # ignore/add/remove/force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # ignore/add/remove/force # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = ignore # ignore/add/remove/force +sp_func_call_user_paren = ignore # ignore/add/remove/force # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # ignore/add/remove/force # Add or remove space between 'return' and '(' -sp_return_paren = force # ignore/add/remove/force +sp_return_paren = force # ignore/add/remove/force # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # ignore/add/remove/force # Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = ignore # ignore/add/remove/force +sp_defined_paren = ignore # ignore/add/remove/force # Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = ignore # ignore/add/remove/force +sp_throw_paren = ignore # ignore/add/remove/force # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # ignore/add/remove/force # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # ignore/add/remove/force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = ignore # ignore/add/remove/force +sp_else_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # ignore/add/remove/force # Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = force # ignore/add/remove/force +sp_brace_typedef = force # ignore/add/remove/force # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # ignore/add/remove/force # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # ignore/add/remove/force # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # ignore/add/remove/force # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # ignore/add/remove/force # Add or remove space before the '::' operator -sp_before_dc = remove # ignore/add/remove/force +sp_before_dc = remove # ignore/add/remove/force # Add or remove space after the '::' operator -sp_after_dc = remove # ignore/add/remove/force +sp_after_dc = remove # ignore/add/remove/force # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # ignore/add/remove/force # Add or remove space after the '!' (not) operator. Default=Remove -sp_not = remove # ignore/add/remove/force +sp_not = remove # ignore/add/remove/force # Add or remove space after the '~' (invert) operator. Default=Remove -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # ignore/add/remove/force # Add or remove space after the '&' (address-of) operator. Default=Remove # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # ignore/add/remove/force # Add or remove space around the '.' or '->' operators. Default=Remove -sp_member = remove # ignore/add/remove/force +sp_member = remove # ignore/add/remove/force # Add or remove space after the '*' (dereference) operator. Default=Remove # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # ignore/add/remove/force # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # ignore/add/remove/force # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # ignore/add/remove/force # Add or remove space before a backslash-newline at the end of a line. Default=Add -sp_before_nl_cont = add # ignore/add/remove/force +sp_before_nl_cont = add # ignore/add/remove/force # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force +sp_after_oc_scope = ignore # ignore/add/remove/force # Add or remove space after the colon in message specs # '-(int) f:(int) x;' vs '-(int) f: (int) x;' -sp_after_oc_colon = ignore # ignore/add/remove/force +sp_after_oc_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in message specs # '-(int) f: (int) x;' vs '-(int) f : (int) x;' -sp_before_oc_colon = ignore # ignore/add/remove/force +sp_before_oc_colon = ignore # ignore/add/remove/force # Add or remove space after the colon in message specs # '[object setValue:1];' vs '[object setValue: 1];' -sp_after_send_oc_colon = ignore # ignore/add/remove/force +sp_after_send_oc_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in message specs # '[object setValue:1];' vs '[object setValue :1];' -sp_before_send_oc_colon = ignore # ignore/add/remove/force +sp_before_send_oc_colon = ignore # ignore/add/remove/force # Add or remove space after the (type) in message specs # '-(int)f: (int) x;' vs '-(int)f: (int)x;' -sp_after_oc_type = ignore # ignore/add/remove/force +sp_after_oc_type = ignore # ignore/add/remove/force # Add or remove space after the first (type) in message specs # '-(int) f:(int)x;' vs '-(int)f:(int)x;' -sp_after_oc_return_type = ignore # ignore/add/remove/force +sp_after_oc_return_type = ignore # ignore/add/remove/force # Add or remove space between '@selector' and '(' # '@selector(msgName).' vs '@selector (msgName)' -sp_after_oc_at_sel = ignore # ignore/add/remove/force +sp_after_oc_at_sel = ignore # ignore/add/remove/force # Add or remove space before a block pointer caret # '^int (int arg){...}' vs. ' ^int (int arg){...}' -sp_before_oc_block_caret = ignore # ignore/add/remove/force +sp_before_oc_block_caret = ignore # ignore/add/remove/force # Add or remove space after a block pointer caret # '^int (int arg){...}' vs. '^ int (int arg){...}' -sp_after_oc_block_caret = ignore # ignore/add/remove/force +sp_after_oc_block_caret = ignore # ignore/add/remove/force # Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = ignore # ignore/add/remove/force +sp_cond_colon = ignore # ignore/add/remove/force # Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = ignore # ignore/add/remove/force +sp_cond_question = ignore # ignore/add/remove/force # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = remove # ignore/add/remove/force +sp_case_label = remove # ignore/add/remove/force # Control the space around the D '..' operator. -sp_range = ignore # ignore/add/remove/force +sp_range = ignore # ignore/add/remove/force # Control the space after the opening of a C++ comment '// A' vs '//A' -sp_cmt_cpp_start = ignore # ignore/add/remove/force +sp_cmt_cpp_start = ignore # ignore/add/remove/force # Controls the spaces between #else or #endif and a trailing comment -sp_endif_cmt = ignore # ignore/add/remove/force +sp_endif_cmt = ignore # ignore/add/remove/force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # false/true # Whether to use tabs for aligning -align_with_tabs = false # false/true +align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # false/true # Whether to right-align numbers -align_number_right = true # false/true +align_number_right = true # false/true # Align variable definitions in prototypes and functions -align_func_params = true # false/true +align_func_params = true # false/true # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = false # false/true +align_same_func_call_params = false # false/true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 1 # number +align_var_def_span = 1 # number # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 1 # number +align_var_def_star_style = 1 # number # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # number # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 16 # number +align_var_def_thresh = 16 # number # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # number # Whether to align the colon in struct bit fields -align_var_def_colon = true # false/true +align_var_def_colon = true # false/true # Whether to align any attribute after the variable name -align_var_def_attribute = false # false/true +align_var_def_attribute = false # false/true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = true # false/true +align_var_def_inline = true # false/true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 1 # number +align_assign_span = 1 # number # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 12 # number +align_assign_thresh = 12 # number # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 16 # number +align_enum_equ_span = 16 # number # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # number # The span for aligning struct/union (0=don't align) -align_var_struct_span = 99 # number +align_var_struct_span = 99 # number # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # number # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # number # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 3 # number +align_struct_init_span = 3 # number # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 3 # number +align_typedef_gap = 3 # number # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 5 # number +align_typedef_span = 5 # number # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # number # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typedef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # number # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typedef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # number # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 3 # number +align_right_cmt_span = 3 # number # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # false/true # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. -align_right_cmt_gap = 0 # number +align_right_cmt_gap = 0 # number # Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore) -align_right_cmt_at_col = 0 # number +align_right_cmt_at_col = 0 # number # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # number # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # number # Align function protos on the 'operator' keyword instead of what follows -align_on_operator = false # false/true +align_on_operator = false # false/true # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # false/true # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true +align_single_line_func = false # false/true # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # false/true # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # number # The span for aligning ObjC msg spec (0=don't align) -align_oc_msg_spec_span = 0 # number +align_oc_msg_spec_span = 0 # number # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = true # false/true +align_nl_cont = true # false/true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 4 # number +align_pp_define_gap = 4 # number # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 3 # number +align_pp_define_span = 3 # number # Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = true # false/true +align_left_shift = true # false/true # Span for aligning parameters in an Obj-C message call on the ':' (0=don't align) -align_oc_msg_colon_span = 0 # number +align_oc_msg_colon_span = 0 # number # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # false/true # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = true # false/true +nl_assign_leave_one_liners = true # false/true # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = true # false/true +nl_class_leave_one_liners = true # false/true # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = false # false/true +nl_enum_leave_one_liners = false # false/true # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # false/true # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # false/true # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # false/true # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # ignore/add/remove/force # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # number # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # ignore/add/remove/force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # number # Add or remove newline between '=' and '{' -nl_assign_brace = add # ignore/add/remove/force +nl_assign_brace = add # ignore/add/remove/force # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # ignore/add/remove/force # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # ignore/add/remove/force # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # number # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = add # ignore/add/remove/force +nl_fcall_brace = add # ignore/add/remove/force # Add or remove newline between 'enum' and '{' -nl_enum_brace = remove # ignore/add/remove/force +nl_enum_brace = remove # ignore/add/remove/force # Add or remove newline between 'struct and '{' -nl_struct_brace = remove # ignore/add/remove/force +nl_struct_brace = remove # ignore/add/remove/force # Add or remove newline between 'union' and '{' -nl_union_brace = remove # ignore/add/remove/force +nl_union_brace = remove # ignore/add/remove/force # Add or remove newline between 'if' and '{' -nl_if_brace = remove # ignore/add/remove/force +nl_if_brace = remove # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = remove # ignore/add/remove/force +nl_brace_else = remove # ignore/add/remove/force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = ignore # ignore/add/remove/force +nl_elseif_brace = ignore # ignore/add/remove/force # Add or remove newline between 'else' and '{' -nl_else_brace = remove # ignore/add/remove/force +nl_else_brace = remove # ignore/add/remove/force # Add or remove newline between 'else' and 'if' -nl_else_if = remove # ignore/add/remove/force +nl_else_if = remove # ignore/add/remove/force # Add or remove newline between '}' and 'finally' -nl_brace_finally = ignore # ignore/add/remove/force +nl_brace_finally = ignore # ignore/add/remove/force # Add or remove newline between 'finally' and '{' -nl_finally_brace = ignore # ignore/add/remove/force +nl_finally_brace = ignore # ignore/add/remove/force # Add or remove newline between 'try' and '{' -nl_try_brace = ignore # ignore/add/remove/force +nl_try_brace = ignore # ignore/add/remove/force # Add or remove newline between get/set and '{' -nl_getset_brace = force # ignore/add/remove/force +nl_getset_brace = force # ignore/add/remove/force # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # ignore/add/remove/force # Add or remove newline between 'catch' and '{' -nl_catch_brace = ignore # ignore/add/remove/force +nl_catch_brace = ignore # ignore/add/remove/force # Add or remove newline between '}' and 'catch' -nl_brace_catch = ignore # ignore/add/remove/force +nl_brace_catch = ignore # ignore/add/remove/force # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # ignore/add/remove/force # Add or remove newline between two open or close braces. # Due to general newline/brace handling, REMOVE may not work. -nl_brace_brace = ignore # ignore/add/remove/force +nl_brace_brace = ignore # ignore/add/remove/force # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # ignore/add/remove/force # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # ignore/add/remove/force # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # false/true # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = true # false/true +nl_multi_line_define = true # false/true # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # false/true # Add or remove newline between ')' and 'throw' -nl_before_throw = ignore # ignore/add/remove/force +nl_before_throw = ignore # ignore/add/remove/force # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # false/true # Newline between namespace and { -nl_namespace_brace = ignore # ignore/add/remove/force +nl_namespace_brace = ignore # ignore/add/remove/force # Add or remove newline between 'template<>' and whatever follows. -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # ignore/add/remove/force # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # ignore/add/remove/force # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in a function definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # ignore/add/remove/force # Add or remove newline between return type and function name inside a class {} # Uses nl_func_type_name or nl_func_proto_type_name if set to ignore. -nl_func_type_name_class = ignore # ignore/add/remove/force +nl_func_type_name_class = ignore # ignore/add/remove/force # Add or remove newline between function scope and name in a definition # Controls the newline after '::' in 'void A::f() { }' -nl_func_scope_name = ignore # ignore/add/remove/force +nl_func_scope_name = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = ignore # ignore/add/remove/force +nl_func_proto_type_name = ignore # ignore/add/remove/force # Add or remove newline between a function name and the opening '(' -nl_func_paren = remove # ignore/add/remove/force +nl_func_paren = remove # ignore/add/remove/force # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # ignore/add/remove/force # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # ignore/add/remove/force # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # ignore/add/remove/force # Add or remove newline between '()' in a function declaration. -nl_func_decl_empty = ignore # ignore/add/remove/force +nl_func_decl_empty = ignore # ignore/add/remove/force # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # ignore/add/remove/force # Whether to put a newline after 'return' statement -nl_after_return = true # false/true +nl_after_return = true # false/true # Add or remove a newline between the return keyword and return expression. -nl_return_expr = ignore # ignore/add/remove/force +nl_return_expr = ignore # ignore/add/remove/force # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # false/true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = true # false/true +nl_after_brace_open = true # false/true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true +nl_after_brace_open_cmt = false # false/true # Whether to put a newline after a virtual brace open. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = false # false/true +nl_after_vbrace_open = false # false/true # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. -nl_after_brace_close = true # false/true +nl_after_brace_close = true # false/true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # false/true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = true # false/true +nl_squeeze_ifdef = true # false/true # Add or remove newline before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # ignore/add/remove/force # Add or remove newline after 'if' -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # ignore/add/remove/force # Add or remove newline before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # ignore/add/remove/force # Add or remove newline after 'for' -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # ignore/add/remove/force # Add or remove newline before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # ignore/add/remove/force # Add or remove newline after 'while' -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # ignore/add/remove/force # Add or remove newline before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # ignore/add/remove/force # Add or remove newline after 'switch' -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # ignore/add/remove/force # Add or remove newline before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # ignore/add/remove/force # Add or remove newline after 'do' -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # ignore/add/remove/force # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # false/true # Whether to double-space before the close brace of a struct/union/enum -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # false/true # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # ignore/add/remove/force # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # false/true # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # false/true # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # false/true # # Positioning options # # The position of arithmetic operators in wrapped expressions -pos_arith = trail # ignore/lead/trail +pos_arith = trail # ignore/lead/trail # The position of assignment in wrapped expressions -pos_assign = ignore # ignore/lead/trail +pos_assign = ignore # ignore/lead/trail # The position of boolean operators in wrapped expressions -pos_bool = trail # ignore/lead/trail +pos_bool = trail # ignore/lead/trail # The position of comparison operators in wrapped expressions -pos_compare = ignore # ignore/lead/trail +pos_compare = ignore # ignore/lead/trail # The position of conditional (b ? t : f) operators in wrapped expressions -pos_conditional = ignore # ignore/lead/trail +pos_conditional = ignore # ignore/lead/trail # The position of the comma in wrapped expressions -pos_comma = ignore # ignore/lead/trail +pos_comma = ignore # ignore/lead/trail # The position of the comma in the constructor initialization list -pos_class_comma = ignore # ignore/lead/trail +pos_class_comma = ignore # ignore/lead/trail # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # ignore/lead/trail # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # number # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true +ls_for_split_full = false # false/true # Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true +ls_func_split_full = false # false/true # # Blank line options # # The maximum consecutive newlines -nl_max = 4 # number +nl_max = 4 # number # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # number # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # number # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 3 # number +nl_after_func_body = 3 # number # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 0 # number +nl_after_func_body_one_liner = 0 # number # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # number # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # number # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # number # Whether to force a newline after a mulit-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # false/true # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 0 # number +nl_before_access_spec = 0 # number # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # number # The number of newlines between a function def and the function comment. # 0 = No change. -nl_comment_func_def = 1 # number +nl_comment_func_def = 1 # number # The number of newlines after a try-catch-finally block that isn't followed by a brace close. # 0 = No change. -nl_after_try_catch_finally = 0 # number +nl_after_try_catch_finally = 0 # number # The number of newlines before and after a property, indexer or event decl. # 0 = No change. -nl_around_cs_property = 0 # number +nl_around_cs_property = 0 # number # The number of newlines between the get/set/add/remove handlers in C#. # 0 = No change. -nl_between_get_set = 0 # number +nl_between_get_set = 0 # number # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # false/true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # false/true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # ignore/add/remove/force # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # ignore/add/remove/force # Add or remove braces on single-line function definitions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # ignore/add/remove/force # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # ignore/add/remove/force # Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if. # If any must be braced, they are all braced. If all can be unbraced, then the braces are removed. -mod_full_brace_if_chain = false # false/true +mod_full_brace_if_chain = false # false/true # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # number # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # ignore/add/remove/force # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = add # ignore/add/remove/force +mod_paren_on_return = add # ignore/add/remove/force # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # false/true # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = true # false/true +mod_full_paren_if_bool = true # false/true # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = true # false/true +mod_remove_extra_semicolon = true # false/true # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 0 # number +mod_add_long_function_closebrace_comment = 0 # number # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number +mod_add_long_switch_closebrace_comment = 0 # number # If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after # the #else, a comment will be added. -mod_add_long_ifdef_endif_comment = 0 # number +mod_add_long_ifdef_endif_comment = 0 # number # If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after # the #endif, a comment will be added. -mod_add_long_ifdef_else_comment = 0 # number +mod_add_long_ifdef_else_comment = 0 # number # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # false/true # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # false/true # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # false/true # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = false # false/true +mod_move_case_break = false # false/true # Will add or remove the braces around a fully braced case statement. # Will only remove the braces if there are no variable declarations in the block. -mod_case_brace = remove # ignore/add/remove/force +mod_case_brace = remove # ignore/add/remove/force # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = true # false/true +mod_remove_empty_return = true # false/true # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # number # Set the comment reflow mode (default: 0) # 0: no reflowing (apart from the line wrapping due to cmt_width) # 1: no touching at all # 2: full reflow -cmt_reflow_mode = 0 # number +cmt_reflow_mode = 0 # number # If false, disable all multi-line comment changes, including cmt_width and leading chars. # Default is true. -cmt_indent_multi = true # false/true +cmt_indent_multi = true # false/true # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # false/true # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # false/true # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # false/true # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # false/true # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # false/true # Whether to put a star on subsequent comment lines -cmt_star_cont = true # false/true +cmt_star_cont = true # false/true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # number # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # number # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true # false/true # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # string # The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_footer = "" # string +cmt_insert_file_footer = "" # string # The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment. # Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # string # The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment. # Will substitute $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # string # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true +cmt_insert_before_preproc = false # false/true # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = remove # ignore/add/remove/force +pp_indent = remove # ignore/add/remove/force # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # false/true # If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. -pp_indent_count = 1 # number +pp_indent_count = 1 # number # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # ignore/add/remove/force # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # number # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # number # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # false/true # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # number # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true +pp_if_indent_code = false # false/true # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # false/true # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/func-def-1.cfg b/tests/config/func-def-1.cfg index 3e5f7ef80f..565483abd7 100644 --- a/tests/config/func-def-1.cfg +++ b/tests/config/func-def-1.cfg @@ -2,22 +2,22 @@ # My favorite format # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 3 # new tab size +indent_columns = output_tab_size -nl_func_decl_start = Add # newline after the '(' in a function decl -nl_func_decl_args = Add # newline after each ',' in a function decl -nl_func_decl_end = Add # newline before the ')' in a function decl +nl_func_decl_start = Add # newline after the '(' in a function decl +nl_func_decl_args = Add # newline after each ',' in a function decl +nl_func_decl_end = Add # newline before the ')' in a function decl -nl_func_def_start = Add # newline after the '(' in a function decl -nl_func_def_args = Add # newline after each ',' in a function def -nl_func_def_end = Add # newline before the ')' in a function decl +nl_func_def_start = Add # newline after the '(' in a function decl +nl_func_def_args = Add # newline after each ',' in a function def +nl_func_def_end = Add # newline before the ')' in a function decl -nl_func_type_name = Add # newline between return type and function def -nl_func_proto_type_name = Add # newline between return type and function proto +nl_func_type_name = Add # newline between return type and function def +nl_func_proto_type_name = Add # newline between return type and function proto -sp_after_ptr_star = remove -sp_before_ptr_star = force +sp_after_ptr_star = remove +sp_before_ptr_star = force diff --git a/tests/config/func-def-2.cfg b/tests/config/func-def-2.cfg index 4b0c5a5049..244507338b 100644 --- a/tests/config/func-def-2.cfg +++ b/tests/config/func-def-2.cfg @@ -2,18 +2,18 @@ # My favorite format # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 3 # new tab size +indent_columns = output_tab_size -nl_func_decl_start = Ignore # newline after the '(' in a function decl -nl_func_decl_args = Ignore # newline after each ',' in a function decl -nl_func_decl_end = Remove # newline before the ')' in a function decl +nl_func_decl_start = Ignore # newline after the '(' in a function decl +nl_func_decl_args = Ignore # newline after each ',' in a function decl +nl_func_decl_end = Remove # newline before the ')' in a function decl -nl_func_type_name = Add # newline between return type and function def -nl_func_proto_type_name = Remove # newline between return type and function proto +nl_func_type_name = Add # newline between return type and function def +nl_func_proto_type_name = Remove # newline between return type and function proto -sp_after_ptr_star = remove -sp_before_ptr_star = force +sp_after_ptr_star = remove +sp_before_ptr_star = force diff --git a/tests/config/func-def-3.cfg b/tests/config/func-def-3.cfg index 6a79698ce8..a4a3e0aff4 100644 --- a/tests/config/func-def-3.cfg +++ b/tests/config/func-def-3.cfg @@ -2,19 +2,19 @@ # My favorite format # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 3 # new tab size +indent_columns = output_tab_size # everything on one line (TODO: line length checks) -nl_func_decl_start = Remove # newline after the '(' in a function decl -nl_func_decl_args = Remove # newline after each ',' in a function decl -nl_func_decl_end = Remove # newline before the ')' in a function decl +nl_func_decl_start = Remove # newline after the '(' in a function decl +nl_func_decl_args = Remove # newline after each ',' in a function decl +nl_func_decl_end = Remove # newline before the ')' in a function decl -nl_func_type_name = Remove # newline between return type and function def -nl_func_proto_type_name = Remove # newline between return type and function proto +nl_func_type_name = Remove # newline between return type and function def +nl_func_proto_type_name = Remove # newline between return type and function proto -sp_after_ptr_star = remove -sp_before_ptr_star = force +sp_after_ptr_star = remove +sp_before_ptr_star = force diff --git a/tests/config/func_call_user.cfg b/tests/config/func_call_user.cfg index 5328c5b7a3..5a041b040a 100644 --- a/tests/config/func_call_user.cfg +++ b/tests/config/func_call_user.cfg @@ -3,19 +3,19 @@ # # The type of line endings -newlines = auto # auto/lf/crlf/cr +newlines = auto # auto/lf/crlf/cr # The original size of tabs in the input -input_tab_size = 4 # number +input_tab_size = 4 # number # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 4 # number +output_tab_size = 4 # number # The ascii value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # number # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # number # # Indenting @@ -23,897 +23,897 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 4 # number +indent_columns = 4 # number # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # number # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # false/true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # number # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # number # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # false/true # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # false/true # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # false/true # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # false/true # Whether the 'class' body is indented -indent_class = false # false/true +indent_class = false # false/true # Whether to indent the stuff after a leading class colon -indent_class_colon = false # false/true +indent_class_colon = false # false/true # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = false # false/true +indent_func_call_param = false # false/true # Same as indent_func_call_param, but for function defs -indent_func_def_param = false # false/true +indent_func_def_param = false # false/true # Same as indent_func_call_param, but for function protos -indent_func_proto_param = false # false/true +indent_func_proto_param = false # false/true # Same as indent_func_call_param, but for class declarations -indent_func_class_param = false # false/true +indent_func_class_param = false # false/true # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = false # false/true +indent_func_ctor_var_param = false # false/true # Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true +indent_func_param_double = false # false/true # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 4 # number +indent_member = 4 # number # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # number # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 4 # number +indent_switch_case = 4 # number # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 4 # number +indent_case_shift = 4 # number # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 4 # number +indent_case_brace = 4 # number # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # false/true # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # number # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # number # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # false/true # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 1 # number +indent_paren_close = 1 # number # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # false/true # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # false/true # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # false/true # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # false/true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # ignore/add/remove/force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # ignore/add/remove/force # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # ignore/add/remove/force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # ignore/add/remove/force # Add or remove space inside '(' and ')' -sp_inside_paren = ignore # ignore/add/remove/force +sp_inside_paren = ignore # ignore/add/remove/force # Add or remove space between nested parens -sp_paren_paren = force # ignore/add/remove/force +sp_paren_paren = force # ignore/add/remove/force # Whether to balance spaces inside nested parens -sp_balance_nested_parens = true # false/true +sp_balance_nested_parens = true # false/true # Add or remove space between ')' and '{' -sp_paren_brace = remove # ignore/add/remove/force +sp_paren_brace = remove # ignore/add/remove/force # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # ignore/add/remove/force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # ignore/add/remove/force # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # ignore/add/remove/force # Add or remove space before reference sign '&' -sp_before_byref = force # ignore/add/remove/force +sp_before_byref = force # ignore/add/remove/force # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = remove # ignore/add/remove/force +sp_after_byref = remove # ignore/add/remove/force # Add or remove space before '<>' -sp_before_angle = force # ignore/add/remove/force +sp_before_angle = force # ignore/add/remove/force # Add or remove space after '<>' -sp_after_angle = force # ignore/add/remove/force +sp_after_angle = force # ignore/add/remove/force # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = remove # ignore/add/remove/force -sp_angle_paren_empty = remove +sp_angle_paren = remove # ignore/add/remove/force +sp_angle_paren_empty = remove # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = force # ignore/add/remove/force +sp_angle_word = force # ignore/add/remove/force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # ignore/add/remove/force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # ignore/add/remove/force # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = remove # ignore/add/remove/force +sp_after_sparen = remove # ignore/add/remove/force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = remove # ignore/add/remove/force +sp_sparen_brace = remove # ignore/add/remove/force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = force # ignore/add/remove/force +sp_special_semi = force # ignore/add/remove/force # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # ignore/add/remove/force # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = force # ignore/add/remove/force +sp_before_semi_for = force # ignore/add/remove/force # Add or remove space before a semicolon of an empty part of a for statment. -sp_before_semi_for_empty = force # ignore/add/remove/force +sp_before_semi_for_empty = force # ignore/add/remove/force # Add or remove space after the final semicolon of an empty part of a for statment: for ( ; ; ). -sp_after_semi_for_empty = force # ignore/add/remove/force +sp_after_semi_for_empty = force # ignore/add/remove/force # Add or remove space before '[' (except '[]') -sp_before_square = remove # ignore/add/remove/force +sp_before_square = remove # ignore/add/remove/force # Add or remove space before '[]' -sp_before_squares = remove # ignore/add/remove/force +sp_before_squares = remove # ignore/add/remove/force # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # ignore/add/remove/force # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # ignore/add/remove/force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # ignore/add/remove/force # Add or remove space between 'operator' and operator sign -sp_after_operator = force # ignore/add/remove/force +sp_after_operator = force # ignore/add/remove/force # Add or remove space after cast -sp_after_cast = force # ignore/add/remove/force +sp_after_cast = force # ignore/add/remove/force # Add or remove spaces inside cast parens -sp_inside_paren_cast = remove # ignore/add/remove/force +sp_inside_paren_cast = remove # ignore/add/remove/force # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # ignore/add/remove/force # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # ignore/add/remove/force # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = force # ignore/add/remove/force +sp_inside_braces_enum = force # ignore/add/remove/force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = remove # ignore/add/remove/force +sp_inside_braces_struct = remove # ignore/add/remove/force # Add or remove space inside '{' and '}' -sp_inside_braces = force # ignore/add/remove/force +sp_inside_braces = force # ignore/add/remove/force # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # ignore/add/remove/force # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = remove # ignore/add/remove/force +sp_type_func = remove # ignore/add/remove/force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # ignore/add/remove/force # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # ignore/add/remove/force # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # ignore/add/remove/force # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # ignore/add/remove/force # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = remove # ignore/add/remove/force +sp_square_fparen = remove # ignore/add/remove/force # Add or remove space between ')' and '{' of function -sp_fparen_brace = remove # ignore/add/remove/force +sp_fparen_brace = remove # ignore/add/remove/force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = force # ignore/add/remove/force -sp_func_call_user_paren = remove # ignore/add/remove/force +sp_func_call_paren = force # ignore/add/remove/force +sp_func_call_user_paren = remove # ignore/add/remove/force -set func_call_user _ N_ +set func_call_user _ N_ # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = ignore # ignore/add/remove/force +sp_func_class_paren = ignore # ignore/add/remove/force # Add or remove space between 'return' and '(' -sp_return_paren = force # ignore/add/remove/force +sp_return_paren = force # ignore/add/remove/force # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = force # ignore/add/remove/force +sp_attribute_paren = force # ignore/add/remove/force # Add or remove space between macro and value -sp_macro = force # ignore/add/remove/force +sp_macro = force # ignore/add/remove/force # Add or remove space between macro function ')' and value -sp_macro_func = force # ignore/add/remove/force +sp_macro_func = force # ignore/add/remove/force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = ignore # ignore/add/remove/force +sp_else_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # ignore/add/remove/force # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # ignore/add/remove/force # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # ignore/add/remove/force # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # ignore/add/remove/force # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # ignore/add/remove/force # Add or remove space before the '::' operator -sp_before_dc = remove # ignore/add/remove/force +sp_before_dc = remove # ignore/add/remove/force # Add or remove space after the '::' operator -sp_after_dc = remove # ignore/add/remove/force +sp_after_dc = remove # ignore/add/remove/force # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # ignore/add/remove/force # Add or remove space after the '!' (not) operator. -sp_not = remove # ignore/add/remove/force +sp_not = remove # ignore/add/remove/force # Add or remove space after the '~' (invert) operator. -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # ignore/add/remove/force # Add or remove space after the '&' (address-of) operator. # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # ignore/add/remove/force # Add or remove space around the '.' or '->' operators -sp_member = remove # ignore/add/remove/force +sp_member = remove # ignore/add/remove/force # Add or remove space after the '*' (dereference) operator. # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # ignore/add/remove/force # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7' -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # ignore/add/remove/force # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;' -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # ignore/add/remove/force # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force +sp_after_oc_scope = ignore # ignore/add/remove/force # Add or remove space after the colon in message specs # '-(int) f: (int) x;' vs '+(int) f : (int) x;' -sp_before_oc_colon = force # ignore/add/remove/force +sp_before_oc_colon = force # ignore/add/remove/force # Add or remove space after the (type) in message specs # '-(int) f: (int) x;' vs '+(int)f : (int)x;' -sp_after_oc_type = force # ignore/add/remove/force +sp_after_oc_type = force # ignore/add/remove/force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # false/true # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # false/true # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # false/true # Align variable definitions in prototypes and functions -align_func_params = true # false/true +align_func_params = true # false/true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 20 # number +align_var_def_span = 20 # number # How to align the star in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_star_style = 0 # number +align_var_def_star_style = 0 # number # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # number # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # number # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # false/true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = true # false/true +align_var_def_inline = true # false/true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 1 # number +align_assign_span = 1 # number # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 30 # number +align_assign_thresh = 30 # number # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 10 # number +align_enum_equ_span = 10 # number # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 12 # number +align_enum_equ_thresh = 12 # number # The span for aligning struct/union (0=don't align) -align_var_struct_span = 30 # number +align_var_struct_span = 30 # number # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 30 # number +align_var_struct_thresh = 30 # number # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 8 # number +align_struct_init_span = 8 # number # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 4 # number +align_typedef_gap = 4 # number # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 5 # number +align_typedef_span = 5 # number # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # number # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 2 # number +align_typedef_star_style = 2 # number # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typdef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 2 # number +align_typedef_amp_style = 2 # number # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 3 # number +align_right_cmt_span = 3 # number # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # false/true # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 3 # number +align_func_proto_span = 3 # number # The span for aligning function prototypes (0=don't align) -align_oc_msg_spec_span = 3 # number +align_oc_msg_spec_span = 3 # number # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = true # false/true +align_nl_cont = true # false/true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 2 # number +align_pp_define_gap = 2 # number # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 50 # number +align_pp_define_span = 50 # number # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # false/true # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = false # false/true +nl_assign_leave_one_liners = false # false/true # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = false # false/true +nl_class_leave_one_liners = false # false/true # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = false # false/true +nl_enum_leave_one_liners = false # false/true # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # false/true # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # false/true # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # false/true # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # ignore/add/remove/force # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # number # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # ignore/add/remove/force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # number # Add or remove newline between '=' and '{' -nl_assign_brace = force # ignore/add/remove/force +nl_assign_brace = force # ignore/add/remove/force # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # ignore/add/remove/force # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # ignore/add/remove/force # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # number # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = force # ignore/add/remove/force +nl_fcall_brace = force # ignore/add/remove/force # Add or remove newline between 'enum' and '{' -nl_enum_brace = add # ignore/add/remove/force +nl_enum_brace = add # ignore/add/remove/force # Add or remove newline between 'struct and '{' -nl_struct_brace = add # ignore/add/remove/force +nl_struct_brace = add # ignore/add/remove/force # Add or remove newline between 'union' and '{' -nl_union_brace = add # ignore/add/remove/force +nl_union_brace = add # ignore/add/remove/force # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # ignore/add/remove/force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = add # ignore/add/remove/force +nl_elseif_brace = add # ignore/add/remove/force # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'finally' -nl_brace_finally = ignore # ignore/add/remove/force +nl_brace_finally = ignore # ignore/add/remove/force # Add or remove newline between 'finally' and '{' -nl_finally_brace = ignore # ignore/add/remove/force +nl_finally_brace = ignore # ignore/add/remove/force # Add or remove newline between 'try' and '{' -nl_try_brace = ignore # ignore/add/remove/force +nl_try_brace = ignore # ignore/add/remove/force # Add or remove newline between get/set and '{' -nl_getset_brace = ignore # ignore/add/remove/force +nl_getset_brace = ignore # ignore/add/remove/force # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # ignore/add/remove/force # Add or remove newline between 'catch' and '{' -nl_catch_brace = ignore # ignore/add/remove/force +nl_catch_brace = ignore # ignore/add/remove/force # Add or remove newline between '}' and 'catch' -nl_brace_catch = ignore # ignore/add/remove/force +nl_brace_catch = ignore # ignore/add/remove/force # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # ignore/add/remove/force # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = add # ignore/add/remove/force +nl_brace_while = add # ignore/add/remove/force # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # ignore/add/remove/force # Add or remove newline when condition spans two or more lines -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # false/true # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = true # false/true +nl_multi_line_define = true # false/true # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # false/true # Whether to put a newline after 'case' statement -nl_after_case = false # false/true +nl_after_case = false # false/true # Newline between namespace and { -nl_namespace_brace = add # ignore/add/remove/force +nl_namespace_brace = add # ignore/add/remove/force # Add or remove newline between 'template<>' and 'class' -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # ignore/add/remove/force # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # ignore/add/remove/force # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in definition -nl_func_type_name = remove # ignore/add/remove/force +nl_func_type_name = remove # ignore/add/remove/force # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = remove # ignore/add/remove/force +nl_func_proto_type_name = remove # ignore/add/remove/force # Add or remove newline between a function name and the opening '(' -nl_func_paren = remove # ignore/add/remove/force +nl_func_paren = remove # ignore/add/remove/force # Add or remove newline after '(' in a function declaration -nl_func_decl_start = remove # ignore/add/remove/force +nl_func_decl_start = remove # ignore/add/remove/force # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # ignore/add/remove/force # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # ignore/add/remove/force # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # ignore/add/remove/force # Whether to put a newline after 'return' statement -nl_after_return = true # false/true +nl_after_return = true # false/true # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # false/true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = true # false/true +nl_after_brace_open = true # false/true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = true # false/true +nl_after_brace_open_cmt = true # false/true # Whether to put a newline after a virtual brace open. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = true # false/true +nl_after_vbrace_open = true # false/true # Whether to alter newlines in '#define' macros -nl_define_macro = true # false/true +nl_define_macro = true # false/true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true +nl_squeeze_ifdef = false # false/true # Add or remove newline before 'if' -nl_before_if = add # ignore/add/remove/force +nl_before_if = add # ignore/add/remove/force # Add or remove newline after 'if' -nl_after_if = add # ignore/add/remove/force +nl_after_if = add # ignore/add/remove/force # Add or remove newline before 'for' -nl_before_for = add # ignore/add/remove/force +nl_before_for = add # ignore/add/remove/force # Add or remove newline after 'for' -nl_after_for = add # ignore/add/remove/force +nl_after_for = add # ignore/add/remove/force # Add or remove newline before 'while' -nl_before_while = add # ignore/add/remove/force +nl_before_while = add # ignore/add/remove/force # Add or remove newline after 'while' -nl_after_while = add # ignore/add/remove/force +nl_after_while = add # ignore/add/remove/force # Add or remove newline before 'switch' -nl_before_switch = add # ignore/add/remove/force +nl_before_switch = add # ignore/add/remove/force # Add or remove newline after 'switch' -nl_after_switch = add # ignore/add/remove/force +nl_after_switch = add # ignore/add/remove/force # Add or remove newline before 'do' -nl_before_do = add # ignore/add/remove/force +nl_before_do = add # ignore/add/remove/force # Add or remove newline after 'do' -nl_after_do = add # ignore/add/remove/force +nl_after_do = add # ignore/add/remove/force # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = true # false/true +nl_ds_struct_enum_cmt = true # false/true # Whether to double-space before the close brace of a struct/union/enum -nl_ds_struct_enum_close_brace = true # false/true +nl_ds_struct_enum_close_brace = true # false/true # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # ignore/add/remove/force # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # false/true # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # false/true # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # false/true # # Positioning options # # The position of boolean operators in wrapped expressions -pos_bool = ignore # ignore/lead/trail +pos_bool = ignore # ignore/lead/trail # The position of the comma in wrapped expressions -pos_comma = trail # ignore/lead/trail +pos_comma = trail # ignore/lead/trail # The position of the comma in the constructor initialization list -pos_class_comma = ignore # ignore/lead/trail +pos_class_comma = ignore # ignore/lead/trail # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # ignore/lead/trail # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 80 # number +code_width = 80 # number # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = true # false/true +ls_for_split_full = true # false/true # Whether to fully split long function protos/calls at commas -ls_func_split_full = true # false/true +ls_func_split_full = true # false/true # # Blank line options # # The maximum consecutive newlines -nl_max = 3 # number +nl_max = 3 # number # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 1 # number +nl_after_func_proto = 1 # number # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 3 # number +nl_after_func_proto_group = 3 # number # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 5 # number +nl_after_func_body = 5 # number # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 5 # number +nl_after_func_body_one_liner = 5 # number # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 1 # number +nl_before_block_comment = 1 # number # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 1 # number +nl_before_c_comment = 1 # number # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 1 # number +nl_before_cpp_comment = 1 # number # Whether to force a newline after a mulit-line comment. -nl_after_multiline_comment = true # false/true +nl_after_multiline_comment = true # false/true # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 0 # number +nl_before_access_spec = 0 # number # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # number # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # false/true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = false # false/true +eat_blanks_before_close_brace = false # false/true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # ignore/add/remove/force # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # ignore/add/remove/force # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = add # ignore/add/remove/force +mod_full_brace_function = add # ignore/add/remove/force # Add or remove braces on single-line 'if' statement -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # ignore/add/remove/force # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 1 # number +mod_full_brace_nl = 1 # number # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # ignore/add/remove/force # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = remove # ignore/add/remove/force +mod_paren_on_return = remove # ignore/add/remove/force # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # false/true # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = false # false/true +mod_full_paren_if_bool = false # false/true # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = true # false/true +mod_remove_extra_semicolon = true # false/true # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 1 # number +mod_add_long_function_closebrace_comment = 1 # number # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 10 # number +mod_add_long_switch_closebrace_comment = 10 # number # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # false/true # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # false/true # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # false/true # # Comment modifications # # Try to wrap comments at cmt_witdth columns -cmt_width = 80 # number +cmt_width = 80 # number # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # false/true # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # false/true # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # false/true # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # false/true # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = true # false/true +cmt_cpp_to_c = true # false/true # Whether to put a star on subsequent comment lines -cmt_star_cont = true # false/true +cmt_star_cont = true # false/true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 1 # number +cmt_sp_before_star_cont = 1 # number # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # number # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitue $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # string # The filename that contains text to insert before a function implementation if the function isn't preceeded with a C/C++ comment. # Will substitue $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # string # The filename that contains text to insert before a class if the class isn't preceeded with a C/C++ comment. # Will substitue $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # string # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = remove # ignore/add/remove/force +pp_indent = remove # ignore/add/remove/force # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # false/true # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # ignore/add/remove/force # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # number # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # number # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # false/true # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # number # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true +pp_if_indent_code = false # false/true # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # false/true # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/func_class.cfg b/tests/config/func_class.cfg index 175caa997c..f51f19202f 100644 --- a/tests/config/func_class.cfg +++ b/tests/config/func_class.cfg @@ -1,5 +1,5 @@ -indent_class = true -nl_before_func_class_def = 3 -nl_before_func_class_proto = 1 -nl_before_func_body_def = 3 -nl_before_func_body_proto = 1 +indent_class = true +nl_before_func_class_def = 3 +nl_before_func_class_proto = 1 +nl_before_func_body_def = 3 +nl_before_func_body_proto = 1 diff --git a/tests/config/func_param.cfg b/tests/config/func_param.cfg index ee6e9d392c..63b350faa6 100644 --- a/tests/config/func_param.cfg +++ b/tests/config/func_param.cfg @@ -1,6 +1,6 @@ -sp_arith = add -sp_after_ptr_star = remove -sp_func_proto_paren = remove -sp_inside_fparen = remove -sp_paren_paren = remove -sp_after_tparen_close = remove +sp_arith = add +sp_after_ptr_star = remove +sp_func_proto_paren = remove +sp_inside_fparen = remove +sp_paren_paren = remove +sp_after_tparen_close = remove diff --git a/tests/config/func_wrap1.cfg b/tests/config/func_wrap1.cfg index 29d31ef945..c0d4fb8235 100644 --- a/tests/config/func_wrap1.cfg +++ b/tests/config/func_wrap1.cfg @@ -1,3 +1,3 @@ -set func_wrap FSUB -sp_inside_fparen = ignore +set func_wrap FSUB +sp_inside_fparen = ignore diff --git a/tests/config/func_wrap2.cfg b/tests/config/func_wrap2.cfg index 09a5160f9e..702f9dc8b1 100644 --- a/tests/config/func_wrap2.cfg +++ b/tests/config/func_wrap2.cfg @@ -1,3 +1,3 @@ -set func_wrap FSUB -sp_inside_fparen = force +set func_wrap FSUB +sp_inside_fparen = force diff --git a/tests/config/ger.cfg b/tests/config/ger.cfg index 0788d793ba..a1fae04cbd 100644 --- a/tests/config/ger.cfg +++ b/tests/config/ger.cfg @@ -1,357 +1,357 @@ # Uncrustify 0.52+svn -newlines = auto -input_tab_size = 8 -output_tab_size = 4 -string_escape_char = 92 -string_escape_char2 = 0 -indent_columns = 4 -indent_with_tabs = 1 -indent_align_string = false -indent_xml_string = 0 -indent_brace = 0 -indent_braces = false -indent_braces_no_func = false -indent_brace_parent = false -indent_namespace = false -indent_extern = false -indent_class = true -indent_class_colon = false -indent_else_if = true -indent_var_def_blk = 0 -indent_func_call_param = true -indent_func_def_param = true -indent_func_proto_param = true -indent_func_class_param = true -indent_func_ctor_var_param = true -indent_template_param = true -indent_func_param_double = true -indent_func_const = 0 -indent_func_throw = 0 -indent_member = 0 -indent_sing_line_comments = 0 -indent_relative_single_line_comments = false -indent_switch_case = 0 -indent_case_shift = 0 -indent_case_brace = 4 -indent_col1_comment = false -indent_label = 1 -indent_access_spec = 1 -indent_access_spec_body = false -indent_paren_nl = false -indent_paren_close = 1 -indent_comma_paren = false -indent_bool_paren = false -indent_square_nl = false -indent_preserve_sql = false -indent_align_assign = true -sp_arith = add -sp_assign = add -sp_before_assign = ignore -sp_after_assign = ignore -sp_enum_assign = add -sp_enum_before_assign = ignore -sp_enum_after_assign = ignore -sp_pp_concat = remove -sp_pp_stringify = remove -sp_bool = add -sp_compare = add -sp_inside_paren = ignore -sp_paren_paren = ignore -sp_balance_nested_parens = false -sp_paren_brace = add -sp_before_ptr_star = add -sp_before_unnamed_ptr_star = ignore -sp_between_ptr_star = remove -sp_after_ptr_star = remove -sp_after_ptr_star_func = remove -sp_before_ptr_star_func = add -sp_before_byref = remove -sp_before_unnamed_byref = ignore -sp_after_byref = remove -sp_after_byref_func = remove -sp_before_byref_func = add -sp_after_type = add -sp_template_angle = remove -sp_before_angle = remove -sp_inside_angle = remove -sp_after_angle = ignore -sp_angle_paren = remove -sp_angle_paren_empty = remove -sp_angle_word = add -sp_before_sparen = add -sp_inside_sparen = remove -sp_inside_sparen_close = ignore -sp_after_sparen = add -sp_sparen_brace = add -sp_invariant_paren = remove -sp_after_invariant_paren = add -sp_special_semi = add -sp_before_semi = remove -sp_before_semi_for = remove -sp_before_semi_for_empty = remove -sp_after_semi_for_empty = remove -sp_before_square = remove -sp_before_squares = remove -sp_inside_square = remove -sp_after_comma = add -sp_before_comma = remove -sp_after_class_colon = remove -sp_before_class_colon = remove -sp_before_case_colon = remove -sp_after_operator = add -sp_after_operator_sym = remove -sp_after_cast = remove -sp_inside_paren_cast = remove -sp_cpp_cast_paren = remove -sp_sizeof_paren = remove -sp_after_tag = ignore -sp_inside_braces_enum = add -sp_inside_braces_struct = add -sp_inside_braces = add -sp_inside_braces_empty = remove -sp_type_func = remove -sp_func_proto_paren = remove -sp_func_def_paren = remove -sp_inside_fparens = remove -sp_inside_fparen = remove -sp_square_fparen = remove -sp_fparen_brace = add -sp_func_call_paren = remove -sp_func_call_user_paren = remove -sp_func_class_paren = remove -sp_return_paren = add -sp_attribute_paren = remove -sp_defined_paren = remove -sp_throw_paren = remove -sp_macro = add -sp_macro_func = add -sp_else_brace = add -sp_brace_else = add -sp_brace_typedef = add -sp_catch_brace = add -sp_brace_catch = add -sp_finally_brace = add -sp_brace_finally = add -sp_try_brace = add -sp_getset_brace = add -sp_before_dc = remove -sp_after_dc = remove -sp_d_array_colon = ignore -sp_not = remove -sp_inv = remove -sp_addr = remove -sp_member = remove -sp_deref = remove -sp_sign = remove -sp_incdec = remove -sp_before_nl_cont = add -sp_after_oc_scope = remove -sp_after_oc_colon = add -sp_before_oc_colon = add -sp_after_send_oc_colon = add -sp_before_send_oc_colon = remove -sp_after_oc_type = add -sp_cond_colon = add -sp_cond_question = add -sp_case_label = ignore -sp_range = ignore -sp_cmt_cpp_start = add -align_keep_tabs = false -align_with_tabs = false -align_on_tabstop = false -align_number_right = false -align_func_params = false -align_same_func_call_params = false -align_var_def_span = 3 -align_var_def_star_style = 0 -align_var_def_amp_style = 0 -align_var_def_thresh = 5 -align_var_def_gap = 0 -align_var_def_colon = true -align_var_def_attribute = false -align_var_def_inline = true -align_assign_span = 0 -align_assign_thresh = 0 -align_enum_equ_span = 3 -align_enum_equ_thresh = 5 -align_var_struct_span = 2 -align_var_struct_thresh = 5 -align_var_struct_gap = 0 -align_struct_init_span = 3 -align_typedef_gap = 0 -align_typedef_span = 0 -align_typedef_func = 0 -align_typedef_star_style = 0 -align_typedef_amp_style = 0 -align_right_cmt_span = 4 -align_right_cmt_mix = true -align_right_cmt_gap = 0 -align_right_cmt_at_col = 1 -align_func_proto_span = 0 -align_func_proto_gap = 0 -align_on_operator = true -align_mix_var_proto = false -align_single_line_func = false -align_single_line_brace = false -align_single_line_brace_gap = 0 -align_oc_msg_spec_span = 0 -align_nl_cont = false -align_pp_define_gap = 0 -align_pp_define_span = 0 -align_left_shift = true -nl_collapse_empty_body = true -nl_assign_leave_one_liners = true -nl_class_leave_one_liners = true -nl_enum_leave_one_liners = true -nl_getset_leave_one_liners = true -nl_func_leave_one_liners = true -nl_if_leave_one_liners = false -nl_start_of_file = remove -nl_start_of_file_min = 0 -nl_end_of_file = add -nl_end_of_file_min = 2 -nl_assign_brace = ignore -nl_assign_square = ignore -nl_after_square_assign = ignore -nl_func_var_def_blk = 1 -nl_fcall_brace = add -nl_enum_brace = add -nl_struct_brace = add -nl_union_brace = add -nl_if_brace = add -nl_brace_else = add -nl_elseif_brace = add -nl_else_brace = add -nl_else_if = remove -nl_brace_finally = add -nl_finally_brace = add -nl_try_brace = add -nl_getset_brace = add -nl_for_brace = add -nl_catch_brace = add -nl_brace_catch = add -nl_while_brace = add -nl_do_brace = add -nl_brace_while = remove -nl_switch_brace = add -nl_multi_line_cond = true -nl_multi_line_define = true -nl_before_case = true -nl_before_throw = add -nl_after_case = true -nl_namespace_brace = add -nl_template_class = ignore -nl_class_brace = add -nl_class_init_args = ignore -nl_func_type_name = remove -nl_func_scope_name = remove -nl_func_proto_type_name = remove -nl_func_paren = ignore -nl_func_decl_start = ignore -nl_func_decl_args = ignore -nl_func_decl_end = ignore -nl_fdef_brace = add -nl_after_return = true -nl_return_expr = remove -nl_after_semicolon = true -nl_after_brace_open = true -nl_after_brace_open_cmt = true -nl_after_vbrace_open = true -nl_after_brace_close = false -nl_define_macro = false -nl_squeeze_ifdef = false -nl_before_if = ignore -nl_after_if = ignore -nl_before_for = ignore -nl_after_for = ignore -nl_before_while = ignore -nl_after_while = ignore -nl_before_switch = ignore -nl_after_switch = ignore -nl_before_do = ignore -nl_after_do = ignore -nl_ds_struct_enum_cmt = true -nl_ds_struct_enum_close_brace = false -nl_class_colon = remove -nl_create_if_one_liner = false -nl_create_for_one_liner = false -nl_create_while_one_liner = false -pos_arith = ignore -pos_assign = ignore -pos_bool = ignore -pos_comma = ignore -pos_class_comma = ignore -pos_class_colon = ignore -code_width = 200 -ls_for_split_full = false -ls_func_split_full = false -nl_max = 0 -nl_after_func_proto = 0 -nl_after_func_proto_group = 0 -nl_after_func_body = 2 -nl_after_func_body_one_liner = 0 -nl_before_block_comment = 0 -nl_before_c_comment = 0 -nl_before_cpp_comment = 0 -nl_after_multiline_comment = false -nl_before_access_spec = 1 -nl_after_access_spec = 0 -nl_comment_func_def = 0 -nl_after_try_catch_finally = 0 -nl_around_cs_property = 0 -nl_between_get_set = 0 -eat_blanks_after_open_brace = true -eat_blanks_before_close_brace = true -mod_full_brace_do = ignore -mod_full_brace_for = ignore -mod_full_brace_function = ignore -mod_full_brace_if = ignore -mod_full_brace_nl = 1 -mod_full_brace_while = ignore -mod_paren_on_return = remove -mod_pawn_semicolon = false -mod_full_paren_if_bool = false -mod_remove_extra_semicolon = false +newlines = auto +input_tab_size = 8 +output_tab_size = 4 +string_escape_char = 92 +string_escape_char2 = 0 +indent_columns = 4 +indent_with_tabs = 1 +indent_align_string = false +indent_xml_string = 0 +indent_brace = 0 +indent_braces = false +indent_braces_no_func = false +indent_brace_parent = false +indent_namespace = false +indent_extern = false +indent_class = true +indent_class_colon = false +indent_else_if = true +indent_var_def_blk = 0 +indent_func_call_param = true +indent_func_def_param = true +indent_func_proto_param = true +indent_func_class_param = true +indent_func_ctor_var_param = true +indent_template_param = true +indent_func_param_double = true +indent_func_const = 0 +indent_func_throw = 0 +indent_member = 0 +indent_sing_line_comments = 0 +indent_relative_single_line_comments = false +indent_switch_case = 0 +indent_case_shift = 0 +indent_case_brace = 4 +indent_col1_comment = false +indent_label = 1 +indent_access_spec = 1 +indent_access_spec_body = false +indent_paren_nl = false +indent_paren_close = 1 +indent_comma_paren = false +indent_bool_paren = false +indent_square_nl = false +indent_preserve_sql = false +indent_align_assign = true +sp_arith = add +sp_assign = add +sp_before_assign = ignore +sp_after_assign = ignore +sp_enum_assign = add +sp_enum_before_assign = ignore +sp_enum_after_assign = ignore +sp_pp_concat = remove +sp_pp_stringify = remove +sp_bool = add +sp_compare = add +sp_inside_paren = ignore +sp_paren_paren = ignore +sp_balance_nested_parens = false +sp_paren_brace = add +sp_before_ptr_star = add +sp_before_unnamed_ptr_star = ignore +sp_between_ptr_star = remove +sp_after_ptr_star = remove +sp_after_ptr_star_func = remove +sp_before_ptr_star_func = add +sp_before_byref = remove +sp_before_unnamed_byref = ignore +sp_after_byref = remove +sp_after_byref_func = remove +sp_before_byref_func = add +sp_after_type = add +sp_template_angle = remove +sp_before_angle = remove +sp_inside_angle = remove +sp_after_angle = ignore +sp_angle_paren = remove +sp_angle_paren_empty = remove +sp_angle_word = add +sp_before_sparen = add +sp_inside_sparen = remove +sp_inside_sparen_close = ignore +sp_after_sparen = add +sp_sparen_brace = add +sp_invariant_paren = remove +sp_after_invariant_paren = add +sp_special_semi = add +sp_before_semi = remove +sp_before_semi_for = remove +sp_before_semi_for_empty = remove +sp_after_semi_for_empty = remove +sp_before_square = remove +sp_before_squares = remove +sp_inside_square = remove +sp_after_comma = add +sp_before_comma = remove +sp_after_class_colon = remove +sp_before_class_colon = remove +sp_before_case_colon = remove +sp_after_operator = add +sp_after_operator_sym = remove +sp_after_cast = remove +sp_inside_paren_cast = remove +sp_cpp_cast_paren = remove +sp_sizeof_paren = remove +sp_after_tag = ignore +sp_inside_braces_enum = add +sp_inside_braces_struct = add +sp_inside_braces = add +sp_inside_braces_empty = remove +sp_type_func = remove +sp_func_proto_paren = remove +sp_func_def_paren = remove +sp_inside_fparens = remove +sp_inside_fparen = remove +sp_square_fparen = remove +sp_fparen_brace = add +sp_func_call_paren = remove +sp_func_call_user_paren = remove +sp_func_class_paren = remove +sp_return_paren = add +sp_attribute_paren = remove +sp_defined_paren = remove +sp_throw_paren = remove +sp_macro = add +sp_macro_func = add +sp_else_brace = add +sp_brace_else = add +sp_brace_typedef = add +sp_catch_brace = add +sp_brace_catch = add +sp_finally_brace = add +sp_brace_finally = add +sp_try_brace = add +sp_getset_brace = add +sp_before_dc = remove +sp_after_dc = remove +sp_d_array_colon = ignore +sp_not = remove +sp_inv = remove +sp_addr = remove +sp_member = remove +sp_deref = remove +sp_sign = remove +sp_incdec = remove +sp_before_nl_cont = add +sp_after_oc_scope = remove +sp_after_oc_colon = add +sp_before_oc_colon = add +sp_after_send_oc_colon = add +sp_before_send_oc_colon = remove +sp_after_oc_type = add +sp_cond_colon = add +sp_cond_question = add +sp_case_label = ignore +sp_range = ignore +sp_cmt_cpp_start = add +align_keep_tabs = false +align_with_tabs = false +align_on_tabstop = false +align_number_right = false +align_func_params = false +align_same_func_call_params = false +align_var_def_span = 3 +align_var_def_star_style = 0 +align_var_def_amp_style = 0 +align_var_def_thresh = 5 +align_var_def_gap = 0 +align_var_def_colon = true +align_var_def_attribute = false +align_var_def_inline = true +align_assign_span = 0 +align_assign_thresh = 0 +align_enum_equ_span = 3 +align_enum_equ_thresh = 5 +align_var_struct_span = 2 +align_var_struct_thresh = 5 +align_var_struct_gap = 0 +align_struct_init_span = 3 +align_typedef_gap = 0 +align_typedef_span = 0 +align_typedef_func = 0 +align_typedef_star_style = 0 +align_typedef_amp_style = 0 +align_right_cmt_span = 4 +align_right_cmt_mix = true +align_right_cmt_gap = 0 +align_right_cmt_at_col = 1 +align_func_proto_span = 0 +align_func_proto_gap = 0 +align_on_operator = true +align_mix_var_proto = false +align_single_line_func = false +align_single_line_brace = false +align_single_line_brace_gap = 0 +align_oc_msg_spec_span = 0 +align_nl_cont = false +align_pp_define_gap = 0 +align_pp_define_span = 0 +align_left_shift = true +nl_collapse_empty_body = true +nl_assign_leave_one_liners = true +nl_class_leave_one_liners = true +nl_enum_leave_one_liners = true +nl_getset_leave_one_liners = true +nl_func_leave_one_liners = true +nl_if_leave_one_liners = false +nl_start_of_file = remove +nl_start_of_file_min = 0 +nl_end_of_file = add +nl_end_of_file_min = 2 +nl_assign_brace = ignore +nl_assign_square = ignore +nl_after_square_assign = ignore +nl_func_var_def_blk = 1 +nl_fcall_brace = add +nl_enum_brace = add +nl_struct_brace = add +nl_union_brace = add +nl_if_brace = add +nl_brace_else = add +nl_elseif_brace = add +nl_else_brace = add +nl_else_if = remove +nl_brace_finally = add +nl_finally_brace = add +nl_try_brace = add +nl_getset_brace = add +nl_for_brace = add +nl_catch_brace = add +nl_brace_catch = add +nl_while_brace = add +nl_do_brace = add +nl_brace_while = remove +nl_switch_brace = add +nl_multi_line_cond = true +nl_multi_line_define = true +nl_before_case = true +nl_before_throw = add +nl_after_case = true +nl_namespace_brace = add +nl_template_class = ignore +nl_class_brace = add +nl_class_init_args = ignore +nl_func_type_name = remove +nl_func_scope_name = remove +nl_func_proto_type_name = remove +nl_func_paren = ignore +nl_func_decl_start = ignore +nl_func_decl_args = ignore +nl_func_decl_end = ignore +nl_fdef_brace = add +nl_after_return = true +nl_return_expr = remove +nl_after_semicolon = true +nl_after_brace_open = true +nl_after_brace_open_cmt = true +nl_after_vbrace_open = true +nl_after_brace_close = false +nl_define_macro = false +nl_squeeze_ifdef = false +nl_before_if = ignore +nl_after_if = ignore +nl_before_for = ignore +nl_after_for = ignore +nl_before_while = ignore +nl_after_while = ignore +nl_before_switch = ignore +nl_after_switch = ignore +nl_before_do = ignore +nl_after_do = ignore +nl_ds_struct_enum_cmt = true +nl_ds_struct_enum_close_brace = false +nl_class_colon = remove +nl_create_if_one_liner = false +nl_create_for_one_liner = false +nl_create_while_one_liner = false +pos_arith = ignore +pos_assign = ignore +pos_bool = ignore +pos_comma = ignore +pos_class_comma = ignore +pos_class_colon = ignore +code_width = 200 +ls_for_split_full = false +ls_func_split_full = false +nl_max = 0 +nl_after_func_proto = 0 +nl_after_func_proto_group = 0 +nl_after_func_body = 2 +nl_after_func_body_one_liner = 0 +nl_before_block_comment = 0 +nl_before_c_comment = 0 +nl_before_cpp_comment = 0 +nl_after_multiline_comment = false +nl_before_access_spec = 1 +nl_after_access_spec = 0 +nl_comment_func_def = 0 +nl_after_try_catch_finally = 0 +nl_around_cs_property = 0 +nl_between_get_set = 0 +eat_blanks_after_open_brace = true +eat_blanks_before_close_brace = true +mod_full_brace_do = ignore +mod_full_brace_for = ignore +mod_full_brace_function = ignore +mod_full_brace_if = ignore +mod_full_brace_nl = 1 +mod_full_brace_while = ignore +mod_paren_on_return = remove +mod_pawn_semicolon = false +mod_full_paren_if_bool = false +mod_remove_extra_semicolon = false mod_add_long_function_closebrace_comment = 1000 -mod_add_long_switch_closebrace_comment = 500 -mod_add_long_ifdef_endif_comment = 1 -mod_add_long_ifdef_else_comment = 1 -mod_sort_import = true -mod_sort_using = true -mod_sort_include = false -mod_move_case_break = false -mod_remove_empty_return = true -cmt_width = 0 -cmt_indent_multi = true -cmt_c_group = false -cmt_c_nl_start = true -cmt_c_nl_end = true -cmt_cpp_group = true -cmt_cpp_nl_start = false -cmt_cpp_nl_end = false -cmt_cpp_to_c = false -cmt_star_cont = true -cmt_sp_before_star_cont = 0 -cmt_sp_after_star_cont = 0 -cmt_multi_check_last = true -cmt_insert_file_header = "" -cmt_insert_file_footer = "" -cmt_insert_func_header = "" -cmt_insert_class_header = "" -cmt_insert_before_preproc = false -pp_indent = ignore -pp_indent_at_level = false -pp_indent_count = 1 -pp_space = ignore -pp_space_count = 1 -pp_indent_region = 0 -pp_region_indent_code = false -pp_indent_if = 0 -pp_if_indent_code = false -pp_define_at_level = false -type BIO -set type_wrap LHASH_OF STACK_OF -set FUNCTION TYPEDEF_D2I_OF -type stname -type type +mod_add_long_switch_closebrace_comment = 500 +mod_add_long_ifdef_endif_comment = 1 +mod_add_long_ifdef_else_comment = 1 +mod_sort_import = true +mod_sort_using = true +mod_sort_include = false +mod_move_case_break = false +mod_remove_empty_return = true +cmt_width = 0 +cmt_indent_multi = true +cmt_c_group = false +cmt_c_nl_start = true +cmt_c_nl_end = true +cmt_cpp_group = true +cmt_cpp_nl_start = false +cmt_cpp_nl_end = false +cmt_cpp_to_c = false +cmt_star_cont = true +cmt_sp_before_star_cont = 0 +cmt_sp_after_star_cont = 0 +cmt_multi_check_last = true +cmt_insert_file_header = "" +cmt_insert_file_footer = "" +cmt_insert_func_header = "" +cmt_insert_class_header = "" +cmt_insert_before_preproc = false +pp_indent = ignore +pp_indent_at_level = false +pp_indent_count = 1 +pp_space = ignore +pp_space_count = 1 +pp_indent_region = 0 +pp_region_indent_code = false +pp_indent_if = 0 +pp_if_indent_code = false +pp_define_at_level = false +type BIO +set type_wrap LHASH_OF STACK_OF +set FUNCTION TYPEDEF_D2I_OF +type stname +type type diff --git a/tests/config/getset.cfg b/tests/config/getset.cfg index ab3956c887..69ca3e3167 100644 --- a/tests/config/getset.cfg +++ b/tests/config/getset.cfg @@ -2,32 +2,32 @@ # Mono library format # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 8 # new tab size -indent_columns = output_tab_size -indent_label = 1 # pos: absolute col, neg: relative column +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 8 # new tab size +indent_columns = output_tab_size +indent_label = 1 # pos: absolute col, neg: relative column # indent_align_string = False # align broken strings # brace_indent = 0 -indent_func_call_param = true # use indent tabstop +indent_func_call_param = true # use indent tabstop -nl_enum_brace = remove # "enum {" vs "enum \n {" -nl_union_brace = remove # "union {" vs "union \n {" -nl_struct_brace = remove # "struct {" vs "struct \n {" -nl_do_brace = remove # "do {" vs "do \n {" -nl_if_brace = remove # "if () {" vs "if () \n {" -nl_for_brace = remove # "for () {" vs "for () \n {" -nl_else_brace = remove # "else {" vs "else \n {" -nl_while_brace = remove # "while () {" vs "while () \n {" -nl_switch_brace = remove # "switch () {" vs "switch () \n {" -nl_func_var_def_blk = 1 -nl_before_case = 1 -nl_fcall_brace = remove # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_enum_brace = remove # "enum {" vs "enum \n {" +nl_union_brace = remove # "union {" vs "union \n {" +nl_struct_brace = remove # "struct {" vs "struct \n {" +nl_do_brace = remove # "do {" vs "do \n {" +nl_if_brace = remove # "if () {" vs "if () \n {" +nl_for_brace = remove # "for () {" vs "for () \n {" +nl_else_brace = remove # "else {" vs "else \n {" +nl_while_brace = remove # "while () {" vs "while () \n {" +nl_switch_brace = remove # "switch () {" vs "switch () \n {" +nl_func_var_def_blk = 1 +nl_before_case = 1 +nl_fcall_brace = remove # "foo() {" vs "foo()\n{" +nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" # nl_after_return = TRUE -nl_brace_while = remove -nl_brace_else = add -nl_squeeze_ifdef = TRUE +nl_brace_while = remove +nl_brace_else = add +nl_squeeze_ifdef = TRUE # mod_paren_on_return = add # "return 1;" vs "return (1);" # mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" @@ -35,31 +35,31 @@ nl_squeeze_ifdef = TRUE # mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" # mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" -sp_before_semi = remove -sp_paren_paren = remove # space between (( and )) -sp_return_paren = remove # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" -sp_inside_paren = remove -sp_inside_fparen = remove -sp_inside_sparen = remove -sp_inside_square = remove -sp_before_square = add +sp_before_semi = remove +sp_paren_paren = remove # space between (( and )) +sp_return_paren = remove # "return (1);" vs "return(1);" +sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" +sp_before_sparen = force # "if (" vs "if(" +sp_after_sparen = force # "if () {" vs "if (){" +sp_after_cast = remove # "(int) a" vs "(int)a" +sp_inside_braces = force # "{ 1 }" vs "{1}" +sp_inside_braces_struct = force # "{ 1 }" vs "{1}" +sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_inside_paren = remove +sp_inside_fparen = remove +sp_inside_sparen = remove +sp_inside_square = remove +sp_before_square = add #sp_type_func = ignore -sp_assign = force -sp_arith = force -sp_bool = force -sp_compare = force -sp_assign = force -sp_after_comma = force -sp_func_def_paren = force # "int foo (){" vs "int foo(){" -sp_func_call_paren = force # "foo (" vs "foo(" -sp_func_proto_paren = force # "int foo ();" vs "int foo();" +sp_assign = force +sp_arith = force +sp_bool = force +sp_compare = force +sp_assign = force +sp_after_comma = force +sp_func_def_paren = force # "int foo (){" vs "int foo(){" +sp_func_call_paren = force # "foo (" vs "foo(" +sp_func_proto_paren = force # "int foo ();" vs "int foo();" # align_with_tabs = FALSE # use tabs to align # align_on_tabstop = FALSE # align on tabstops @@ -67,7 +67,7 @@ sp_func_proto_paren = force # "int foo ();" vs "int foo();" # align_nl_cont = TRUE # align_var_def_span = 2 # align_var_def_inline = TRUE -align_var_def_star_style = 1 +align_var_def_star_style = 1 # align_var_def_colon = TRUE # align_assign_span = 1 # align_struct_init_span = 3 @@ -79,12 +79,12 @@ align_var_def_star_style = 1 # align_typedef_span = 5 # align_typedef_gap = 3 -cmt_star_cont = TRUE +cmt_star_cont = TRUE -eat_blanks_before_close_brace = TRUE -eat_blanks_after_open_brace = TRUE +eat_blanks_before_close_brace = TRUE +eat_blanks_after_open_brace = TRUE -nl_getset_brace = force -sp_getset_brace = force -nl_after_brace_open = true +nl_getset_brace = force +sp_getset_brace = force +nl_after_brace_open = true diff --git a/tests/config/gh137.cfg b/tests/config/gh137.cfg index 844a0f13aa..0f0d13c6e1 100644 --- a/tests/config/gh137.cfg +++ b/tests/config/gh137.cfg @@ -1,6 +1,6 @@ -indent_with_tabs = 0 -output_tab_size = 4 -indent_columns = 4 -indent_oc_block = true -indent_oc_block_msg = 0 +indent_with_tabs = 0 +output_tab_size = 4 +indent_columns = 4 +indent_oc_block = true +indent_oc_block_msg = 0 diff --git a/tests/config/gh293.a.cfg b/tests/config/gh293.a.cfg index a5476c5d93..34ec121ed2 100644 --- a/tests/config/gh293.a.cfg +++ b/tests/config/gh293.a.cfg @@ -2,16 +2,16 @@ # uncrustify config file for objective-c and objective-c++ # -indent_with_tabs = 2 # 1=indent to level only, 2=indent with tabs -output_tab_size = 4 # new tab size -indent_columns = output_tab_size -indent_label = 2 # pos : absolute col, neg : relative column -indent_align_assign = FALSE -indent_oc_block = true +indent_with_tabs = 2 # 1=indent to level only, 2=indent with tabs +output_tab_size = 4 # new tab size +indent_columns = output_tab_size +indent_label = 2 # pos : absolute col, neg : relative column +indent_align_assign = FALSE +indent_oc_block = true indent_oc_block_msg_xcode_style = false indent_oc_msg_prioritize_first_colon = true -align_keep_extra_space = FALSE # keep extra space or remove it from the beginning of a line?":" -indent_braces = true +align_keep_extra_space = FALSE # keep extra space or remove it from the beginning of a line?":" +indent_braces = true #indent_paren_open_brace = true # @@ -19,135 +19,135 @@ indent_braces = true # # indent_brace = 0 -indent_switch_case = indent_columns +indent_switch_case = indent_columns # # Inter -symbol newlines # -nl_enum_brace = remove # "enum {" vs "enum \n {" -nl_union_brace = remove # "union {" vs "union \n {" -nl_struct_brace = remove # "struct {" vs "struct \n {" -nl_do_brace = remove # "do {" vs "do \n {" -nl_if_brace = remove # "if () {" vs "if () \n {" -nl_for_brace = remove # "for () {" vs "for () \n {" -nl_else_brace = remove # "else {" vs "else \n {" -nl_while_brace = remove # "while () {" vs "while () \n {" -nl_switch_brace = remove # "switch () {" vs "switch () \n {" -nl_brace_while = add # "} while" vs "} \n while" - cuddle while -nl_brace_else = add # "} else" vs "} \n else" - cuddle else -nl_func_var_def_blk = 1 # add new lines after a block of variable decls -nl_fcall_brace = add # "list_for_each() {" vs "list_for_each()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" -nl_after_return = false +nl_enum_brace = remove # "enum {" vs "enum \n {" +nl_union_brace = remove # "union {" vs "union \n {" +nl_struct_brace = remove # "struct {" vs "struct \n {" +nl_do_brace = remove # "do {" vs "do \n {" +nl_if_brace = remove # "if () {" vs "if () \n {" +nl_for_brace = remove # "for () {" vs "for () \n {" +nl_else_brace = remove # "else {" vs "else \n {" +nl_while_brace = remove # "while () {" vs "while () \n {" +nl_switch_brace = remove # "switch () {" vs "switch () \n {" +nl_brace_while = add # "} while" vs "} \n while" - cuddle while +nl_brace_else = add # "} else" vs "} \n else" - cuddle else +nl_func_var_def_blk = 1 # add new lines after a block of variable decls +nl_fcall_brace = add # "list_for_each() {" vs "list_for_each()\n{" +nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_after_return = false #nl_before_case = true #ml_after_case = true # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = true # false/true +nl_multi_line_define = true # false/true # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = true # false/true +nl_multi_line_cond = true # false/true # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # number # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 2 # number +nl_after_func_body_one_liner = 2 # number # # Source code modifications # -mod_paren_on_return = ignore # "return 1;" vs "return (1);" -mod_full_brace_if = force # "if (a) a--;" vs "if (a) { a--; }" -mod_full_brace_for = force # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = force # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = force # "while (a) a--;" vs "while (a) { a--; }" -mod_full_brace_nl = 3 # don 't remove if more than 3 newlines -mod_add_long_ifdef_endif_comment = 20 -mod_add_long_ifdef_else_comment = mod_add_long_ifdef_else_comment -mod_add_long_switch_closebrace_comment = mod_add_long_ifdef_else_comment -mod_add_long_function_closebrace_comment = mod_add_long_ifdef_else_comment +mod_paren_on_return = ignore # "return 1;" vs "return (1);" +mod_full_brace_if = force # "if (a) a--;" vs "if (a) { a--; }" +mod_full_brace_for = force # "for () a--;" vs "for () { a--; }" +mod_full_brace_do = force # "do a--; while ();" vs "do { a--; } while ();" +mod_full_brace_while = force # "while (a) a--;" vs "while (a) { a--; }" +mod_full_brace_nl = 3 # don 't remove if more than 3 newlines +mod_add_long_ifdef_endif_comment = 20 +mod_add_long_ifdef_else_comment = mod_add_long_ifdef_else_comment +mod_add_long_switch_closebrace_comment = mod_add_long_ifdef_else_comment +mod_add_long_function_closebrace_comment = mod_add_long_ifdef_else_comment # # Inter-character spacing options # # sp_return_paren = force # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = add # "{ 1 }" vs "{1}" -sp_inside_braces_struct = add # "{ 1 }" vs "{1}" -sp_inside_braces_enum = add # "{ 1 }" vs "{1}" -sp_inside_fparen = remove # "func( param )" vs "func(param)" -sp_inside_sparen = remove -sp_paren_brace = force +sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" +sp_before_sparen = force # "if (" vs "if(" +sp_after_sparen = force # "if () {" vs "if (){" +sp_after_cast = remove # "(int) a" vs "(int)a" +sp_inside_braces = add # "{ 1 }" vs "{1}" +sp_inside_braces_struct = add # "{ 1 }" vs "{1}" +sp_inside_braces_enum = add # "{ 1 }" vs "{1}" +sp_inside_fparen = remove # "func( param )" vs "func(param)" +sp_inside_sparen = remove +sp_paren_brace = force # Add or remove space between ') ' and ' {' of function -sp_fparen_brace = force # ignore/add/remove/force -sp_assign = add -sp_arith = add -sp_bool = add -sp_compare = add -sp_assign = add -sp_after_comma = add -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" -sp_before_ptr_star = force -sp_after_ptr_star = remove -sp_before_unnamed_ptr_star = ignore -sp_between_ptr_star = remove -sp_after_ptr_star_func = force -sp_before_ptr_star_func = force -sp_cmt_cpp_start = add -sp_cond_question = add -sp_cond_colon = add -sp_cond_ternary_short = remove # a ?: b (as opposed to a ? b : c) -sp_else_brace = force -sp_brace_else = force -sp_after_class_colon = force -sp_before_class_colon = force -sp_before_case_colon = remove +sp_fparen_brace = force # ignore/add/remove/force +sp_assign = add +sp_arith = add +sp_bool = add +sp_compare = add +sp_assign = add +sp_after_comma = add +sp_func_def_paren = remove # "int foo (){" vs "int foo(){" +sp_func_call_paren = remove # "foo (" vs "foo(" +sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_before_ptr_star = force +sp_after_ptr_star = remove +sp_before_unnamed_ptr_star = ignore +sp_between_ptr_star = remove +sp_after_ptr_star_func = force +sp_before_ptr_star_func = force +sp_cmt_cpp_start = add +sp_cond_question = add +sp_cond_colon = add +sp_cond_ternary_short = remove # a ?: b (as opposed to a ? b : c) +sp_else_brace = force +sp_brace_else = force +sp_after_class_colon = force +sp_before_class_colon = force +sp_before_case_colon = remove #sp_after_case_colon = force #sp_case_label = force # Objective-C specifics -sp_before_oc_colon = remove -sp_after_oc_colon = remove -sp_after_oc_scope = force -sp_after_oc_type = remove -sp_after_oc_return_type = remove -sp_before_send_oc_colon = remove -sp_after_send_oc_colon = remove -sp_after_oc_at_sel = remove -sp_before_oc_block_caret = remove # should have a space in most cases but it looks kinda ugly after a colon in a list of arguments -sp_after_oc_block_caret = remove +sp_before_oc_colon = remove +sp_after_oc_colon = remove +sp_after_oc_scope = force +sp_after_oc_type = remove +sp_after_oc_return_type = remove +sp_before_send_oc_colon = remove +sp_after_send_oc_colon = remove +sp_after_oc_at_sel = remove +sp_before_oc_block_caret = remove # should have a space in most cases but it looks kinda ugly after a colon in a list of arguments +sp_after_oc_block_caret = remove # # Aligning stuff # -align_with_tabs = False # use tabs to align -align_on_tabstop = False # align on tabstops +align_with_tabs = False # use tabs to align +align_on_tabstop = False # align on tabstops # align_keep_tabs = True -align_enum_equ_span = 4 # '=' in enum definition +align_enum_equ_span = 4 # '=' in enum definition # align_nl_cont = True -align_var_def_span = 0 -align_var_def_inline = False +align_var_def_span = 0 +align_var_def_inline = False #align_var_def_star = False -align_var_def_colon = False -align_assign_span = 0 -align_struct_init_span = 4 # align stuff in a structure init '= { } ' -align_right_cmt_span = 8 -align_right_cmt_gap = 8 -align_pp_define_span = 8 -align_typedef_span = 5 -align_typedef_gap = 3 +align_var_def_colon = False +align_assign_span = 0 +align_struct_init_span = 4 # align stuff in a structure init '= { } ' +align_right_cmt_span = 8 +align_right_cmt_gap = 8 +align_pp_define_span = 8 +align_typedef_span = 5 +align_typedef_gap = 3 # Objective-C specifics -align_oc_msg_colon_span = 10 # align parameters in an Obj-C message on the ' : ' but stop after this many lines (0=don't align) -align_oc_msg_spec_span = 0 # the span for aligning ObjC msg spec (0=don 't align) -align_oc_decl_colon = true +align_oc_msg_colon_span = 10 # align parameters in an Obj-C message on the ' : ' but stop after this many lines (0=don't align) +align_oc_msg_spec_span = 0 # the span for aligning ObjC msg spec (0=don 't align) +align_oc_decl_colon = true # # Line Splitting options # @@ -158,8 +158,8 @@ align_oc_decl_colon = true # Comment modifications # -cmt_star_cont = True # Whether to put a star on subsequent comment lines +cmt_star_cont = True # Whether to put a star on subsequent comment lines -eat_blanks_before_close_brace = TRUE -eat_blanks_after_open_brace = TRUE +eat_blanks_before_close_brace = TRUE +eat_blanks_after_open_brace = TRUE diff --git a/tests/config/gh293.b.cfg b/tests/config/gh293.b.cfg index c83cae0630..39da5d40b6 100644 --- a/tests/config/gh293.b.cfg +++ b/tests/config/gh293.b.cfg @@ -2,16 +2,16 @@ # uncrustify config file for objective-c and objective-c++ # -indent_with_tabs = 2 # 1=indent to level only, 2=indent with tabs -output_tab_size = 4 # new tab size -indent_columns = output_tab_size -indent_label = 2 # pos : absolute col, neg : relative column -indent_align_assign = FALSE -indent_oc_block = true +indent_with_tabs = 2 # 1=indent to level only, 2=indent with tabs +output_tab_size = 4 # new tab size +indent_columns = output_tab_size +indent_label = 2 # pos : absolute col, neg : relative column +indent_align_assign = FALSE +indent_oc_block = true indent_oc_block_msg_xcode_style = false indent_oc_msg_prioritize_first_colon = true -align_keep_extra_space = FALSE # keep extra space or remove it from the beginning of a line?":" -indent_braces = false +align_keep_extra_space = FALSE # keep extra space or remove it from the beginning of a line?":" +indent_braces = false #indent_paren_open_brace = true # @@ -19,135 +19,135 @@ indent_braces = false # # indent_brace = 0 -indent_switch_case = indent_columns +indent_switch_case = indent_columns # # Inter -symbol newlines # -nl_enum_brace = remove # "enum {" vs "enum \n {" -nl_union_brace = remove # "union {" vs "union \n {" -nl_struct_brace = remove # "struct {" vs "struct \n {" -nl_do_brace = remove # "do {" vs "do \n {" -nl_if_brace = remove # "if () {" vs "if () \n {" -nl_for_brace = remove # "for () {" vs "for () \n {" -nl_else_brace = remove # "else {" vs "else \n {" -nl_while_brace = remove # "while () {" vs "while () \n {" -nl_switch_brace = remove # "switch () {" vs "switch () \n {" -nl_brace_while = add # "} while" vs "} \n while" - cuddle while -nl_brace_else = add # "} else" vs "} \n else" - cuddle else -nl_func_var_def_blk = 1 # add new lines after a block of variable decls -nl_fcall_brace = add # "list_for_each() {" vs "list_for_each()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" -nl_after_return = false +nl_enum_brace = remove # "enum {" vs "enum \n {" +nl_union_brace = remove # "union {" vs "union \n {" +nl_struct_brace = remove # "struct {" vs "struct \n {" +nl_do_brace = remove # "do {" vs "do \n {" +nl_if_brace = remove # "if () {" vs "if () \n {" +nl_for_brace = remove # "for () {" vs "for () \n {" +nl_else_brace = remove # "else {" vs "else \n {" +nl_while_brace = remove # "while () {" vs "while () \n {" +nl_switch_brace = remove # "switch () {" vs "switch () \n {" +nl_brace_while = add # "} while" vs "} \n while" - cuddle while +nl_brace_else = add # "} else" vs "} \n else" - cuddle else +nl_func_var_def_blk = 1 # add new lines after a block of variable decls +nl_fcall_brace = add # "list_for_each() {" vs "list_for_each()\n{" +nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_after_return = false #nl_before_case = true #ml_after_case = true # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = true # false/true +nl_multi_line_define = true # false/true # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = true # false/true +nl_multi_line_cond = true # false/true # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # number # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 2 # number +nl_after_func_body_one_liner = 2 # number # # Source code modifications # -mod_paren_on_return = ignore # "return 1;" vs "return (1);" -mod_full_brace_if = force # "if (a) a--;" vs "if (a) { a--; }" -mod_full_brace_for = force # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = force # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = force # "while (a) a--;" vs "while (a) { a--; }" -mod_full_brace_nl = 3 # don 't remove if more than 3 newlines -mod_add_long_ifdef_endif_comment = 20 -mod_add_long_ifdef_else_comment = mod_add_long_ifdef_else_comment -mod_add_long_switch_closebrace_comment = mod_add_long_ifdef_else_comment -mod_add_long_function_closebrace_comment = mod_add_long_ifdef_else_comment +mod_paren_on_return = ignore # "return 1;" vs "return (1);" +mod_full_brace_if = force # "if (a) a--;" vs "if (a) { a--; }" +mod_full_brace_for = force # "for () a--;" vs "for () { a--; }" +mod_full_brace_do = force # "do a--; while ();" vs "do { a--; } while ();" +mod_full_brace_while = force # "while (a) a--;" vs "while (a) { a--; }" +mod_full_brace_nl = 3 # don 't remove if more than 3 newlines +mod_add_long_ifdef_endif_comment = 20 +mod_add_long_ifdef_else_comment = mod_add_long_ifdef_else_comment +mod_add_long_switch_closebrace_comment = mod_add_long_ifdef_else_comment +mod_add_long_function_closebrace_comment = mod_add_long_ifdef_else_comment # # Inter-character spacing options # # sp_return_paren = force # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = add # "{ 1 }" vs "{1}" -sp_inside_braces_struct = add # "{ 1 }" vs "{1}" -sp_inside_braces_enum = add # "{ 1 }" vs "{1}" -sp_inside_fparen = remove # "func( param )" vs "func(param)" -sp_inside_sparen = remove -sp_paren_brace = force +sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" +sp_before_sparen = force # "if (" vs "if(" +sp_after_sparen = force # "if () {" vs "if (){" +sp_after_cast = remove # "(int) a" vs "(int)a" +sp_inside_braces = add # "{ 1 }" vs "{1}" +sp_inside_braces_struct = add # "{ 1 }" vs "{1}" +sp_inside_braces_enum = add # "{ 1 }" vs "{1}" +sp_inside_fparen = remove # "func( param )" vs "func(param)" +sp_inside_sparen = remove +sp_paren_brace = force # Add or remove space between ') ' and ' {' of function -sp_fparen_brace = force # ignore/add/remove/force -sp_assign = add -sp_arith = add -sp_bool = add -sp_compare = add -sp_assign = add -sp_after_comma = add -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" -sp_before_ptr_star = force -sp_after_ptr_star = remove -sp_before_unnamed_ptr_star = ignore -sp_between_ptr_star = remove -sp_after_ptr_star_func = force -sp_before_ptr_star_func = force -sp_cmt_cpp_start = add -sp_cond_question = add -sp_cond_colon = add -sp_cond_ternary_short = remove # a ?: b (as opposed to a ? b : c) -sp_else_brace = force -sp_brace_else = force -sp_after_class_colon = force -sp_before_class_colon = force -sp_before_case_colon = remove +sp_fparen_brace = force # ignore/add/remove/force +sp_assign = add +sp_arith = add +sp_bool = add +sp_compare = add +sp_assign = add +sp_after_comma = add +sp_func_def_paren = remove # "int foo (){" vs "int foo(){" +sp_func_call_paren = remove # "foo (" vs "foo(" +sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_before_ptr_star = force +sp_after_ptr_star = remove +sp_before_unnamed_ptr_star = ignore +sp_between_ptr_star = remove +sp_after_ptr_star_func = force +sp_before_ptr_star_func = force +sp_cmt_cpp_start = add +sp_cond_question = add +sp_cond_colon = add +sp_cond_ternary_short = remove # a ?: b (as opposed to a ? b : c) +sp_else_brace = force +sp_brace_else = force +sp_after_class_colon = force +sp_before_class_colon = force +sp_before_case_colon = remove #sp_after_case_colon = force #sp_case_label = force # Objective-C specifics -sp_before_oc_colon = remove -sp_after_oc_colon = remove -sp_after_oc_scope = force -sp_after_oc_type = remove -sp_after_oc_return_type = remove -sp_before_send_oc_colon = remove -sp_after_send_oc_colon = remove -sp_after_oc_at_sel = remove -sp_before_oc_block_caret = remove # should have a space in most cases but it looks kinda ugly after a colon in a list of arguments -sp_after_oc_block_caret = remove +sp_before_oc_colon = remove +sp_after_oc_colon = remove +sp_after_oc_scope = force +sp_after_oc_type = remove +sp_after_oc_return_type = remove +sp_before_send_oc_colon = remove +sp_after_send_oc_colon = remove +sp_after_oc_at_sel = remove +sp_before_oc_block_caret = remove # should have a space in most cases but it looks kinda ugly after a colon in a list of arguments +sp_after_oc_block_caret = remove # # Aligning stuff # -align_with_tabs = False # use tabs to align -align_on_tabstop = False # align on tabstops +align_with_tabs = False # use tabs to align +align_on_tabstop = False # align on tabstops # align_keep_tabs = True -align_enum_equ_span = 4 # '=' in enum definition +align_enum_equ_span = 4 # '=' in enum definition # align_nl_cont = True -align_var_def_span = 0 -align_var_def_inline = False +align_var_def_span = 0 +align_var_def_inline = False #align_var_def_star = False -align_var_def_colon = False -align_assign_span = 0 -align_struct_init_span = 4 # align stuff in a structure init '= { } ' -align_right_cmt_span = 8 -align_right_cmt_gap = 8 -align_pp_define_span = 8 -align_typedef_span = 5 -align_typedef_gap = 3 +align_var_def_colon = False +align_assign_span = 0 +align_struct_init_span = 4 # align stuff in a structure init '= { } ' +align_right_cmt_span = 8 +align_right_cmt_gap = 8 +align_pp_define_span = 8 +align_typedef_span = 5 +align_typedef_gap = 3 # Objective-C specifics -align_oc_msg_colon_span = 10 # align parameters in an Obj-C message on the ' : ' but stop after this many lines (0=don't align) -align_oc_msg_spec_span = 0 # the span for aligning ObjC msg spec (0=don 't align) -align_oc_decl_colon = true +align_oc_msg_colon_span = 10 # align parameters in an Obj-C message on the ' : ' but stop after this many lines (0=don't align) +align_oc_msg_spec_span = 0 # the span for aligning ObjC msg spec (0=don 't align) +align_oc_decl_colon = true # # Line Splitting options # @@ -158,8 +158,8 @@ align_oc_decl_colon = true # Comment modifications # -cmt_star_cont = True # Whether to put a star on subsequent comment lines +cmt_star_cont = True # Whether to put a star on subsequent comment lines -eat_blanks_before_close_brace = TRUE -eat_blanks_after_open_brace = TRUE +eat_blanks_before_close_brace = TRUE +eat_blanks_after_open_brace = TRUE diff --git a/tests/config/gh419.cfg b/tests/config/gh419.cfg index 804890973e..8d44cc3ba6 100644 --- a/tests/config/gh419.cfg +++ b/tests/config/gh419.cfg @@ -1 +1 @@ -mod_full_brace_function = force +mod_full_brace_function = force diff --git a/tests/config/i1165.cfg b/tests/config/i1165.cfg index 3849bf8522..0d78de4505 100644 --- a/tests/config/i1165.cfg +++ b/tests/config/i1165.cfg @@ -1,2 +1,2 @@ -indent_columns = 4 -indent_with_tabs = 0 +indent_columns = 4 +indent_with_tabs = 0 diff --git a/tests/config/i1181.cfg b/tests/config/i1181.cfg index 1f0e4cb6ac..d4730a406e 100644 --- a/tests/config/i1181.cfg +++ b/tests/config/i1181.cfg @@ -1,2 +1,2 @@ nl_if_leave_one_liners = true -nl_if_brace = remove \ No newline at end of file +nl_if_brace = remove diff --git a/tests/config/i683.cfg b/tests/config/i683.cfg index eca4204063..f50224ac55 100644 --- a/tests/config/i683.cfg +++ b/tests/config/i683.cfg @@ -1,7 +1,7 @@ #https://github.com/uncrustify/uncrustify/issues/683 # # enable parsing of digraphs -enable_digraphs = True +enable_digraphs = True # if spaces in # arithmetic, assign and bool @@ -22,4 +22,4 @@ sp_inside_square = add # (closing ones will be moved by default, if recognized) nl_fdef_brace = force -# than every di/tri-grahp was correctly tokenized \ No newline at end of file +# than every di/tri-grahp was correctly tokenized diff --git a/tests/config/if_chain.cfg b/tests/config/if_chain.cfg index ff3d9c8cc0..6494322b14 100644 --- a/tests/config/if_chain.cfg +++ b/tests/config/if_chain.cfg @@ -4,34 +4,34 @@ # $Id: linux.cfg 488 2006-09-09 12:44:38Z bengardner $ # -indent_with_tabs = 2 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 8 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 2 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 8 # new tab size +indent_columns = output_tab_size -indent_label = 2 # pos: absolute col, neg: relative column +indent_label = 2 # pos: absolute col, neg: relative column # # inter-symbol newlines # -nl_enum_brace = remove # "enum {" vs "enum \n {" -nl_union_brace = remove # "union {" vs "union \n {" -nl_struct_brace = remove # "struct {" vs "struct \n {" -nl_do_brace = remove # "do {" vs "do \n {" -nl_if_brace = remove # "if () {" vs "if () \n {" -nl_for_brace = remove # "for () {" vs "for () \n {" -nl_else_brace = remove # "else {" vs "else \n {" -nl_while_brace = remove # "while () {" vs "while () \n {" -nl_switch_brace = remove # "switch () {" vs "switch () \n {" -nl_brace_while = remove # "} while" vs "} \n while" - cuddle while -nl_brace_else = remove # "} else" vs "} \n else" - cuddle else -sp_brace_else = force -sp_else_brace = force -nl_func_var_def_blk = 1 -nl_fcall_brace = remove # "list_for_each() {" vs "list_for_each()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_enum_brace = remove # "enum {" vs "enum \n {" +nl_union_brace = remove # "union {" vs "union \n {" +nl_struct_brace = remove # "struct {" vs "struct \n {" +nl_do_brace = remove # "do {" vs "do \n {" +nl_if_brace = remove # "if () {" vs "if () \n {" +nl_for_brace = remove # "for () {" vs "for () \n {" +nl_else_brace = remove # "else {" vs "else \n {" +nl_while_brace = remove # "while () {" vs "while () \n {" +nl_switch_brace = remove # "switch () {" vs "switch () \n {" +nl_brace_while = remove # "} while" vs "} \n while" - cuddle while +nl_brace_else = remove # "} else" vs "} \n else" - cuddle else +sp_brace_else = force +sp_else_brace = force +nl_func_var_def_blk = 1 +nl_fcall_brace = remove # "list_for_each() {" vs "list_for_each()\n{" +nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" # nl_after_return = TRUE; # nl_before_case = 1 @@ -40,13 +40,13 @@ nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" # Source code modifications # -mod_paren_on_return = remove # "return 1;" vs "return (1);" +mod_paren_on_return = remove # "return 1;" vs "return (1);" #mod_full_brace_if = remove # "if (a) a--;" vs "if (a) { a--; }" -mod_full_brace_if_chain = true -mod_full_brace_for = remove # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = remove # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = remove # "while (a) a--;" vs "while (a) { a--; }" -mod_full_brace_nl = 3 # don't remove if more than 3 newlines +mod_full_brace_if_chain = true +mod_full_brace_for = remove # "for () a--;" vs "for () { a--; }" +mod_full_brace_do = remove # "do a--; while ();" vs "do { a--; } while ();" +mod_full_brace_while = remove # "while (a) a--;" vs "while (a) { a--; }" +mod_full_brace_nl = 3 # don't remove if more than 3 newlines # @@ -54,63 +54,63 @@ mod_full_brace_nl = 3 # don't remove if more than 3 newlines # # sp_return_paren = force # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" -sp_assign = add -sp_arith = add -sp_bool = add -sp_compare = add -sp_assign = add -sp_after_comma = add -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" +sp_before_sparen = force # "if (" vs "if(" +sp_after_sparen = force # "if () {" vs "if (){" +sp_after_cast = remove # "(int) a" vs "(int)a" +sp_inside_braces = force # "{ 1 }" vs "{1}" +sp_inside_braces_struct = force # "{ 1 }" vs "{1}" +sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_assign = add +sp_arith = add +sp_bool = add +sp_compare = add +sp_assign = add +sp_after_comma = add +sp_func_def_paren = remove # "int foo (){" vs "int foo(){" +sp_func_call_paren = remove # "foo (" vs "foo(" +sp_func_proto_paren = remove # "int foo ();" vs "int foo();" # # Aligning stuff # -align_with_tabs = TRUE # use tabs to align -align_on_tabstop = TRUE # align on tabstops +align_with_tabs = TRUE # use tabs to align +align_on_tabstop = TRUE # align on tabstops # align_keep_tabs = true -align_enum_equ_span = 4 # '=' in enum definition +align_enum_equ_span = 4 # '=' in enum definition # align_nl_cont = TRUE # align_var_def_span = 2 # align_var_def_inline = TRUE # align_var_def_star = FALSE # align_var_def_colon = TRUE # align_assign_span = 1 -align_struct_init_span = 3 # align stuff in a structure init '= { }' -align_right_cmt_span = 3 +align_struct_init_span = 3 # align stuff in a structure init '= { }' +align_right_cmt_span = 3 # align_pp_define_span = 8; # align_pp_define_gap = 4; -cmt_star_cont = true +cmt_star_cont = true # indent_brace = 0 mod_add_long_ifdef_endif_comment = 0 -mod_add_long_ifdef_else_comment = 0 -nl_func_paren = remove -nl_func_decl_start = remove -nl_func_decl_empty = remove -nl_func_decl_args = remove -nl_func_decl_end = remove -sp_inside_paren = remove -sp_inside_paren_cast = remove -sp_inside_fparen = remove -sp_inside_sparen = remove -sp_paren_paren = remove -sp_after_comma = force -sp_before_ptr_star = force -sp_after_ptr_star = remove -sp_between_ptr_star = remove -align_func_params = true -align_var_struct_span = 6 +mod_add_long_ifdef_else_comment = 0 +nl_func_paren = remove +nl_func_decl_start = remove +nl_func_decl_empty = remove +nl_func_decl_args = remove +nl_func_decl_end = remove +sp_inside_paren = remove +sp_inside_paren_cast = remove +sp_inside_fparen = remove +sp_inside_sparen = remove +sp_paren_paren = remove +sp_after_comma = force +sp_before_ptr_star = force +sp_after_ptr_star = remove +sp_between_ptr_star = remove +align_func_params = true +align_var_struct_span = 6 diff --git a/tests/config/if_chain_braces_0.cfg b/tests/config/if_chain_braces_0.cfg index 097526f22f..6b3e9b8a15 100644 --- a/tests/config/if_chain_braces_0.cfg +++ b/tests/config/if_chain_braces_0.cfg @@ -1 +1 @@ -mod_full_brace_if_chain = true +mod_full_brace_if_chain = true diff --git a/tests/config/if_chain_braces_1.cfg b/tests/config/if_chain_braces_1.cfg index 861c08aa9d..b33afc7395 100644 --- a/tests/config/if_chain_braces_1.cfg +++ b/tests/config/if_chain_braces_1.cfg @@ -1 +1 @@ -mod_full_brace_if_chain_only = true +mod_full_brace_if_chain_only = true diff --git a/tests/config/if_chain_braces_2.cfg b/tests/config/if_chain_braces_2.cfg index 8a55238bb0..6f3f3ee1c7 100644 --- a/tests/config/if_chain_braces_2.cfg +++ b/tests/config/if_chain_braces_2.cfg @@ -1,2 +1,2 @@ -mod_full_brace_if_chain = true -mod_full_brace_if_chain_only = true +mod_full_brace_if_chain = true +mod_full_brace_if_chain_only = true diff --git a/tests/config/indent-1.cfg b/tests/config/indent-1.cfg index 74e0556be3..aee18db7a7 100644 --- a/tests/config/indent-1.cfg +++ b/tests/config/indent-1.cfg @@ -1,11 +1,11 @@ # -indent_with_tabs = 1 # 1=indent to level only, 2=indent with tabs -input_tab_size = 4 # original tab size -output_tab_size = 4 # new tab size -indent_columns = output_tab_size -indent_label = 2 # pos: absolute col, neg: relative column -indent_align_string = False # align broken strings -indent_brace = 0 -indent_member = indent_columns -indent_switch_case = indent_columns +indent_with_tabs = 1 # 1=indent to level only, 2=indent with tabs +input_tab_size = 4 # original tab size +output_tab_size = 4 # new tab size +indent_columns = output_tab_size +indent_label = 2 # pos: absolute col, neg: relative column +indent_align_string = False # align broken strings +indent_brace = 0 +indent_member = indent_columns +indent_switch_case = indent_columns diff --git a/tests/config/indent-vbrace.cfg b/tests/config/indent-vbrace.cfg index be8abaa5d8..a5af8025a2 100644 --- a/tests/config/indent-vbrace.cfg +++ b/tests/config/indent-vbrace.cfg @@ -1,497 +1,497 @@ # Uncrustify 0.61 -newlines = auto -input_tab_size = 8 -output_tab_size = 8 -string_escape_char = 92 -string_escape_char2 = 0 -tok_split_gte = false -disable_processing_cmt = "" -enable_processing_cmt = "" -utf8_bom = ignore -utf8_byte = false -utf8_force = false -indent_columns = 1 -indent_continue = 0 -indent_with_tabs = 0 -indent_cmt_with_tabs = false -indent_align_string = false -indent_xml_string = 0 -indent_brace = 0 -indent_braces = false -indent_braces_no_func = false -indent_braces_no_class = false -indent_braces_no_struct = false -indent_brace_parent = false -indent_paren_open_brace = false -indent_namespace = true -indent_namespace_single_indent = false -indent_namespace_level = 1 -indent_namespace_limit = 0 -indent_extern = true -indent_class = true -indent_class_colon = true -indent_class_on_colon = false -indent_constr_colon = true -indent_ctor_init_leading = 2 -indent_ctor_init = 0 -indent_else_if = false -indent_var_def_blk = 0 -indent_var_def_cont = false -indent_func_def_force_col1 = false -indent_func_call_param = false -indent_func_def_param = false -indent_func_proto_param = false -indent_func_class_param = false -indent_func_ctor_var_param = false -indent_template_param = false -indent_func_param_double = false -indent_func_const = 0 -indent_func_throw = 0 -indent_member = 0 -indent_sing_line_comments = 0 -indent_relative_single_line_comments = false -indent_switch_case = 5 -indent_case_brace = 1 -indent_col1_comment = false -indent_label = 1 -indent_access_spec = 0 -indent_access_spec_body = true -indent_paren_nl = true -indent_paren_close = 1 -indent_comma_paren = false -indent_bool_paren = false -indent_first_bool_expr = false -indent_square_nl = false -indent_preserve_sql = false -indent_align_assign = true -indent_oc_block = false -indent_oc_block_msg = 0 -indent_oc_msg_colon = 0 -indent_oc_msg_prioritize_first_colon = true -indent_oc_block_msg_xcode_style = false -indent_oc_block_msg_from_keyword = false -indent_oc_block_msg_from_colon = false -indent_oc_block_msg_from_caret = false -indent_oc_block_msg_from_brace = false -indent_min_vbrace_open = 3 -indent_vbrace_open_on_tabstop = true -sp_arith = add -sp_assign = add -sp_cpp_lambda_assign = add -sp_cpp_lambda_paren = add -sp_assign_default = add -sp_before_assign = add -sp_after_assign = add -sp_enum_paren = ignore -sp_enum_assign = add -sp_enum_before_assign = ignore -sp_enum_after_assign = ignore -sp_pp_concat = add -sp_pp_stringify = remove -sp_before_pp_stringify = add -sp_bool = add -sp_compare = ignore -sp_inside_paren = add -sp_paren_paren = add -sp_cparen_oparen = remove -sp_balance_nested_parens = false -sp_paren_brace = add -sp_before_ptr_star = add -sp_before_unnamed_ptr_star = ignore -sp_between_ptr_star = remove -sp_after_ptr_star = remove -sp_after_ptr_star_qualifier = remove -sp_after_ptr_star_func = remove -sp_ptr_star_paren = remove -sp_before_ptr_star_func = add -sp_before_byref = add -sp_before_unnamed_byref = ignore -sp_after_byref = remove -sp_after_byref_func = remove -sp_before_byref_func = remove -sp_after_type = add -sp_before_template_paren = add -sp_template_angle = add -sp_before_angle = remove -sp_inside_angle = remove -sp_after_angle = add -sp_angle_paren = remove -sp_angle_paren_empty = remove -sp_angle_word = add -sp_angle_shift = add -sp_permit_cpp11_shift = false -sp_before_sparen = add -sp_inside_sparen = add -sp_inside_sparen_close = ignore -sp_inside_sparen_open = ignore -sp_after_sparen = add -sp_sparen_brace = add -sp_invariant_paren = ignore -sp_after_invariant_paren = ignore -sp_special_semi = add -sp_before_semi = remove -sp_before_semi_for = add -sp_before_semi_for_empty = remove -sp_after_semi = add -sp_after_semi_for = force -sp_after_semi_for_empty = remove -sp_before_square = remove -sp_before_squares = remove -sp_inside_square = add -sp_after_comma = add -sp_before_comma = remove -sp_after_mdatype_commas = ignore -sp_before_mdatype_commas = ignore -sp_between_mdatype_commas = ignore -sp_paren_comma = force -sp_before_ellipsis = add -sp_after_class_colon = add -sp_before_class_colon = add -sp_after_constr_colon = add -sp_before_constr_colon = add -sp_before_case_colon = remove -sp_after_operator = remove -sp_after_operator_sym = remove -sp_after_cast = remove -sp_inside_paren_cast = remove -sp_cpp_cast_paren = remove -sp_sizeof_paren = remove -sp_after_tag = ignore -sp_inside_braces_enum = add -sp_inside_braces_struct = add -sp_inside_braces = add -sp_inside_braces_empty = remove -sp_type_func = add -sp_func_proto_paren = remove -sp_func_def_paren = remove -sp_inside_fparens = remove -sp_inside_fparen = add -sp_inside_tparen = remove -sp_after_tparen_close = remove -sp_square_fparen = remove -sp_fparen_brace = add -sp_fparen_dbrace = ignore -sp_func_call_paren = remove -sp_func_call_paren_empty = ignore -sp_func_call_user_paren = ignore -sp_func_class_paren = remove -sp_return_paren = add -sp_attribute_paren = add -sp_defined_paren = add -sp_throw_paren = add -sp_after_throw = add -sp_catch_paren = add -sp_version_paren = ignore -sp_scope_paren = ignore -sp_macro = add -sp_macro_func = add -sp_else_brace = add -sp_brace_else = add -sp_brace_typedef = add -sp_catch_brace = add -sp_brace_catch = add -sp_finally_brace = add -sp_brace_finally = add -sp_try_brace = add -sp_getset_brace = add -sp_word_brace = add -sp_word_brace_ns = add -sp_before_dc = remove -sp_after_dc = remove -sp_d_array_colon = ignore -sp_not = remove -sp_inv = remove -sp_addr = remove -sp_member = remove -sp_deref = remove -sp_sign = remove -sp_incdec = remove -sp_before_nl_cont = add -sp_after_oc_scope = add -sp_after_oc_colon = add -sp_before_oc_colon = ignore -sp_after_oc_dict_colon = ignore -sp_before_oc_dict_colon = ignore -sp_after_send_oc_colon = ignore -sp_before_send_oc_colon = ignore -sp_after_oc_type = ignore -sp_after_oc_return_type = ignore -sp_after_oc_at_sel = ignore -sp_after_oc_at_sel_parens = ignore -sp_inside_oc_at_sel_parens = ignore -sp_before_oc_block_caret = ignore -sp_after_oc_block_caret = ignore -sp_after_oc_msg_receiver = ignore -sp_after_oc_property = ignore -sp_cond_colon = add -sp_cond_colon_before = ignore -sp_cond_colon_after = ignore -sp_cond_question = add -sp_cond_question_before = ignore -sp_cond_question_after = ignore -sp_cond_ternary_short = ignore -sp_case_label = force -sp_range = ignore -sp_after_for_colon = ignore -sp_before_for_colon = ignore -sp_extern_paren = ignore -sp_cmt_cpp_start = ignore -sp_endif_cmt = add -sp_after_new = add -sp_before_tr_emb_cmt = add -sp_num_before_tr_emb_cmt = 0 -sp_annotation_paren = ignore -align_keep_tabs = false -align_with_tabs = false -align_on_tabstop = false -align_number_right = false -align_keep_extra_space = false -align_func_params = true -align_same_func_call_params = false -align_var_def_span = 8 -align_var_def_star_style = 1 -align_var_def_amp_style = 1 -align_var_def_thresh = 0 -align_var_def_gap = 8 -align_var_def_colon = false -align_var_def_attribute = false -align_var_def_inline = true -align_assign_span = 8 -align_assign_thresh = 0 -align_enum_equ_span = 8 -align_enum_equ_thresh = 0 -align_var_struct_span = 8 -align_var_struct_thresh = 0 -align_var_struct_gap = 8 -align_struct_init_span = 8 -align_typedef_gap = 8 -align_typedef_span = 8 -align_typedef_func = 0 -align_typedef_star_style = 1 -align_typedef_amp_style = 1 -align_right_cmt_span = 0 -align_right_cmt_mix = false -align_right_cmt_gap = 0 -align_right_cmt_at_col = 0 -align_func_proto_span = 16 -align_func_proto_gap = 0 -align_on_operator = true -align_mix_var_proto = false -align_single_line_func = true -align_single_line_brace = false -align_single_line_brace_gap = 0 -align_oc_msg_spec_span = 0 -align_nl_cont = true -align_pp_define_together = false -align_pp_define_gap = 1 -align_pp_define_span = 8 -align_left_shift = true -align_oc_msg_colon_span = 0 -align_oc_msg_colon_first = false -align_oc_decl_colon = false -nl_collapse_empty_body = true -nl_assign_leave_one_liners = false -nl_class_leave_one_liners = false -nl_enum_leave_one_liners = false -nl_getset_leave_one_liners = false -nl_func_leave_one_liners = false -nl_cpp_lambda_leave_one_liners = false -nl_if_leave_one_liners = false -nl_oc_msg_leave_one_liner = false -nl_start_of_file = ignore -nl_start_of_file_min = 0 -nl_end_of_file = ignore -nl_end_of_file_min = 0 -nl_assign_brace = ignore -nl_assign_square = ignore -nl_after_square_assign = ignore -nl_func_var_def_blk = 2 -nl_typedef_blk_start = 0 -nl_typedef_blk_end = 0 -nl_typedef_blk_in = 0 -nl_var_def_blk_start = 0 -nl_var_def_blk_end = 0 -nl_var_def_blk_in = 2 -nl_fcall_brace = force -nl_enum_brace = remove -nl_struct_brace = remove -nl_union_brace = remove -nl_if_brace = remove -nl_brace_else = add -nl_elseif_brace = remove -nl_else_brace = remove -nl_else_if = remove -nl_brace_finally = force -nl_finally_brace = remove -nl_try_brace = remove -nl_getset_brace = remove -nl_for_brace = remove -nl_catch_brace = remove -nl_brace_catch = force -nl_brace_square = ignore -nl_brace_fparen = ignore -nl_while_brace = remove -nl_scope_brace = ignore -nl_unittest_brace = ignore -nl_version_brace = ignore -nl_using_brace = remove -nl_brace_brace = force -nl_do_brace = remove -nl_brace_while = remove -nl_switch_brace = remove -nl_multi_line_cond = true -nl_multi_line_define = true -nl_before_case = false -nl_before_throw = remove -nl_after_case = false -nl_case_colon_brace = force -nl_namespace_brace = remove -nl_template_class = force -nl_class_brace = remove -nl_class_init_args = ignore -nl_constr_init_args = ignore -nl_func_type_name = ignore -nl_func_type_name_class = ignore -nl_func_scope_name = ignore -nl_func_proto_type_name = ignore -nl_func_paren = remove -nl_func_def_paren = remove -nl_func_decl_start = ignore -nl_func_def_start = ignore -nl_func_decl_start_single = remove -nl_func_def_start_single = remove -nl_func_decl_args = ignore -nl_func_def_args = ignore -nl_func_decl_end = ignore -nl_func_def_end = ignore -nl_func_decl_end_single = remove -nl_func_def_end_single = remove -nl_func_decl_empty = remove -nl_func_def_empty = remove -nl_oc_msg_args = false -nl_fdef_brace = force -nl_cpp_ldef_brace = ignore -nl_return_expr = remove -nl_after_semicolon = false -nl_paren_dbrace_open = ignore -nl_after_brace_open = false -nl_after_brace_open_cmt = false -nl_after_vbrace_open = false -nl_after_vbrace_open_empty = false -nl_after_brace_close = false -nl_after_vbrace_close = false -nl_brace_struct_var = remove -nl_define_macro = true -nl_squeeze_ifdef = false -nl_before_if = ignore -nl_after_if = ignore -nl_before_for = ignore -nl_after_for = ignore -nl_before_while = ignore -nl_after_while = ignore -nl_before_switch = ignore -nl_after_switch = ignore -nl_before_do = ignore -nl_after_do = ignore -nl_ds_struct_enum_cmt = false -nl_ds_struct_enum_close_brace = false -nl_class_colon = ignore -nl_constr_colon = ignore -nl_create_if_one_liner = false -nl_create_for_one_liner = false -nl_create_while_one_liner = false -pos_arith = ignore -pos_assign = ignore -pos_bool = ignore -pos_compare = ignore -pos_conditional = ignore -pos_comma = ignore -pos_class_comma = ignore -pos_constr_comma = ignore -pos_class_colon = ignore -pos_constr_colon = ignore -code_width = 140 -ls_for_split_full = true -ls_func_split_full = true -ls_code_width = true -nl_max = 6 -nl_after_func_proto = 0 -nl_after_func_proto_group = 0 -nl_after_func_body = 3 -nl_after_func_body_class = 3 -nl_after_func_body_one_liner = 2 -nl_before_block_comment = 0 -nl_before_c_comment = 0 -nl_before_cpp_comment = 0 -nl_after_multiline_comment = false -nl_after_label_colon = false -nl_after_struct = 3 -nl_after_class = 3 -nl_before_access_spec = 1 -nl_after_access_spec = 0 -nl_comment_func_def = 0 -nl_after_try_catch_finally = 0 -nl_around_cs_property = 0 -nl_between_get_set = 0 -nl_property_brace = ignore -eat_blanks_after_open_brace = false -eat_blanks_before_close_brace = false -nl_remove_extra_newlines = 0 -nl_before_return = false -nl_after_return = false -nl_after_annotation = ignore -nl_between_annotation = ignore -mod_full_brace_do = ignore -mod_full_brace_for = ignore -mod_full_brace_function = ignore -mod_full_brace_if = ignore -mod_full_brace_if_chain = false -mod_full_brace_nl = 0 -mod_full_brace_while = ignore -mod_full_brace_using = ignore -mod_paren_on_return = ignore -mod_pawn_semicolon = false -mod_full_paren_if_bool = false -mod_remove_extra_semicolon = false -mod_add_long_function_closebrace_comment = 0 +newlines = auto +input_tab_size = 8 +output_tab_size = 8 +string_escape_char = 92 +string_escape_char2 = 0 +tok_split_gte = false +disable_processing_cmt = "" +enable_processing_cmt = "" +utf8_bom = ignore +utf8_byte = false +utf8_force = false +indent_columns = 1 +indent_continue = 0 +indent_with_tabs = 0 +indent_cmt_with_tabs = false +indent_align_string = false +indent_xml_string = 0 +indent_brace = 0 +indent_braces = false +indent_braces_no_func = false +indent_braces_no_class = false +indent_braces_no_struct = false +indent_brace_parent = false +indent_paren_open_brace = false +indent_namespace = true +indent_namespace_single_indent = false +indent_namespace_level = 1 +indent_namespace_limit = 0 +indent_extern = true +indent_class = true +indent_class_colon = true +indent_class_on_colon = false +indent_constr_colon = true +indent_ctor_init_leading = 2 +indent_ctor_init = 0 +indent_else_if = false +indent_var_def_blk = 0 +indent_var_def_cont = false +indent_func_def_force_col1 = false +indent_func_call_param = false +indent_func_def_param = false +indent_func_proto_param = false +indent_func_class_param = false +indent_func_ctor_var_param = false +indent_template_param = false +indent_func_param_double = false +indent_func_const = 0 +indent_func_throw = 0 +indent_member = 0 +indent_sing_line_comments = 0 +indent_relative_single_line_comments = false +indent_switch_case = 5 +indent_case_brace = 1 +indent_col1_comment = false +indent_label = 1 +indent_access_spec = 0 +indent_access_spec_body = true +indent_paren_nl = true +indent_paren_close = 1 +indent_comma_paren = false +indent_bool_paren = false +indent_first_bool_expr = false +indent_square_nl = false +indent_preserve_sql = false +indent_align_assign = true +indent_oc_block = false +indent_oc_block_msg = 0 +indent_oc_msg_colon = 0 +indent_oc_msg_prioritize_first_colon = true +indent_oc_block_msg_xcode_style = false +indent_oc_block_msg_from_keyword = false +indent_oc_block_msg_from_colon = false +indent_oc_block_msg_from_caret = false +indent_oc_block_msg_from_brace = false +indent_min_vbrace_open = 3 +indent_vbrace_open_on_tabstop = true +sp_arith = add +sp_assign = add +sp_cpp_lambda_assign = add +sp_cpp_lambda_paren = add +sp_assign_default = add +sp_before_assign = add +sp_after_assign = add +sp_enum_paren = ignore +sp_enum_assign = add +sp_enum_before_assign = ignore +sp_enum_after_assign = ignore +sp_pp_concat = add +sp_pp_stringify = remove +sp_before_pp_stringify = add +sp_bool = add +sp_compare = ignore +sp_inside_paren = add +sp_paren_paren = add +sp_cparen_oparen = remove +sp_balance_nested_parens = false +sp_paren_brace = add +sp_before_ptr_star = add +sp_before_unnamed_ptr_star = ignore +sp_between_ptr_star = remove +sp_after_ptr_star = remove +sp_after_ptr_star_qualifier = remove +sp_after_ptr_star_func = remove +sp_ptr_star_paren = remove +sp_before_ptr_star_func = add +sp_before_byref = add +sp_before_unnamed_byref = ignore +sp_after_byref = remove +sp_after_byref_func = remove +sp_before_byref_func = remove +sp_after_type = add +sp_before_template_paren = add +sp_template_angle = add +sp_before_angle = remove +sp_inside_angle = remove +sp_after_angle = add +sp_angle_paren = remove +sp_angle_paren_empty = remove +sp_angle_word = add +sp_angle_shift = add +sp_permit_cpp11_shift = false +sp_before_sparen = add +sp_inside_sparen = add +sp_inside_sparen_close = ignore +sp_inside_sparen_open = ignore +sp_after_sparen = add +sp_sparen_brace = add +sp_invariant_paren = ignore +sp_after_invariant_paren = ignore +sp_special_semi = add +sp_before_semi = remove +sp_before_semi_for = add +sp_before_semi_for_empty = remove +sp_after_semi = add +sp_after_semi_for = force +sp_after_semi_for_empty = remove +sp_before_square = remove +sp_before_squares = remove +sp_inside_square = add +sp_after_comma = add +sp_before_comma = remove +sp_after_mdatype_commas = ignore +sp_before_mdatype_commas = ignore +sp_between_mdatype_commas = ignore +sp_paren_comma = force +sp_before_ellipsis = add +sp_after_class_colon = add +sp_before_class_colon = add +sp_after_constr_colon = add +sp_before_constr_colon = add +sp_before_case_colon = remove +sp_after_operator = remove +sp_after_operator_sym = remove +sp_after_cast = remove +sp_inside_paren_cast = remove +sp_cpp_cast_paren = remove +sp_sizeof_paren = remove +sp_after_tag = ignore +sp_inside_braces_enum = add +sp_inside_braces_struct = add +sp_inside_braces = add +sp_inside_braces_empty = remove +sp_type_func = add +sp_func_proto_paren = remove +sp_func_def_paren = remove +sp_inside_fparens = remove +sp_inside_fparen = add +sp_inside_tparen = remove +sp_after_tparen_close = remove +sp_square_fparen = remove +sp_fparen_brace = add +sp_fparen_dbrace = ignore +sp_func_call_paren = remove +sp_func_call_paren_empty = ignore +sp_func_call_user_paren = ignore +sp_func_class_paren = remove +sp_return_paren = add +sp_attribute_paren = add +sp_defined_paren = add +sp_throw_paren = add +sp_after_throw = add +sp_catch_paren = add +sp_version_paren = ignore +sp_scope_paren = ignore +sp_macro = add +sp_macro_func = add +sp_else_brace = add +sp_brace_else = add +sp_brace_typedef = add +sp_catch_brace = add +sp_brace_catch = add +sp_finally_brace = add +sp_brace_finally = add +sp_try_brace = add +sp_getset_brace = add +sp_word_brace = add +sp_word_brace_ns = add +sp_before_dc = remove +sp_after_dc = remove +sp_d_array_colon = ignore +sp_not = remove +sp_inv = remove +sp_addr = remove +sp_member = remove +sp_deref = remove +sp_sign = remove +sp_incdec = remove +sp_before_nl_cont = add +sp_after_oc_scope = add +sp_after_oc_colon = add +sp_before_oc_colon = ignore +sp_after_oc_dict_colon = ignore +sp_before_oc_dict_colon = ignore +sp_after_send_oc_colon = ignore +sp_before_send_oc_colon = ignore +sp_after_oc_type = ignore +sp_after_oc_return_type = ignore +sp_after_oc_at_sel = ignore +sp_after_oc_at_sel_parens = ignore +sp_inside_oc_at_sel_parens = ignore +sp_before_oc_block_caret = ignore +sp_after_oc_block_caret = ignore +sp_after_oc_msg_receiver = ignore +sp_after_oc_property = ignore +sp_cond_colon = add +sp_cond_colon_before = ignore +sp_cond_colon_after = ignore +sp_cond_question = add +sp_cond_question_before = ignore +sp_cond_question_after = ignore +sp_cond_ternary_short = ignore +sp_case_label = force +sp_range = ignore +sp_after_for_colon = ignore +sp_before_for_colon = ignore +sp_extern_paren = ignore +sp_cmt_cpp_start = ignore +sp_endif_cmt = add +sp_after_new = add +sp_before_tr_emb_cmt = add +sp_num_before_tr_emb_cmt = 0 +sp_annotation_paren = ignore +align_keep_tabs = false +align_with_tabs = false +align_on_tabstop = false +align_number_right = false +align_keep_extra_space = false +align_func_params = true +align_same_func_call_params = false +align_var_def_span = 8 +align_var_def_star_style = 1 +align_var_def_amp_style = 1 +align_var_def_thresh = 0 +align_var_def_gap = 8 +align_var_def_colon = false +align_var_def_attribute = false +align_var_def_inline = true +align_assign_span = 8 +align_assign_thresh = 0 +align_enum_equ_span = 8 +align_enum_equ_thresh = 0 +align_var_struct_span = 8 +align_var_struct_thresh = 0 +align_var_struct_gap = 8 +align_struct_init_span = 8 +align_typedef_gap = 8 +align_typedef_span = 8 +align_typedef_func = 0 +align_typedef_star_style = 1 +align_typedef_amp_style = 1 +align_right_cmt_span = 0 +align_right_cmt_mix = false +align_right_cmt_gap = 0 +align_right_cmt_at_col = 0 +align_func_proto_span = 16 +align_func_proto_gap = 0 +align_on_operator = true +align_mix_var_proto = false +align_single_line_func = true +align_single_line_brace = false +align_single_line_brace_gap = 0 +align_oc_msg_spec_span = 0 +align_nl_cont = true +align_pp_define_together = false +align_pp_define_gap = 1 +align_pp_define_span = 8 +align_left_shift = true +align_oc_msg_colon_span = 0 +align_oc_msg_colon_first = false +align_oc_decl_colon = false +nl_collapse_empty_body = true +nl_assign_leave_one_liners = false +nl_class_leave_one_liners = false +nl_enum_leave_one_liners = false +nl_getset_leave_one_liners = false +nl_func_leave_one_liners = false +nl_cpp_lambda_leave_one_liners = false +nl_if_leave_one_liners = false +nl_oc_msg_leave_one_liner = false +nl_start_of_file = ignore +nl_start_of_file_min = 0 +nl_end_of_file = ignore +nl_end_of_file_min = 0 +nl_assign_brace = ignore +nl_assign_square = ignore +nl_after_square_assign = ignore +nl_func_var_def_blk = 2 +nl_typedef_blk_start = 0 +nl_typedef_blk_end = 0 +nl_typedef_blk_in = 0 +nl_var_def_blk_start = 0 +nl_var_def_blk_end = 0 +nl_var_def_blk_in = 2 +nl_fcall_brace = force +nl_enum_brace = remove +nl_struct_brace = remove +nl_union_brace = remove +nl_if_brace = remove +nl_brace_else = add +nl_elseif_brace = remove +nl_else_brace = remove +nl_else_if = remove +nl_brace_finally = force +nl_finally_brace = remove +nl_try_brace = remove +nl_getset_brace = remove +nl_for_brace = remove +nl_catch_brace = remove +nl_brace_catch = force +nl_brace_square = ignore +nl_brace_fparen = ignore +nl_while_brace = remove +nl_scope_brace = ignore +nl_unittest_brace = ignore +nl_version_brace = ignore +nl_using_brace = remove +nl_brace_brace = force +nl_do_brace = remove +nl_brace_while = remove +nl_switch_brace = remove +nl_multi_line_cond = true +nl_multi_line_define = true +nl_before_case = false +nl_before_throw = remove +nl_after_case = false +nl_case_colon_brace = force +nl_namespace_brace = remove +nl_template_class = force +nl_class_brace = remove +nl_class_init_args = ignore +nl_constr_init_args = ignore +nl_func_type_name = ignore +nl_func_type_name_class = ignore +nl_func_scope_name = ignore +nl_func_proto_type_name = ignore +nl_func_paren = remove +nl_func_def_paren = remove +nl_func_decl_start = ignore +nl_func_def_start = ignore +nl_func_decl_start_single = remove +nl_func_def_start_single = remove +nl_func_decl_args = ignore +nl_func_def_args = ignore +nl_func_decl_end = ignore +nl_func_def_end = ignore +nl_func_decl_end_single = remove +nl_func_def_end_single = remove +nl_func_decl_empty = remove +nl_func_def_empty = remove +nl_oc_msg_args = false +nl_fdef_brace = force +nl_cpp_ldef_brace = ignore +nl_return_expr = remove +nl_after_semicolon = false +nl_paren_dbrace_open = ignore +nl_after_brace_open = false +nl_after_brace_open_cmt = false +nl_after_vbrace_open = false +nl_after_vbrace_open_empty = false +nl_after_brace_close = false +nl_after_vbrace_close = false +nl_brace_struct_var = remove +nl_define_macro = true +nl_squeeze_ifdef = false +nl_before_if = ignore +nl_after_if = ignore +nl_before_for = ignore +nl_after_for = ignore +nl_before_while = ignore +nl_after_while = ignore +nl_before_switch = ignore +nl_after_switch = ignore +nl_before_do = ignore +nl_after_do = ignore +nl_ds_struct_enum_cmt = false +nl_ds_struct_enum_close_brace = false +nl_class_colon = ignore +nl_constr_colon = ignore +nl_create_if_one_liner = false +nl_create_for_one_liner = false +nl_create_while_one_liner = false +pos_arith = ignore +pos_assign = ignore +pos_bool = ignore +pos_compare = ignore +pos_conditional = ignore +pos_comma = ignore +pos_class_comma = ignore +pos_constr_comma = ignore +pos_class_colon = ignore +pos_constr_colon = ignore +code_width = 140 +ls_for_split_full = true +ls_func_split_full = true +ls_code_width = true +nl_max = 6 +nl_after_func_proto = 0 +nl_after_func_proto_group = 0 +nl_after_func_body = 3 +nl_after_func_body_class = 3 +nl_after_func_body_one_liner = 2 +nl_before_block_comment = 0 +nl_before_c_comment = 0 +nl_before_cpp_comment = 0 +nl_after_multiline_comment = false +nl_after_label_colon = false +nl_after_struct = 3 +nl_after_class = 3 +nl_before_access_spec = 1 +nl_after_access_spec = 0 +nl_comment_func_def = 0 +nl_after_try_catch_finally = 0 +nl_around_cs_property = 0 +nl_between_get_set = 0 +nl_property_brace = ignore +eat_blanks_after_open_brace = false +eat_blanks_before_close_brace = false +nl_remove_extra_newlines = 0 +nl_before_return = false +nl_after_return = false +nl_after_annotation = ignore +nl_between_annotation = ignore +mod_full_brace_do = ignore +mod_full_brace_for = ignore +mod_full_brace_function = ignore +mod_full_brace_if = ignore +mod_full_brace_if_chain = false +mod_full_brace_nl = 0 +mod_full_brace_while = ignore +mod_full_brace_using = ignore +mod_paren_on_return = ignore +mod_pawn_semicolon = false +mod_full_paren_if_bool = false +mod_remove_extra_semicolon = false +mod_add_long_function_closebrace_comment = 0 mod_add_long_namespace_closebrace_comment = 0 -mod_add_long_switch_closebrace_comment = 0 -mod_add_long_ifdef_endif_comment = 0 -mod_add_long_ifdef_else_comment = 0 -mod_sort_import = false -mod_sort_using = false -mod_sort_include = false -mod_move_case_break = false -mod_case_brace = ignore -mod_remove_empty_return = false -cmt_width = 0 -cmt_reflow_mode = 0 -cmt_convert_tab_to_spaces = true -cmt_indent_multi = true -cmt_c_group = false -cmt_c_nl_start = false -cmt_c_nl_end = false -cmt_cpp_group = false -cmt_cpp_nl_start = false -cmt_cpp_nl_end = false -cmt_cpp_to_c = false -cmt_star_cont = false -cmt_sp_before_star_cont = 0 -cmt_sp_after_star_cont = 0 -cmt_multi_check_last = true -cmt_insert_file_header = "" -cmt_insert_file_footer = "" -cmt_insert_func_header = "" -cmt_insert_class_header = "" -cmt_insert_oc_msg_header = "" -cmt_insert_before_preproc = false -pp_indent = force -pp_indent_at_level = false -pp_indent_count = 1 -pp_space = ignore -pp_space_count = 0 -pp_indent_region = 0 -pp_region_indent_code = false -pp_indent_if = 0 -pp_if_indent_code = false -pp_define_at_level = false +mod_add_long_switch_closebrace_comment = 0 +mod_add_long_ifdef_endif_comment = 0 +mod_add_long_ifdef_else_comment = 0 +mod_sort_import = false +mod_sort_using = false +mod_sort_include = false +mod_move_case_break = false +mod_case_brace = ignore +mod_remove_empty_return = false +cmt_width = 0 +cmt_reflow_mode = 0 +cmt_convert_tab_to_spaces = true +cmt_indent_multi = true +cmt_c_group = false +cmt_c_nl_start = false +cmt_c_nl_end = false +cmt_cpp_group = false +cmt_cpp_nl_start = false +cmt_cpp_nl_end = false +cmt_cpp_to_c = false +cmt_star_cont = false +cmt_sp_before_star_cont = 0 +cmt_sp_after_star_cont = 0 +cmt_multi_check_last = true +cmt_insert_file_header = "" +cmt_insert_file_footer = "" +cmt_insert_func_header = "" +cmt_insert_class_header = "" +cmt_insert_oc_msg_header = "" +cmt_insert_before_preproc = false +pp_indent = force +pp_indent_at_level = false +pp_indent_count = 1 +pp_space = ignore +pp_space_count = 0 +pp_indent_region = 0 +pp_region_indent_code = false +pp_indent_if = 0 +pp_if_indent_code = false +pp_define_at_level = false diff --git a/tests/config/indent.cfg b/tests/config/indent.cfg index 708a814f76..cad6a9a066 100644 --- a/tests/config/indent.cfg +++ b/tests/config/indent.cfg @@ -2,13 +2,13 @@ # Indents the code and aligns trailing comments # -indent_with_tabs = 0 # 0=spaces, 1=tabs, 2=indent to level only +indent_with_tabs = 0 # 0=spaces, 1=tabs, 2=indent to level only -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size -indent_columns = output_tab_size +input_tab_size = 8 # original tab size +output_tab_size = 3 # new tab size +indent_columns = output_tab_size -indent_label = 2 # pos: absolute col, neg: relative column +indent_label = 2 # pos: absolute col, neg: relative column -align_right_cmt_span = 3 # within x lines +align_right_cmt_span = 3 # within x lines diff --git a/tests/config/indent_braces_no.cfg b/tests/config/indent_braces_no.cfg index 8a7e78ff7f..b4226d7b4a 100644 --- a/tests/config/indent_braces_no.cfg +++ b/tests/config/indent_braces_no.cfg @@ -1,161 +1,161 @@ -indent_align_string=false -indent_braces=true -indent_braces_no_func=true -indent_braces_no_class=true -indent_braces_no_struct=true -indent_brace_parent=false -indent_namespace=false -indent_extern=false -indent_class=true -indent_class_colon=false -indent_else_if=false -indent_func_call_param=false -indent_func_def_param=false -indent_func_proto_param=false -indent_func_class_param=false -indent_func_ctor_var_param=false -indent_template_param=false -indent_func_param_double=false -indent_relative_single_line_comments=false -indent_col1_comment=false -indent_access_spec_body=false -indent_paren_nl=false -indent_comma_paren=false -indent_bool_paren=false -indent_square_nl=false -indent_preserve_sql=false -indent_align_assign=true -sp_balance_nested_parens=false -align_keep_tabs=false -align_with_tabs=false -align_on_tabstop=false -align_number_right=false -align_func_params=false -align_same_func_call_params=false -align_var_def_colon=false -align_var_def_attribute=false -align_var_def_inline=false -align_right_cmt_mix=false -align_on_operator=false -align_mix_var_proto=false -align_single_line_func=true -align_single_line_brace=true -align_nl_cont=false -align_left_shift=true -nl_collapse_empty_body=false -nl_assign_leave_one_liners=true -nl_class_leave_one_liners=true -nl_enum_leave_one_liners=false -nl_getset_leave_one_liners=false -nl_func_leave_one_liners=true -nl_if_leave_one_liners=true -nl_multi_line_cond=false -nl_multi_line_define=false -nl_before_case=false -nl_after_case=false -nl_after_return=false -nl_after_semicolon=false -nl_after_brace_open=false -nl_after_brace_open_cmt=false -nl_after_vbrace_open=false -nl_after_brace_close=false -nl_define_macro=false -nl_squeeze_ifdef=false -nl_ds_struct_enum_cmt=false -nl_ds_struct_enum_close_brace=false -nl_create_if_one_liner=true -nl_create_for_one_liner=false -nl_create_while_one_liner=false -ls_for_split_full=true -ls_func_split_full=true -nl_after_multiline_comment=false -eat_blanks_after_open_brace=false -eat_blanks_before_close_brace=false -mod_pawn_semicolon=false -mod_full_paren_if_bool=false -mod_remove_extra_semicolon=true -mod_sort_import=false -mod_sort_using=false -mod_sort_include=false -mod_move_case_break=false -mod_remove_empty_return=false -cmt_indent_multi=false -cmt_c_group=false -cmt_c_nl_start=false -cmt_c_nl_end=false -cmt_cpp_group=false -cmt_cpp_nl_start=false -cmt_cpp_nl_end=false -cmt_cpp_to_c=false -cmt_star_cont=false -cmt_multi_check_last=true -cmt_insert_before_preproc=false -pp_indent_at_level=false -pp_region_indent_code=false -pp_if_indent_code=false -pp_define_at_level=false -indent_columns=2 -align_var_def_span=1 -align_typedef_span=1 -align_single_line_brace_gap=1 -nl_end_of_file_min=1 -code_width=120 -nl_max=2 -indent_with_tabs=0 -sp_arith=add -sp_assign=add -sp_enum_assign=add -sp_bool=add -sp_compare=add -sp_inside_paren=remove -sp_paren_paren=remove -sp_before_byref=remove -sp_after_byref=add -sp_template_angle=ignore -sp_inside_angle=remove -sp_angle_paren=ignore -sp_angle_word=add -sp_before_sparen=add -sp_inside_sparen=remove -sp_inside_sparen_close=remove -sp_before_semi=remove -sp_before_semi_for=remove -sp_before_square=remove -sp_before_squares=remove -sp_inside_square=remove -sp_after_comma=add -sp_before_comma=remove -sp_after_class_colon=add -sp_before_class_colon=add -sp_after_operator=add -sp_after_cast=add -sp_inside_paren_cast=remove -sp_cpp_cast_paren=remove -sp_sizeof_paren=remove -sp_inside_braces_empty=remove -sp_func_proto_paren=remove -sp_func_def_paren=remove -sp_inside_fparens=remove -sp_inside_fparen=remove -sp_return_paren=add -sp_before_dc=remove -sp_after_dc=remove -sp_member=remove -sp_sign=remove -nl_start_of_file=remove -nl_end_of_file=force -nl_fcall_brace=add -nl_if_brace=add -nl_brace_else=add -nl_elseif_brace=add -nl_else_brace=add -nl_try_brace=add -nl_for_brace=add -nl_catch_brace=add -nl_brace_catch=add -nl_while_brace=add -nl_do_brace=add -nl_brace_while=add -nl_switch_brace=add -nl_before_throw=add -nl_fdef_brace=add +indent_align_string = false +indent_braces = true +indent_braces_no_func = true +indent_braces_no_class = true +indent_braces_no_struct = true +indent_brace_parent = false +indent_namespace = false +indent_extern = false +indent_class = true +indent_class_colon = false +indent_else_if = false +indent_func_call_param = false +indent_func_def_param = false +indent_func_proto_param = false +indent_func_class_param = false +indent_func_ctor_var_param = false +indent_template_param = false +indent_func_param_double = false +indent_relative_single_line_comments = false +indent_col1_comment = false +indent_access_spec_body = false +indent_paren_nl = false +indent_comma_paren = false +indent_bool_paren = false +indent_square_nl = false +indent_preserve_sql = false +indent_align_assign = true +sp_balance_nested_parens = false +align_keep_tabs = false +align_with_tabs = false +align_on_tabstop = false +align_number_right = false +align_func_params = false +align_same_func_call_params = false +align_var_def_colon = false +align_var_def_attribute = false +align_var_def_inline = false +align_right_cmt_mix = false +align_on_operator = false +align_mix_var_proto = false +align_single_line_func = true +align_single_line_brace = true +align_nl_cont = false +align_left_shift = true +nl_collapse_empty_body = false +nl_assign_leave_one_liners = true +nl_class_leave_one_liners = true +nl_enum_leave_one_liners = false +nl_getset_leave_one_liners = false +nl_func_leave_one_liners = true +nl_if_leave_one_liners = true +nl_multi_line_cond = false +nl_multi_line_define = false +nl_before_case = false +nl_after_case = false +nl_after_return = false +nl_after_semicolon = false +nl_after_brace_open = false +nl_after_brace_open_cmt = false +nl_after_vbrace_open = false +nl_after_brace_close = false +nl_define_macro = false +nl_squeeze_ifdef = false +nl_ds_struct_enum_cmt = false +nl_ds_struct_enum_close_brace = false +nl_create_if_one_liner = true +nl_create_for_one_liner = false +nl_create_while_one_liner = false +ls_for_split_full = true +ls_func_split_full = true +nl_after_multiline_comment = false +eat_blanks_after_open_brace = false +eat_blanks_before_close_brace = false +mod_pawn_semicolon = false +mod_full_paren_if_bool = false +mod_remove_extra_semicolon = true +mod_sort_import = false +mod_sort_using = false +mod_sort_include = false +mod_move_case_break = false +mod_remove_empty_return = false +cmt_indent_multi = false +cmt_c_group = false +cmt_c_nl_start = false +cmt_c_nl_end = false +cmt_cpp_group = false +cmt_cpp_nl_start = false +cmt_cpp_nl_end = false +cmt_cpp_to_c = false +cmt_star_cont = false +cmt_multi_check_last = true +cmt_insert_before_preproc = false +pp_indent_at_level = false +pp_region_indent_code = false +pp_if_indent_code = false +pp_define_at_level = false +indent_columns = 2 +align_var_def_span = 1 +align_typedef_span = 1 +align_single_line_brace_gap = 1 +nl_end_of_file_min = 1 +code_width = 120 +nl_max = 2 +indent_with_tabs = 0 +sp_arith = add +sp_assign = add +sp_enum_assign = add +sp_bool = add +sp_compare = add +sp_inside_paren = remove +sp_paren_paren = remove +sp_before_byref = remove +sp_after_byref = add +sp_template_angle = ignore +sp_inside_angle = remove +sp_angle_paren = ignore +sp_angle_word = add +sp_before_sparen = add +sp_inside_sparen = remove +sp_inside_sparen_close = remove +sp_before_semi = remove +sp_before_semi_for = remove +sp_before_square = remove +sp_before_squares = remove +sp_inside_square = remove +sp_after_comma = add +sp_before_comma = remove +sp_after_class_colon = add +sp_before_class_colon = add +sp_after_operator = add +sp_after_cast = add +sp_inside_paren_cast = remove +sp_cpp_cast_paren = remove +sp_sizeof_paren = remove +sp_inside_braces_empty = remove +sp_func_proto_paren = remove +sp_func_def_paren = remove +sp_inside_fparens = remove +sp_inside_fparen = remove +sp_return_paren = add +sp_before_dc = remove +sp_after_dc = remove +sp_member = remove +sp_sign = remove +nl_start_of_file = remove +nl_end_of_file = force +nl_fcall_brace = add +nl_if_brace = add +nl_brace_else = add +nl_elseif_brace = add +nl_else_brace = add +nl_try_brace = add +nl_for_brace = add +nl_catch_brace = add +nl_brace_catch = add +nl_while_brace = add +nl_do_brace = add +nl_brace_while = add +nl_switch_brace = add +nl_before_throw = add +nl_fdef_brace = add diff --git a/tests/config/indent_comment_align_thresh_1.cfg b/tests/config/indent_comment_align_thresh_1.cfg index ef132801d5..dfd6d08bc2 100644 --- a/tests/config/indent_comment_align_thresh_1.cfg +++ b/tests/config/indent_comment_align_thresh_1.cfg @@ -1,5 +1,5 @@ -input_tab_size = 4 +input_tab_size = 4 -indent_with_tabs = 0 -indent_columns = 4 -indent_class = true +indent_with_tabs = 0 +indent_columns = 4 +indent_class = true diff --git a/tests/config/indent_comment_align_thresh_2.cfg b/tests/config/indent_comment_align_thresh_2.cfg index b37de685e4..ca155cb1ad 100644 --- a/tests/config/indent_comment_align_thresh_2.cfg +++ b/tests/config/indent_comment_align_thresh_2.cfg @@ -1,6 +1,6 @@ -input_tab_size = 4 +input_tab_size = 4 -indent_with_tabs = 0 -indent_columns = 4 -indent_class = true -indent_col1_comment = true +indent_with_tabs = 0 +indent_columns = 4 +indent_class = true +indent_col1_comment = true diff --git a/tests/config/indent_ctor_init.cfg b/tests/config/indent_ctor_init.cfg index 31757eeb88..01dca1104a 100644 --- a/tests/config/indent_ctor_init.cfg +++ b/tests/config/indent_ctor_init.cfg @@ -1,18 +1,18 @@ -indent_columns = 2 # number -indent_with_tabs = 0 # number +indent_columns = 2 # number +indent_with_tabs = 0 # number -indent_class = true # false/true -indent_class_colon = true # false/true -indent_constr_colon = true # false/true -indent_func_class_param = true # false/true -indent_func_param_double = true # false/true -indent_ctor_init = 2 -indent_access_spec = 2 # number +indent_class = true # false/true +indent_class_colon = true # false/true +indent_constr_colon = true # false/true +indent_func_class_param = true # false/true +indent_func_param_double = true # false/true +indent_ctor_init = 2 +indent_access_spec = 2 # number -nl_collapse_empty_body = true # false/true -nl_constr_init_args = add # ignore/add/remove/force -nl_func_def_start = add # ignore/add/remove/force -nl_func_def_args = add # ignore/add/remove/force -nl_before_access_spec = 2 # number +nl_collapse_empty_body = true # false/true +nl_constr_init_args = add # ignore/add/remove/force +nl_func_def_start = add # ignore/add/remove/force +nl_func_def_args = add # ignore/add/remove/force +nl_before_access_spec = 2 # number -pos_constr_comma = trail_force # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_constr_comma = trail_force # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force diff --git a/tests/config/indent_ctor_init_leading.cfg b/tests/config/indent_ctor_init_leading.cfg index 6a67ecf5ac..82b8339b23 100644 --- a/tests/config/indent_ctor_init_leading.cfg +++ b/tests/config/indent_ctor_init_leading.cfg @@ -1,19 +1,19 @@ -indent_columns = 2 # number -indent_with_tabs = 0 # number +indent_columns = 2 # number +indent_with_tabs = 0 # number -indent_class = true # false/true -indent_class_colon = true # false/true -indent_constr_colon = true # false/true -indent_func_class_param = true # false/true -indent_func_param_double = true # false/true -indent_ctor_init = 2 -indent_ctor_init_leading = 5 -indent_access_spec = 2 # number +indent_class = true # false/true +indent_class_colon = true # false/true +indent_constr_colon = true # false/true +indent_func_class_param = true # false/true +indent_func_param_double = true # false/true +indent_ctor_init = 2 +indent_ctor_init_leading = 5 +indent_access_spec = 2 # number -nl_collapse_empty_body = true # false/true -nl_constr_init_args = add # ignore/add/remove/force -nl_func_def_start = add # ignore/add/remove/force -nl_func_def_args = add # ignore/add/remove/force -nl_before_access_spec = 2 # number +nl_collapse_empty_body = true # false/true +nl_constr_init_args = add # ignore/add/remove/force +nl_func_def_start = add # ignore/add/remove/force +nl_func_def_args = add # ignore/add/remove/force +nl_before_access_spec = 2 # number -pos_constr_comma = trail_force # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_constr_comma = trail_force # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force diff --git a/tests/config/indent_ctor_members_twice.cfg b/tests/config/indent_ctor_members_twice.cfg index 42fdae4389..5cfaa438a2 100644 --- a/tests/config/indent_ctor_members_twice.cfg +++ b/tests/config/indent_ctor_members_twice.cfg @@ -1,6 +1,6 @@ -indent_with_tabs 0 -indent_columns 4 +indent_with_tabs = 0 +indent_columns = 4 -indent_class True -indent_ctor_init 4 -indent_constr_colon True +indent_class = True +indent_ctor_init = 4 +indent_constr_colon = True diff --git a/tests/config/indent_func_call_param.cfg b/tests/config/indent_func_call_param.cfg index 00e4dd1c78..75e3ebc409 100644 --- a/tests/config/indent_func_call_param.cfg +++ b/tests/config/indent_func_call_param.cfg @@ -1,10 +1,10 @@ -indent_func_call_param = true -indent_func_def_param = false -indent_func_proto_param = false +indent_func_call_param = true +indent_func_def_param = false +indent_func_proto_param = false -indent_columns = 3 -indent_with_tabs = 1 -output_tab_size = indent_columns +indent_columns = 3 +indent_with_tabs = 1 +output_tab_size = indent_columns -nl_func_type_name = force +nl_func_type_name = force diff --git a/tests/config/indent_func_def_param.cfg b/tests/config/indent_func_def_param.cfg index 9481d3ce4e..02c73cde08 100644 --- a/tests/config/indent_func_def_param.cfg +++ b/tests/config/indent_func_def_param.cfg @@ -1,9 +1,9 @@ -indent_func_call_param = false -indent_func_def_param = true -indent_func_proto_param = false +indent_func_call_param = false +indent_func_def_param = true +indent_func_proto_param = false -indent_columns = 3 -indent_with_tabs = 1 -output_tab_size = indent_columns +indent_columns = 3 +indent_with_tabs = 1 +output_tab_size = indent_columns -nl_func_proto_type_name = force +nl_func_proto_type_name = force diff --git a/tests/config/indent_func_param.cfg b/tests/config/indent_func_param.cfg index 3d8e8a7043..002fc8517b 100644 --- a/tests/config/indent_func_param.cfg +++ b/tests/config/indent_func_param.cfg @@ -1,8 +1,8 @@ -indent_func_call_param = true -indent_func_def_param = true -indent_func_proto_param = true +indent_func_call_param = true +indent_func_def_param = true +indent_func_proto_param = true -indent_columns = 3 -indent_with_tabs = 1 -output_tab_size = indent_columns +indent_columns = 3 +indent_with_tabs = 1 +output_tab_size = indent_columns diff --git a/tests/config/indent_func_proto_param.cfg b/tests/config/indent_func_proto_param.cfg index 8fc638d179..3bceeec806 100644 --- a/tests/config/indent_func_proto_param.cfg +++ b/tests/config/indent_func_proto_param.cfg @@ -1,8 +1,8 @@ -indent_func_call_param = false -indent_func_def_param = false -indent_func_proto_param = true +indent_func_call_param = false +indent_func_def_param = false +indent_func_proto_param = true -indent_columns = 3 -indent_with_tabs = 1 -output_tab_size = indent_columns +indent_columns = 3 +indent_with_tabs = 1 +output_tab_size = indent_columns diff --git a/tests/config/indent_namespace-f.cfg b/tests/config/indent_namespace-f.cfg index e45774f38a..14b9188d0f 100644 --- a/tests/config/indent_namespace-f.cfg +++ b/tests/config/indent_namespace-f.cfg @@ -1,6 +1,6 @@ # # $Id: nl_namespace-r.cfg 803 2007-07-25 00:36:25Z bengardner $ -indent_class = True -indent_namespace = False +indent_class = True +indent_namespace = False diff --git a/tests/config/indent_namespace-t.cfg b/tests/config/indent_namespace-t.cfg index 947cf668b4..26f3438863 100644 --- a/tests/config/indent_namespace-t.cfg +++ b/tests/config/indent_namespace-t.cfg @@ -1,5 +1,5 @@ # -indent_class = True -indent_namespace = True +indent_class = True +indent_namespace = True -indent_namespace_single_indent = True +indent_namespace_single_indent = True diff --git a/tests/config/indent_namespace_single_indent.cfg b/tests/config/indent_namespace_single_indent.cfg index d691a69177..046c3bf478 100644 --- a/tests/config/indent_namespace_single_indent.cfg +++ b/tests/config/indent_namespace_single_indent.cfg @@ -1,3 +1,3 @@ -indent_extern = true -indent_namespace = true -indent_namespace_single_indent = true +indent_extern = true +indent_namespace = true +indent_namespace_single_indent = true diff --git a/tests/config/indent_once.cfg b/tests/config/indent_once.cfg index 0828c7ee6f..aa34fef258 100644 --- a/tests/config/indent_once.cfg +++ b/tests/config/indent_once.cfg @@ -1,5 +1,5 @@ -indent_columns=2 -indent_continue=5 -indent_with_tabs=0 -indent_align_assign=false -use_indent_continue_only_once=true +indent_columns = 2 +indent_continue = 5 +indent_with_tabs = 0 +indent_align_assign = false +use_indent_continue_only_once = true diff --git a/tests/config/indent_paren_after_func_call.cfg b/tests/config/indent_paren_after_func_call.cfg index f1100d8f51..63e7504f6f 100644 --- a/tests/config/indent_paren_after_func_call.cfg +++ b/tests/config/indent_paren_after_func_call.cfg @@ -1 +1 @@ -indent_paren_after_func_call = true \ No newline at end of file +indent_paren_after_func_call = true diff --git a/tests/config/indent_paren_after_func_decl.cfg b/tests/config/indent_paren_after_func_decl.cfg index f89bfcfb53..8725bd3bb0 100644 --- a/tests/config/indent_paren_after_func_decl.cfg +++ b/tests/config/indent_paren_after_func_decl.cfg @@ -1 +1 @@ -indent_paren_after_func_decl = true \ No newline at end of file +indent_paren_after_func_decl = true diff --git a/tests/config/indent_paren_after_func_def.cfg b/tests/config/indent_paren_after_func_def.cfg index 2f2229bd8a..e139934a5f 100644 --- a/tests/config/indent_paren_after_func_def.cfg +++ b/tests/config/indent_paren_after_func_def.cfg @@ -1 +1 @@ -indent_paren_after_func_def = true \ No newline at end of file +indent_paren_after_func_def = true diff --git a/tests/config/indent_paren_close-0.cfg b/tests/config/indent_paren_close-0.cfg index 832d823e7a..ac439da07e 100644 --- a/tests/config/indent_paren_close-0.cfg +++ b/tests/config/indent_paren_close-0.cfg @@ -1,8 +1,8 @@ -indent_with_tabs = 1 -input_tab_size = 8 -output_tab_size = 8 -indent_columns = output_tab_size +indent_with_tabs = 1 +input_tab_size = 8 +output_tab_size = 8 +indent_columns = output_tab_size -indent_paren_close = 0 +indent_paren_close = 0 diff --git a/tests/config/indent_paren_close-1.cfg b/tests/config/indent_paren_close-1.cfg index 88d8800ecf..c24e5b9d5b 100644 --- a/tests/config/indent_paren_close-1.cfg +++ b/tests/config/indent_paren_close-1.cfg @@ -1,17 +1,17 @@ -indent_with_tabs = 1 -input_tab_size = 8 -output_tab_size = 8 -indent_columns = output_tab_size +indent_with_tabs = 1 +input_tab_size = 8 +output_tab_size = 8 +indent_columns = output_tab_size -indent_paren_close = 1 -indent_comma_paren = true -indent_bool_paren = true +indent_paren_close = 1 +indent_comma_paren = true +indent_bool_paren = true -sp_after_comma = force -sp_inside_fparen = force -sp_inside_sparen = force -sp_inside_paren = force -pos_comma = lead +sp_after_comma = force +sp_inside_fparen = force +sp_inside_sparen = force +sp_inside_paren = force +pos_comma = lead diff --git a/tests/config/indent_paren_close-2.cfg b/tests/config/indent_paren_close-2.cfg index 0f5441e780..3bc571414b 100644 --- a/tests/config/indent_paren_close-2.cfg +++ b/tests/config/indent_paren_close-2.cfg @@ -1,8 +1,8 @@ -indent_with_tabs = 1 -input_tab_size = 8 -output_tab_size = 8 -indent_columns = output_tab_size +indent_with_tabs = 1 +input_tab_size = 8 +output_tab_size = 8 +indent_columns = output_tab_size -indent_paren_close = 2 +indent_paren_close = 2 diff --git a/tests/config/indent_shift.cfg b/tests/config/indent_shift.cfg index a070c9aa66..4a68ed2673 100644 --- a/tests/config/indent_shift.cfg +++ b/tests/config/indent_shift.cfg @@ -1,4 +1,4 @@ -align_left_shift=false -indent_shift=true -indent_continue=4 -indent_columns=4 +align_left_shift = false +indent_shift = true +indent_continue = 4 +indent_columns = 4 diff --git a/tests/config/indent_switch_pp.cfg b/tests/config/indent_switch_pp.cfg index bb157670bf..a11cb125e8 100644 --- a/tests/config/indent_switch_pp.cfg +++ b/tests/config/indent_switch_pp.cfg @@ -1 +1 @@ -indent_switch_pp = false \ No newline at end of file +indent_switch_pp = false diff --git a/tests/config/indent_ternary-1.cfg b/tests/config/indent_ternary-1.cfg index fcb2fab5ac..2d716615a5 100644 --- a/tests/config/indent_ternary-1.cfg +++ b/tests/config/indent_ternary-1.cfg @@ -1,2 +1,2 @@ -indent_ternary_operator = 1 +indent_ternary_operator = 1 diff --git a/tests/config/indent_ternary-2.cfg b/tests/config/indent_ternary-2.cfg index c73cc58aa2..68920959a1 100644 --- a/tests/config/indent_ternary-2.cfg +++ b/tests/config/indent_ternary-2.cfg @@ -1,2 +1,2 @@ -indent_ternary_operator = 2 +indent_ternary_operator = 2 diff --git a/tests/config/indent_var_def.cfg b/tests/config/indent_var_def.cfg index 6c3c888cb4..b8990e581d 100644 --- a/tests/config/indent_var_def.cfg +++ b/tests/config/indent_var_def.cfg @@ -5,19 +5,19 @@ # # The type of line endings -newlines = lf # auto/lf/crlf/cr +newlines = lf # auto/lf/crlf/cr # The original size of tabs in the input -input_tab_size = 8 # number +input_tab_size = 8 # number # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 3 # number +output_tab_size = 3 # number # The ascii value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # number # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # number # # Indenting @@ -25,1077 +25,1077 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 3 # number +indent_columns = 3 # number -indent_var_def_blk = -indent_columns +indent_var_def_blk = -indent_columns # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # number # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # false/true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # number # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # number # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # false/true # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # false/true # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # false/true # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # false/true # Whether the 'extern "C"' body is indented -indent_extern = false # false/true +indent_extern = false # false/true # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # false/true # Whether to indent the stuff after a leading class colon -indent_class_colon = true # false/true +indent_class_colon = true # false/true # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level -indent_else_if = false # false/true +indent_else_if = false # false/true # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = false # false/true +indent_func_call_param = false # false/true # Same as indent_func_call_param, but for function defs -indent_func_def_param = false # false/true +indent_func_def_param = false # false/true # Same as indent_func_call_param, but for function protos -indent_func_proto_param = false # false/true +indent_func_proto_param = false # false/true # Same as indent_func_call_param, but for class declarations -indent_func_class_param = false # false/true +indent_func_class_param = false # false/true # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = false # false/true +indent_func_ctor_var_param = false # false/true # Same as indent_func_call_param, but for templates -indent_template_param = false # false/true +indent_template_param = false # false/true # Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true +indent_func_param_double = false # false/true # Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 0 # number +indent_func_const = 0 # number # Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 0 # number +indent_func_throw = 0 # number # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 3 # number +indent_member = 3 # number # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # number # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = false # false/true +indent_relative_single_line_comments = false # false/true # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 0 # number +indent_switch_case = 0 # number # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # number # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 0 # number +indent_case_brace = 0 # number # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # false/true # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # number # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # number # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # false/true # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # false/true # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 0 # number +indent_paren_close = 0 # number # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # false/true # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # false/true # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # false/true # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # false/true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # ignore/add/remove/force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # ignore/add/remove/force # Add or remove space around assignment '=' in enum -sp_enum_assign = ignore # ignore/add/remove/force +sp_enum_assign = ignore # ignore/add/remove/force # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # ignore/add/remove/force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # ignore/add/remove/force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # ignore/add/remove/force # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # ignore/add/remove/force # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # false/true # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # ignore/add/remove/force # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # ignore/add/remove/force # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force +sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # ignore/add/remove/force # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # ignore/add/remove/force # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = ignore # ignore/add/remove/force +sp_after_ptr_star_func = ignore # ignore/add/remove/force # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = ignore # ignore/add/remove/force +sp_before_ptr_star_func = ignore # ignore/add/remove/force # Add or remove space before a reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # ignore/add/remove/force # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force +sp_before_unnamed_byref = ignore # ignore/add/remove/force # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = force # ignore/add/remove/force +sp_after_byref = force # ignore/add/remove/force # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = ignore # ignore/add/remove/force +sp_after_byref_func = ignore # ignore/add/remove/force # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = ignore # ignore/add/remove/force +sp_before_byref_func = ignore # ignore/add/remove/force # Add or remove space between type and word -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # ignore/add/remove/force # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. -sp_template_angle = ignore # ignore/add/remove/force +sp_template_angle = ignore # ignore/add/remove/force # Add or remove space before '<>' -sp_before_angle = remove # ignore/add/remove/force +sp_before_angle = remove # ignore/add/remove/force # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # ignore/add/remove/force # Add or remove space after '<>' -sp_after_angle = force # ignore/add/remove/force +sp_after_angle = force # ignore/add/remove/force # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = ignore # ignore/add/remove/force +sp_angle_paren = ignore # ignore/add/remove/force # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = ignore # ignore/add/remove/force +sp_angle_word = ignore # ignore/add/remove/force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # ignore/add/remove/force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # ignore/add/remove/force # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # ignore/add/remove/force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = add # ignore/add/remove/force +sp_sparen_brace = add # ignore/add/remove/force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # ignore/add/remove/force # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # ignore/add/remove/force # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = ignore # ignore/add/remove/force +sp_before_semi_for = ignore # ignore/add/remove/force # Add or remove space before a semicolon of an empty part of a for statment. -sp_before_semi_for_empty = force # ignore/add/remove/force +sp_before_semi_for_empty = force # ignore/add/remove/force # Add or remove space after the final semicolon of an empty part of a for statment: for ( ; ; ). -sp_after_semi_for_empty = ignore # ignore/add/remove/force +sp_after_semi_for_empty = ignore # ignore/add/remove/force # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # ignore/add/remove/force # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # ignore/add/remove/force # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # ignore/add/remove/force # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # ignore/add/remove/force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # ignore/add/remove/force # Add or remove space after class ':' -sp_after_class_colon = ignore # ignore/add/remove/force +sp_after_class_colon = ignore # ignore/add/remove/force # Add or remove space before class ':' -sp_before_class_colon = ignore # ignore/add/remove/force +sp_before_class_colon = ignore # ignore/add/remove/force # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # ignore/add/remove/force # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = ignore # ignore/add/remove/force +sp_after_operator_sym = ignore # ignore/add/remove/force # Add or remove space after C/D cast, ie 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # ignore/add/remove/force # Add or remove spaces inside cast parens -sp_inside_paren_cast = ignore # ignore/add/remove/force +sp_inside_paren_cast = ignore # ignore/add/remove/force # Add or remove space between the type and open paren in a C++ cast, ie 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = ignore # ignore/add/remove/force +sp_cpp_cast_paren = ignore # ignore/add/remove/force # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # ignore/add/remove/force # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # ignore/add/remove/force # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = force # ignore/add/remove/force +sp_inside_braces_enum = force # ignore/add/remove/force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = force # ignore/add/remove/force +sp_inside_braces_struct = force # ignore/add/remove/force # Add or remove space inside '{' and '}' -sp_inside_braces = force # ignore/add/remove/force +sp_inside_braces = force # ignore/add/remove/force # Add or remove space inside '{}' -sp_inside_braces_empty = ignore # ignore/add/remove/force +sp_inside_braces_empty = ignore # ignore/add/remove/force # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = force # ignore/add/remove/force +sp_type_func = force # ignore/add/remove/force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # ignore/add/remove/force # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # ignore/add/remove/force # Add or remove space inside empty function '()' -sp_inside_fparens = ignore # ignore/add/remove/force +sp_inside_fparens = ignore # ignore/add/remove/force # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # ignore/add/remove/force # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # ignore/add/remove/force # Add or remove space between ')' and '{' of function -sp_fparen_brace = add # ignore/add/remove/force +sp_fparen_brace = add # ignore/add/remove/force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # ignore/add/remove/force # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = ignore # ignore/add/remove/force +sp_func_call_user_paren = ignore # ignore/add/remove/force # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # ignore/add/remove/force # Add or remove space between 'return' and '(' -sp_return_paren = remove # ignore/add/remove/force +sp_return_paren = remove # ignore/add/remove/force # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # ignore/add/remove/force # Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = ignore # ignore/add/remove/force +sp_defined_paren = ignore # ignore/add/remove/force # Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = ignore # ignore/add/remove/force +sp_throw_paren = ignore # ignore/add/remove/force # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # ignore/add/remove/force # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # ignore/add/remove/force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = ignore # ignore/add/remove/force +sp_else_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # ignore/add/remove/force # Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = force # ignore/add/remove/force +sp_brace_typedef = force # ignore/add/remove/force # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # ignore/add/remove/force # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # ignore/add/remove/force # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # ignore/add/remove/force # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # ignore/add/remove/force # Add or remove space before the '::' operator -sp_before_dc = remove # ignore/add/remove/force +sp_before_dc = remove # ignore/add/remove/force # Add or remove space after the '::' operator -sp_after_dc = remove # ignore/add/remove/force +sp_after_dc = remove # ignore/add/remove/force # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # ignore/add/remove/force # Add or remove space after the '!' (not) operator. -sp_not = remove # ignore/add/remove/force +sp_not = remove # ignore/add/remove/force # Add or remove space after the '~' (invert) operator. -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # ignore/add/remove/force # Add or remove space after the '&' (address-of) operator. # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # ignore/add/remove/force # Add or remove space around the '.' or '->' operators -sp_member = remove # ignore/add/remove/force +sp_member = remove # ignore/add/remove/force # Add or remove space after the '*' (dereference) operator. # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # ignore/add/remove/force # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7' -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # ignore/add/remove/force # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;' -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # ignore/add/remove/force # Add or remove space before a backslash-newline at the end of a line -sp_before_nl_cont = add # ignore/add/remove/force +sp_before_nl_cont = add # ignore/add/remove/force # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force +sp_after_oc_scope = ignore # ignore/add/remove/force # Add or remove space after the colon in message specs # '-(int) f:(int) x;' vs '-(int) f: (int) x;' -sp_after_oc_colon = ignore # ignore/add/remove/force +sp_after_oc_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in message specs # '-(int) f: (int) x;' vs '-(int) f : (int) x;' -sp_before_oc_colon = ignore # ignore/add/remove/force +sp_before_oc_colon = ignore # ignore/add/remove/force # Add or remove space after the colon in message specs # '[object setValue:1];' vs '[object setValue: 1];' -sp_after_send_oc_colon = ignore # ignore/add/remove/force +sp_after_send_oc_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in message specs # '[object setValue:1];' vs '[object setValue :1];' -sp_before_send_oc_colon = ignore # ignore/add/remove/force +sp_before_send_oc_colon = ignore # ignore/add/remove/force # Add or remove space after the (type) in message specs # '-(int) f: (int) x;' vs '-(int) f: (int)x;' -sp_after_oc_type = ignore # ignore/add/remove/force +sp_after_oc_type = ignore # ignore/add/remove/force # Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = ignore # ignore/add/remove/force +sp_cond_colon = ignore # ignore/add/remove/force # Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = ignore # ignore/add/remove/force +sp_cond_question = ignore # ignore/add/remove/force # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = remove # ignore/add/remove/force +sp_case_label = remove # ignore/add/remove/force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # false/true # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # false/true # Whether to right-align numbers -align_number_right = true # false/true +align_number_right = true # false/true # Align variable definitions in prototypes and functions -align_func_params = true # false/true +align_func_params = true # false/true # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = false # false/true +align_same_func_call_params = false # false/true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 1 # number -align_var_class_span = 1 # number +align_var_def_span = 1 # number +align_var_class_span = 1 # number # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 1 # number +align_var_def_star_style = 1 # number # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # number # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 16 # number +align_var_def_thresh = 16 # number # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # number # Whether to align the colon in struct bit fields -align_var_def_colon = true # false/true +align_var_def_colon = true # false/true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = true # false/true +align_var_def_inline = true # false/true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 1 # number +align_assign_span = 1 # number # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 12 # number +align_assign_thresh = 12 # number # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 16 # number +align_enum_equ_span = 16 # number # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # number # The span for aligning struct/union (0=don't align) -align_var_struct_span = 99 # number +align_var_struct_span = 99 # number # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # number # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # number # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 3 # number +align_struct_init_span = 3 # number # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 3 # number +align_typedef_gap = 3 # number # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 5 # number +align_typedef_span = 5 # number # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # number # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # number # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typdef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # number # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 3 # number +align_right_cmt_span = 3 # number # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # false/true # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. -align_right_cmt_gap = 0 # number +align_right_cmt_gap = 0 # number # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # number # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # number # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # false/true # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true +align_single_line_func = false # false/true # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # false/true # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # number # The span for aligning ObjC msg spec (0=don't align) -align_oc_msg_spec_span = 0 # number +align_oc_msg_spec_span = 0 # number # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = true # false/true +align_nl_cont = true # false/true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 4 # number +align_pp_define_gap = 4 # number # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 3 # number +align_pp_define_span = 3 # number # Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = true # false/true +align_left_shift = true # false/true # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # false/true # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = true # false/true +nl_assign_leave_one_liners = true # false/true # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = true # false/true +nl_class_leave_one_liners = true # false/true # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = false # false/true +nl_enum_leave_one_liners = false # false/true # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # false/true # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # false/true # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # false/true # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # ignore/add/remove/force # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # number # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # ignore/add/remove/force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # number # Add or remove newline between '=' and '{' -nl_assign_brace = add # ignore/add/remove/force +nl_assign_brace = add # ignore/add/remove/force # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # ignore/add/remove/force # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # ignore/add/remove/force # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # number # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = add # ignore/add/remove/force +nl_fcall_brace = add # ignore/add/remove/force # Add or remove newline between 'enum' and '{' -nl_enum_brace = force # ignore/add/remove/force +nl_enum_brace = force # ignore/add/remove/force # Add or remove newline between 'struct and '{' -nl_struct_brace = force # ignore/add/remove/force +nl_struct_brace = force # ignore/add/remove/force # Add or remove newline between 'union' and '{' -nl_union_brace = force # ignore/add/remove/force +nl_union_brace = force # ignore/add/remove/force # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # ignore/add/remove/force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = ignore # ignore/add/remove/force +nl_elseif_brace = ignore # ignore/add/remove/force # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # ignore/add/remove/force # Add or remove newline between 'else' and 'if' -nl_else_if = ignore # ignore/add/remove/force +nl_else_if = ignore # ignore/add/remove/force # Add or remove newline between '}' and 'finally' -nl_brace_finally = ignore # ignore/add/remove/force +nl_brace_finally = ignore # ignore/add/remove/force # Add or remove newline between 'finally' and '{' -nl_finally_brace = ignore # ignore/add/remove/force +nl_finally_brace = ignore # ignore/add/remove/force # Add or remove newline between 'try' and '{' -nl_try_brace = ignore # ignore/add/remove/force +nl_try_brace = ignore # ignore/add/remove/force # Add or remove newline between get/set and '{' -nl_getset_brace = force # ignore/add/remove/force +nl_getset_brace = force # ignore/add/remove/force # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # ignore/add/remove/force # Add or remove newline between 'catch' and '{' -nl_catch_brace = ignore # ignore/add/remove/force +nl_catch_brace = ignore # ignore/add/remove/force # Add or remove newline between '}' and 'catch' -nl_brace_catch = ignore # ignore/add/remove/force +nl_brace_catch = ignore # ignore/add/remove/force # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # ignore/add/remove/force # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # ignore/add/remove/force # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # ignore/add/remove/force # Add or remove newline when condition spans two or more lines -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # false/true # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = true # false/true +nl_multi_line_define = true # false/true # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # false/true # Add or remove newline between ')' and 'throw' -nl_before_throw = ignore # ignore/add/remove/force +nl_before_throw = ignore # ignore/add/remove/force # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # false/true # Newline between namespace and { -nl_namespace_brace = ignore # ignore/add/remove/force +nl_namespace_brace = ignore # ignore/add/remove/force # Add or remove newline between 'template<>' and whatever follows. -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # ignore/add/remove/force # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # ignore/add/remove/force # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = ignore # ignore/add/remove/force +nl_func_proto_type_name = ignore # ignore/add/remove/force # Add or remove newline between a function name and the opening '(' -nl_func_paren = remove # ignore/add/remove/force +nl_func_paren = remove # ignore/add/remove/force # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # ignore/add/remove/force # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # ignore/add/remove/force # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # ignore/add/remove/force # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # ignore/add/remove/force # Whether to put a newline after 'return' statement -nl_after_return = true # false/true +nl_after_return = true # false/true # Add or remove a newline between the return keyword and return expression. -nl_return_expr = ignore # ignore/add/remove/force +nl_return_expr = ignore # ignore/add/remove/force # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # false/true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = true # false/true +nl_after_brace_open = true # false/true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true +nl_after_brace_open_cmt = false # false/true # Whether to put a newline after a virtual brace open. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = false # false/true +nl_after_vbrace_open = false # false/true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # false/true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = true # false/true +nl_squeeze_ifdef = true # false/true # Add or remove newline before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # ignore/add/remove/force # Add or remove newline after 'if' -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # ignore/add/remove/force # Add or remove newline before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # ignore/add/remove/force # Add or remove newline after 'for' -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # ignore/add/remove/force # Add or remove newline before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # ignore/add/remove/force # Add or remove newline after 'while' -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # ignore/add/remove/force # Add or remove newline before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # ignore/add/remove/force # Add or remove newline after 'switch' -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # ignore/add/remove/force # Add or remove newline before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # ignore/add/remove/force # Add or remove newline after 'do' -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # ignore/add/remove/force # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # false/true # Whether to double-space before the close brace of a struct/union/enum -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # false/true # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # ignore/add/remove/force # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # false/true # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # false/true # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # false/true # # Positioning options # # The position of arithmetic operators in wrapped expressions -pos_arith = ignore # ignore/lead/trail +pos_arith = ignore # ignore/lead/trail # The position of assignment in wrapped expressions -pos_assign = ignore # ignore/lead/trail +pos_assign = ignore # ignore/lead/trail # The position of boolean operators in wrapped expressions -pos_bool = trail # ignore/lead/trail +pos_bool = trail # ignore/lead/trail # The position of the comma in wrapped expressions -pos_comma = ignore # ignore/lead/trail +pos_comma = ignore # ignore/lead/trail # The position of the comma in the constructor initialization list -pos_class_comma = ignore # ignore/lead/trail +pos_class_comma = ignore # ignore/lead/trail # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # ignore/lead/trail # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # number # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true +ls_for_split_full = false # false/true # Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true +ls_func_split_full = false # false/true # # Blank line options # # The maximum consecutive newlines -nl_max = 4 # number +nl_max = 4 # number # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # number # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # number # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 3 # number +nl_after_func_body = 3 # number # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 0 # number +nl_after_func_body_one_liner = 0 # number # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # number # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # number # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # number # Whether to force a newline after a mulit-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # false/true # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 0 # number +nl_before_access_spec = 0 # number # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # number # The number of newlines between a function def and the function comment. # 0 = No change. -nl_comment_func_def = 1 # number +nl_comment_func_def = 1 # number # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # false/true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # false/true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # ignore/add/remove/force # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # ignore/add/remove/force # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # ignore/add/remove/force # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # ignore/add/remove/force # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # number # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # ignore/add/remove/force # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = add # ignore/add/remove/force +mod_paren_on_return = add # ignore/add/remove/force # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # false/true # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = true # false/true +mod_full_paren_if_bool = true # false/true # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = true # false/true +mod_remove_extra_semicolon = true # false/true # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 0 # number +mod_add_long_function_closebrace_comment = 0 # number # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number +mod_add_long_switch_closebrace_comment = 0 # number # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # false/true # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # false/true # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # false/true # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = false # false/true +mod_move_case_break = false # false/true # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = true # false/true +mod_remove_empty_return = true # false/true # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # number # If false, disable all multi-line comment changes, including cmt_width and leading chars. # Default is true. -cmt_indent_multi = true # false/true +cmt_indent_multi = true # false/true # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # false/true # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # false/true # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # false/true # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # false/true # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # false/true # Whether to put a star on subsequent comment lines -cmt_star_cont = true # false/true +cmt_star_cont = true # false/true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # number # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # number # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true # false/true # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitue $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # string # The filename that contains text to insert before a function implementation if the function isn't preceeded with a C/C++ comment. # Will substitue $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # string # The filename that contains text to insert before a class if the class isn't preceeded with a C/C++ comment. # Will substitue $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # string # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true +cmt_insert_before_preproc = false # false/true # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = force # ignore/add/remove/force +pp_indent = force # ignore/add/remove/force # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # false/true # If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. -pp_indent_count = 1 # number +pp_indent_count = 1 # number # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # ignore/add/remove/force # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # number # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # number # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # false/true # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # number # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true +pp_if_indent_code = false # false/true # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # false/true # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/indent_var_def_cont.cfg b/tests/config/indent_var_def_cont.cfg index c7eeb3a9d6..7de370e51c 100644 --- a/tests/config/indent_var_def_cont.cfg +++ b/tests/config/indent_var_def_cont.cfg @@ -1,2 +1,2 @@ -indent_var_def_cont = true +indent_var_def_cont = true diff --git a/tests/config/initlist_leading_commas.cfg b/tests/config/initlist_leading_commas.cfg index 2b7c48e509..817e6bff7d 100644 --- a/tests/config/initlist_leading_commas.cfg +++ b/tests/config/initlist_leading_commas.cfg @@ -1,3 +1,3 @@ -indent_columns 4 -nl_constr_init_args Force -pos_constr_comma Trail +indent_columns = 4 +nl_constr_init_args = Force +pos_constr_comma = Trail diff --git a/tests/config/issue_564.cfg b/tests/config/issue_564.cfg index e716ec124e..14843b3470 100644 --- a/tests/config/issue_564.cfg +++ b/tests/config/issue_564.cfg @@ -1,2 +1,2 @@ -#align_func_params=true # { False, True } -align_same_func_call_params=true # { False, True } +#align_func_params=true # { False, True } +align_same_func_call_params = true # { False, True } diff --git a/tests/config/issue_574.cfg b/tests/config/issue_574.cfg index 1e678acbb4..d129c56795 100644 --- a/tests/config/issue_574.cfg +++ b/tests/config/issue_574.cfg @@ -3,41 +3,41 @@ # # Qt specific options # -set FOR foreach -set FOR forever +set FOR foreach +set FOR forever # # General options # # The type of line endings -newlines = auto # auto/lf/crlf/cr +newlines = auto # auto/lf/crlf/cr # The original size of tabs in the input -input_tab_size = 4 # number +input_tab_size = 4 # number # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 4 # number +output_tab_size = 4 # number # The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # number # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # number # Allow interpreting '>=' and '>>=' as part of a template in 'void f(list>=val);'. # If true (default), 'assert(x<0 && y>=3)' will be broken. # Improvements to template detection may make this option obsolete. -tok_split_gte = false # false/true +tok_split_gte = false # false/true # Control what to do with the UTF-8 BOM (recommend 'remove') -utf8_bom = ignore # ignore/add/remove/force +utf8_bom = ignore # ignore/add/remove/force # If the file contains bytes with values between 128 and 255, but is not UTF-8, then output as UTF-8 -utf8_byte = false # false/true +utf8_byte = false # false/true # Force the output encoding to UTF-8 -utf8_force = false # false/true +utf8_force = false # false/true # # Indenting @@ -45,1532 +45,1532 @@ utf8_force = false # false/true # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 4 # number +indent_columns = 4 # number # The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents. # For FreeBSD, this is set to 4. Negative value is absolute and not increased for each ( level -indent_continue = 0 # number +indent_continue = 0 # number # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs to brace level, align with spaces # 2=indent and align with tabs, using spaces when not on a tabstop -indent_with_tabs = 0 # number +indent_with_tabs = 0 # number # Comments that are not a brace level are indented with tabs on a tabstop. # Requires indent_with_tabs=2. If false, will use spaces. -indent_cmt_with_tabs = false # false/true +indent_cmt_with_tabs = false # false/true # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # false/true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # number # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # number # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # false/true # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # false/true # Disabled indenting class braces if indent_braces is true -indent_braces_no_class = false # false/true +indent_braces_no_class = false # false/true # Disabled indenting struct braces if indent_braces is true -indent_braces_no_struct = false # false/true +indent_braces_no_struct = false # false/true # Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # false/true # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # false/true # The number of spaces to indent a namespace block -indent_namespace_level = 0 # number +indent_namespace_level = 0 # number # If the body of the namespace is longer than this number, it won't be indented. # Requires indent_namespace=true. Default=0 (no limit) -indent_namespace_limit = 0 # number +indent_namespace_limit = 0 # number # Whether the 'extern "C"' body is indented -indent_extern = false # false/true +indent_extern = false # false/true # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # false/true # Whether to indent the stuff after a leading class colon -indent_class_colon = false # false/true +indent_class_colon = false # false/true # Virtual indent from the ':' for member initializers. Default is 2 -indent_ctor_init_leading = 2 # number +indent_ctor_init_leading = 2 # number # Additional indenting for constructor initializer list -indent_ctor_init = 0 # number +indent_ctor_init = 0 # number # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level -indent_else_if = false # false/true +indent_else_if = false # false/true # Amount to indent variable declarations after a open brace. neg=relative, pos=absolute -indent_var_def_blk = 0 # number +indent_var_def_blk = 0 # number # Indent continued variable declarations instead of aligning. -indent_var_def_cont = false # false/true +indent_var_def_cont = false # false/true # True: force indentation of function definition to start in column 1 # False: use the default behavior -indent_func_def_force_col1 = false # false/true +indent_func_def_force_col1 = false # false/true # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = false # false/true +indent_func_call_param = false # false/true # Same as indent_func_call_param, but for function defs -indent_func_def_param = false # false/true +indent_func_def_param = false # false/true # Same as indent_func_call_param, but for function protos -indent_func_proto_param = false # false/true +indent_func_proto_param = false # false/true # Same as indent_func_call_param, but for class declarations -indent_func_class_param = false # false/true +indent_func_class_param = false # false/true # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = false # false/true +indent_func_ctor_var_param = false # false/true # Same as indent_func_call_param, but for templates -indent_template_param = false # false/true +indent_template_param = false # false/true # Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true +indent_func_param_double = false # false/true # Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 0 # number +indent_func_const = 0 # number # Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 0 # number +indent_func_throw = 0 # number # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 0 # number +indent_member = 0 # number # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # number # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = false # false/true +indent_relative_single_line_comments = false # false/true # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 0 # number +indent_switch_case = 0 # number # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # number # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 0 # number +indent_case_brace = 0 # number # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # false/true # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # number # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = -4 # number +indent_access_spec = -4 # number # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # false/true # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # false/true # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 0 # number +indent_paren_close = 0 # number # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # false/true # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # false/true # If 'indent_bool_paren' is true, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones -indent_first_bool_expr = false # false/true +indent_first_bool_expr = false # false/true # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # false/true # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # false/true # Align continued statements at the '='. Default=True # If FALSE or the '=' is followed by a newline, the next line is indent one tab. -indent_align_assign = true # false/true +indent_align_assign = true # false/true # Indent OC blocks at brace level instead of usual rules. -indent_oc_block = false # false/true +indent_oc_block = false # false/true # Indent OC blocks in a message relative to the parameter name. # 0=use indent_oc_block rules, 1+=spaces to indent -indent_oc_block_msg = 0 # number +indent_oc_block_msg = 0 # number # Minimum indent for subsequent parameters -indent_oc_msg_colon = 0 # number +indent_oc_msg_colon = 0 # number # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = ignore # ignore/add/remove/force +sp_arith = ignore # ignore/add/remove/force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # ignore/add/remove/force # Add or remove space around '=' in C++11 lambda capture specifications. Overrides sp_assign -sp_cpp_lambda_assign = remove # ignore/add/remove/force +sp_cpp_lambda_assign = remove # ignore/add/remove/force # Add or remove space after the capture specification in C++11 lambda. -sp_cpp_lambda_paren = ignore # ignore/add/remove/force +sp_cpp_lambda_paren = ignore # ignore/add/remove/force # Add or remove space around assignment operator '=' in a prototype -sp_assign_default = force # ignore/add/remove/force +sp_assign_default = force # ignore/add/remove/force # Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. -sp_before_assign = ignore # ignore/add/remove/force +sp_before_assign = ignore # ignore/add/remove/force # Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. -sp_after_assign = ignore # ignore/add/remove/force +sp_after_assign = ignore # ignore/add/remove/force # Add or remove space around assignment '=' in enum -sp_enum_assign = force # ignore/add/remove/force +sp_enum_assign = force # ignore/add/remove/force # Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_before_assign = ignore # ignore/add/remove/force +sp_enum_before_assign = ignore # ignore/add/remove/force # Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_after_assign = ignore # ignore/add/remove/force +sp_enum_after_assign = ignore # ignore/add/remove/force # Add or remove space around preprocessor '##' concatenation operator. Default=Add -sp_pp_concat = add # ignore/add/remove/force +sp_pp_concat = add # ignore/add/remove/force # Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator. -sp_pp_stringify = ignore # ignore/add/remove/force +sp_pp_stringify = ignore # ignore/add/remove/force # Add or remove space before preprocessor '#' stringify operator as in '#define x(y) L#y'. -sp_before_pp_stringify = ignore # ignore/add/remove/force +sp_before_pp_stringify = ignore # ignore/add/remove/force # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # ignore/add/remove/force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # ignore/add/remove/force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # ignore/add/remove/force # Add or remove space between nested parens: '((' vs ') )' -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # ignore/add/remove/force # Add or remove space between back-to-back parens: ')(' vs ') (' -sp_cparen_oparen = ignore # ignore/add/remove/force +sp_cparen_oparen = ignore # ignore/add/remove/force # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # false/true # Add or remove space between ')' and '{' -sp_paren_brace = force # ignore/add/remove/force +sp_paren_brace = force # ignore/add/remove/force # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # ignore/add/remove/force # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force +sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # ignore/add/remove/force # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # ignore/add/remove/force # Add or remove space after pointer star '*', if followed by a qualifier. -sp_after_ptr_star_qualifier = force +sp_after_ptr_star_qualifier = force # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = remove # ignore/add/remove/force +sp_after_ptr_star_func = remove # ignore/add/remove/force # Add or remove space after a pointer star '*', if followed by an open paren (function types). -sp_ptr_star_paren = remove # ignore/add/remove/force +sp_ptr_star_paren = remove # ignore/add/remove/force # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = force # ignore/add/remove/force +sp_before_ptr_star_func = force # ignore/add/remove/force # Add or remove space before a reference sign '&' -sp_before_byref = force # ignore/add/remove/force +sp_before_byref = force # ignore/add/remove/force # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force +sp_before_unnamed_byref = ignore # ignore/add/remove/force # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = remove # ignore/add/remove/force +sp_after_byref = remove # ignore/add/remove/force # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = ignore # ignore/add/remove/force +sp_after_byref_func = ignore # ignore/add/remove/force # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = ignore # ignore/add/remove/force +sp_before_byref_func = ignore # ignore/add/remove/force # Add or remove space between type and word. Default=Force -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # ignore/add/remove/force # Add or remove space before the paren in the D constructs 'template Foo(' and 'class Foo('. -sp_before_template_paren = ignore # ignore/add/remove/force +sp_before_template_paren = ignore # ignore/add/remove/force # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. -sp_template_angle = remove # ignore/add/remove/force +sp_template_angle = remove # ignore/add/remove/force # Add or remove space before '<>' -sp_before_angle = ignore # ignore/add/remove/force +sp_before_angle = ignore # ignore/add/remove/force # Add or remove space inside '<' and '>' -sp_inside_angle = ignore # ignore/add/remove/force +sp_inside_angle = ignore # ignore/add/remove/force # Add or remove space after '<>' -sp_after_angle = ignore # ignore/add/remove/force +sp_after_angle = ignore # ignore/add/remove/force # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = remove # ignore/add/remove/force +sp_angle_paren = remove # ignore/add/remove/force # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = force # ignore/add/remove/force +sp_angle_word = force # ignore/add/remove/force # Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add -sp_angle_shift = add # ignore/add/remove/force +sp_angle_shift = add # ignore/add/remove/force # Permit removal of the space between '>>' in 'foo >' (C++11 only). Default=False # sp_angle_shift cannot remove the space without this option. -sp_permit_cpp11_shift = false # false/true +sp_permit_cpp11_shift = false # false/true # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # ignore/add/remove/force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # ignore/add/remove/force # Add or remove space before if-condition ')'. Overrides sp_inside_sparen. -sp_inside_sparen_close = ignore # ignore/add/remove/force +sp_inside_sparen_close = ignore # ignore/add/remove/force # Add or remove space before if-condition '('. Overrides sp_inside_sparen. -sp_inside_sparen_open = ignore # ignore/add/remove/force +sp_inside_sparen_open = ignore # ignore/add/remove/force # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # ignore/add/remove/force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = force # ignore/add/remove/force +sp_sparen_brace = force # ignore/add/remove/force # Add or remove space between 'invariant' and '(' in the D language. -sp_invariant_paren = ignore # ignore/add/remove/force +sp_invariant_paren = ignore # ignore/add/remove/force # Add or remove space after the ')' in 'invariant (C) c' in the D language. -sp_after_invariant_paren = ignore # ignore/add/remove/force +sp_after_invariant_paren = ignore # ignore/add/remove/force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # ignore/add/remove/force # Add or remove space before ';'. Default=Remove -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # ignore/add/remove/force # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = remove # ignore/add/remove/force +sp_before_semi_for = remove # ignore/add/remove/force # Add or remove space before a semicolon of an empty part of a for statement. -sp_before_semi_for_empty = remove # ignore/add/remove/force +sp_before_semi_for_empty = remove # ignore/add/remove/force # Add or remove space after ';', except when followed by a comment. Default=Add -sp_after_semi = force # ignore/add/remove/force +sp_after_semi = force # ignore/add/remove/force # Add or remove space after ';' in non-empty 'for' statements. Default=Force -sp_after_semi_for = force # ignore/add/remove/force +sp_after_semi_for = force # ignore/add/remove/force # Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; ). -sp_after_semi_for_empty = remove # ignore/add/remove/force +sp_after_semi_for_empty = remove # ignore/add/remove/force # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # ignore/add/remove/force # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # ignore/add/remove/force # Add or remove space inside a non-empty '[' and ']' -sp_inside_square = ignore # ignore/add/remove/force +sp_inside_square = ignore # ignore/add/remove/force # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # ignore/add/remove/force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # ignore/add/remove/force # Add or remove space between an open paren and comma: '(,' vs '( ,' -sp_paren_comma = force # ignore/add/remove/force +sp_paren_comma = force # ignore/add/remove/force # Add or remove space before the variadic '...' when preceded by a non-punctuator -sp_before_ellipsis = ignore # ignore/add/remove/force +sp_before_ellipsis = ignore # ignore/add/remove/force # Add or remove space after class ':' -sp_after_class_colon = force # ignore/add/remove/force +sp_after_class_colon = force # ignore/add/remove/force # Add or remove space before class ':' -sp_before_class_colon = force # ignore/add/remove/force +sp_before_class_colon = force # ignore/add/remove/force # Add or remove space before case ':'. Default=Remove -sp_before_case_colon = remove # ignore/add/remove/force +sp_before_case_colon = remove # ignore/add/remove/force # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # ignore/add/remove/force # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = ignore # ignore/add/remove/force +sp_after_operator_sym = ignore # ignore/add/remove/force # Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # ignore/add/remove/force # Add or remove spaces inside cast parens -sp_inside_paren_cast = remove # ignore/add/remove/force +sp_inside_paren_cast = remove # ignore/add/remove/force # Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = remove # ignore/add/remove/force +sp_cpp_cast_paren = remove # ignore/add/remove/force # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # ignore/add/remove/force # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # ignore/add/remove/force # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = ignore # ignore/add/remove/force +sp_inside_braces_enum = ignore # ignore/add/remove/force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = ignore # ignore/add/remove/force +sp_inside_braces_struct = ignore # ignore/add/remove/force # Add or remove space inside '{' and '}' -sp_inside_braces = ignore # ignore/add/remove/force +sp_inside_braces = ignore # ignore/add/remove/force # Add or remove space inside '{}' -sp_inside_braces_empty = ignore # ignore/add/remove/force +sp_inside_braces_empty = ignore # ignore/add/remove/force # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = ignore # ignore/add/remove/force +sp_type_func = ignore # ignore/add/remove/force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # ignore/add/remove/force # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # ignore/add/remove/force # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # ignore/add/remove/force # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # ignore/add/remove/force # Add or remove space inside the first parens in the function type: 'void (*x)(...)' -sp_inside_tparen = remove # ignore/add/remove/force +sp_inside_tparen = remove # ignore/add/remove/force # Add or remove between the parens in the function type: 'void (*x)(...)' -sp_after_tparen_close = remove # ignore/add/remove/force +sp_after_tparen_close = remove # ignore/add/remove/force # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = remove # ignore/add/remove/force +sp_square_fparen = remove # ignore/add/remove/force # Add or remove space between ')' and '{' of function -sp_fparen_brace = ignore # ignore/add/remove/force +sp_fparen_brace = ignore # ignore/add/remove/force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # ignore/add/remove/force # Add or remove space between function name and '()' on function calls without parameters. # If set to 'ignore' (the default), sp_func_call_paren is used. -sp_func_call_paren_empty = ignore # ignore/add/remove/force +sp_func_call_paren_empty = ignore # ignore/add/remove/force # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = force # ignore/add/remove/force +sp_func_call_user_paren = force # ignore/add/remove/force # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = ignore # ignore/add/remove/force +sp_func_class_paren = ignore # ignore/add/remove/force # Add or remove space between 'return' and '(' -sp_return_paren = force # ignore/add/remove/force +sp_return_paren = force # ignore/add/remove/force # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # ignore/add/remove/force # Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = ignore # ignore/add/remove/force +sp_defined_paren = ignore # ignore/add/remove/force # Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = ignore # ignore/add/remove/force +sp_throw_paren = ignore # ignore/add/remove/force # Add or remove space between 'throw' and anything other than '(' as in '@throw [...];' -sp_after_throw = ignore # ignore/add/remove/force +sp_after_throw = ignore # ignore/add/remove/force # Add or remove space between 'catch' and '(' in 'catch (something) { }' # If set to ignore, sp_before_sparen is used. -sp_catch_paren = ignore # ignore/add/remove/force +sp_catch_paren = ignore # ignore/add/remove/force # Add or remove space between 'version' and '(' in 'version (something) { }' (D language) # If set to ignore, sp_before_sparen is used. -sp_version_paren = ignore # ignore/add/remove/force +sp_version_paren = ignore # ignore/add/remove/force # Add or remove space between 'scope' and '(' in 'scope (something) { }' (D language) # If set to ignore, sp_before_sparen is used. -sp_scope_paren = ignore # ignore/add/remove/force +sp_scope_paren = ignore # ignore/add/remove/force # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # ignore/add/remove/force # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # ignore/add/remove/force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = force # ignore/add/remove/force +sp_else_brace = force # ignore/add/remove/force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = force # ignore/add/remove/force +sp_brace_else = force # ignore/add/remove/force # Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = ignore # ignore/add/remove/force +sp_brace_typedef = ignore # ignore/add/remove/force # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # ignore/add/remove/force # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # ignore/add/remove/force # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # ignore/add/remove/force # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # ignore/add/remove/force # Add or remove space between a variable and '{' for C++ uniform initialization -sp_word_brace = add # ignore/add/remove/force +sp_word_brace = add # ignore/add/remove/force # Add or remove space between a variable and '{' for a namespace -sp_word_brace_ns = add # ignore/add/remove/force +sp_word_brace_ns = add # ignore/add/remove/force # Add or remove space before the '::' operator -sp_before_dc = ignore # ignore/add/remove/force +sp_before_dc = ignore # ignore/add/remove/force # Add or remove space after the '::' operator -sp_after_dc = ignore # ignore/add/remove/force +sp_after_dc = ignore # ignore/add/remove/force # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # ignore/add/remove/force # Add or remove space after the '!' (not) operator. Default=Remove -sp_not = remove # ignore/add/remove/force +sp_not = remove # ignore/add/remove/force # Add or remove space after the '~' (invert) operator. Default=Remove -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # ignore/add/remove/force # Add or remove space after the '&' (address-of) operator. Default=Remove # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # ignore/add/remove/force # Add or remove space around the '.' or '->' operators. Default=Remove -sp_member = remove # ignore/add/remove/force +sp_member = remove # ignore/add/remove/force # Add or remove space after the '*' (dereference) operator. Default=Remove # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # ignore/add/remove/force # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # ignore/add/remove/force # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # ignore/add/remove/force # Add or remove space before a backslash-newline at the end of a line. Default=Add -sp_before_nl_cont = add # ignore/add/remove/force +sp_before_nl_cont = add # ignore/add/remove/force # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force +sp_after_oc_scope = ignore # ignore/add/remove/force # Add or remove space after the colon in message specs # '-(int) f:(int) x;' vs '-(int) f: (int) x;' -sp_after_oc_colon = ignore # ignore/add/remove/force +sp_after_oc_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in message specs # '-(int) f: (int) x;' vs '-(int) f : (int) x;' -sp_before_oc_colon = ignore # ignore/add/remove/force +sp_before_oc_colon = ignore # ignore/add/remove/force # Add or remove space after the colon in immutable dictionary expression # 'NSDictionary *test = @{@"foo" :@"bar"};' -sp_after_oc_dict_colon = ignore # ignore/add/remove/force +sp_after_oc_dict_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in immutable dictionary expression # 'NSDictionary *test = @{@"foo" :@"bar"};' -sp_before_oc_dict_colon = ignore # ignore/add/remove/force +sp_before_oc_dict_colon = ignore # ignore/add/remove/force # Add or remove space after the colon in message specs # '[object setValue:1];' vs '[object setValue: 1];' -sp_after_send_oc_colon = ignore # ignore/add/remove/force +sp_after_send_oc_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in message specs # '[object setValue:1];' vs '[object setValue :1];' -sp_before_send_oc_colon = ignore # ignore/add/remove/force +sp_before_send_oc_colon = ignore # ignore/add/remove/force # Add or remove space after the (type) in message specs # '-(int)f: (int) x;' vs '-(int)f: (int)x;' -sp_after_oc_type = ignore # ignore/add/remove/force +sp_after_oc_type = ignore # ignore/add/remove/force # Add or remove space after the first (type) in message specs # '-(int) f:(int)x;' vs '-(int)f:(int)x;' -sp_after_oc_return_type = ignore # ignore/add/remove/force +sp_after_oc_return_type = ignore # ignore/add/remove/force # Add or remove space between '@selector' and '(' # '@selector(msgName)' vs '@selector (msgName)' # Also applies to @protocol() constructs -sp_after_oc_at_sel = ignore # ignore/add/remove/force +sp_after_oc_at_sel = ignore # ignore/add/remove/force # Add or remove space between '@selector(x)' and the following word # '@selector(foo) a:' vs '@selector(foo)a:' -sp_after_oc_at_sel_parens = ignore # ignore/add/remove/force +sp_after_oc_at_sel_parens = ignore # ignore/add/remove/force # Add or remove space inside '@selector' parens # '@selector(foo)' vs '@selector( foo )' # Also applies to @protocol() constructs -sp_inside_oc_at_sel_parens = ignore # ignore/add/remove/force +sp_inside_oc_at_sel_parens = ignore # ignore/add/remove/force # Add or remove space before a block pointer caret # '^int (int arg){...}' vs. ' ^int (int arg){...}' -sp_before_oc_block_caret = ignore # ignore/add/remove/force +sp_before_oc_block_caret = ignore # ignore/add/remove/force # Add or remove space after a block pointer caret # '^int (int arg){...}' vs. '^ int (int arg){...}' -sp_after_oc_block_caret = ignore # ignore/add/remove/force +sp_after_oc_block_caret = ignore # ignore/add/remove/force # Add or remove space between the receiver and selector in a message. # '[receiver selector ...]' -sp_after_oc_msg_receiver = ignore # ignore/add/remove/force +sp_after_oc_msg_receiver = ignore # ignore/add/remove/force # Add or remove space after @property. -sp_after_oc_property = ignore # ignore/add/remove/force +sp_after_oc_property = ignore # ignore/add/remove/force # Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = force # ignore/add/remove/force +sp_cond_colon = force # ignore/add/remove/force # Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = force # ignore/add/remove/force +sp_cond_question = force # ignore/add/remove/force # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = ignore # ignore/add/remove/force +sp_case_label = ignore # ignore/add/remove/force # Control the space around the D '..' operator. -sp_range = ignore # ignore/add/remove/force +sp_range = ignore # ignore/add/remove/force # Control the spacing after ':' in 'for (TYPE VAR : EXPR)' (Java) -sp_after_for_colon = ignore # ignore/add/remove/force +sp_after_for_colon = ignore # ignore/add/remove/force # Control the spacing before ':' in 'for (TYPE VAR : EXPR)' (Java) -sp_before_for_colon = ignore # ignore/add/remove/force +sp_before_for_colon = ignore # ignore/add/remove/force # Control the spacing in 'extern (C)' (D) -sp_extern_paren = ignore # ignore/add/remove/force +sp_extern_paren = ignore # ignore/add/remove/force # Control the space after the opening of a C++ comment '// A' vs '//A' -sp_cmt_cpp_start = force # ignore/add/remove/force +sp_cmt_cpp_start = force # ignore/add/remove/force # Controls the spaces between #else or #endif and a trailing comment -sp_endif_cmt = ignore # ignore/add/remove/force +sp_endif_cmt = ignore # ignore/add/remove/force # Controls the spaces after 'new', 'delete', and 'delete[]' -sp_after_new = ignore # ignore/add/remove/force +sp_after_new = ignore # ignore/add/remove/force # Controls the spaces before a trailing or embedded comment -sp_before_tr_emb_cmt = ignore # ignore/add/remove/force +sp_before_tr_emb_cmt = ignore # ignore/add/remove/force # Number of spaces before a trailing or embedded comment -sp_num_before_tr_emb_cmt = 0 # number +sp_num_before_tr_emb_cmt = 0 # number # Control space between a Java annotation and the open paren. -sp_annotation_paren = ignore # ignore/add/remove/force +sp_annotation_paren = ignore # ignore/add/remove/force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # false/true # Whether to use tabs for aligning -align_with_tabs = false # false/true +align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # false/true # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # false/true # Whether to keep whitespace not required for alignment. -align_keep_extra_space = false # false/true +align_keep_extra_space = false # false/true # Align variable definitions in prototypes and functions -align_func_params = false # false/true +align_func_params = false # false/true # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = false # false/true +align_same_func_call_params = false # false/true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 0 # number +align_var_def_span = 0 # number # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 0 # number +align_var_def_star_style = 0 # number # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # number # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # number # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # number # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # false/true # Whether to align any attribute after the variable name -align_var_def_attribute = false # false/true +align_var_def_attribute = false # false/true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = false # false/true +align_var_def_inline = false # false/true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 0 # number +align_assign_span = 0 # number # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 # number # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 0 # number +align_enum_equ_span = 0 # number # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # number # The span for aligning struct/union (0=don't align) -align_var_struct_span = 0 # number +align_var_struct_span = 0 # number # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # number # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # number # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 0 # number +align_struct_init_span = 0 # number # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number +align_typedef_gap = 0 # number # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 0 # number +align_typedef_span = 0 # number # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # number # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typedef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # number # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typedef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # number # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 0 # number +align_right_cmt_span = 0 # number # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # false/true # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. This has to be > 0 to do anything. -align_right_cmt_gap = 0 # number +align_right_cmt_gap = 0 # number # Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore) -align_right_cmt_at_col = 0 # number +align_right_cmt_at_col = 0 # number # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # number # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # number # Align function protos on the 'operator' keyword instead of what follows -align_on_operator = false # false/true +align_on_operator = false # false/true # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # false/true # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true +align_single_line_func = false # false/true # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # false/true # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # number # The span for aligning ObjC msg spec (0=don't align) -align_oc_msg_spec_span = 0 # number +align_oc_msg_spec_span = 0 # number # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = false # false/true +align_nl_cont = false # false/true # # Align macro functions and variables together -align_pp_define_together = false # false/true +align_pp_define_together = false # false/true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 0 # number +align_pp_define_gap = 0 # number # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 0 # number +align_pp_define_span = 0 # number # Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = true # false/true +align_left_shift = true # false/true # Span for aligning parameters in an Obj-C message call on the ':' (0=don't align) -align_oc_msg_colon_span = 0 # number +align_oc_msg_colon_span = 0 # number # If true, always align with the first parameter, even if it is too short. -align_oc_msg_colon_first = false # false/true +align_oc_msg_colon_first = false # false/true # Aligning parameters in an Obj-C '+' or '-' declaration on the ':' -align_oc_decl_colon = false # false/true +align_oc_decl_colon = false # false/true # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # false/true # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = true # false/true +nl_assign_leave_one_liners = true # false/true # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = false # false/true +nl_class_leave_one_liners = false # false/true # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = false # false/true +nl_enum_leave_one_liners = false # false/true # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # false/true # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # false/true # Don't split one-line C++11 lambdas - '[]() { return 0; }' -nl_cpp_lambda_leave_one_liners = false # false/true +nl_cpp_lambda_leave_one_liners = false # false/true # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # false/true # Don't split one-line OC messages -nl_oc_msg_leave_one_liner = false # false/true +nl_oc_msg_leave_one_liner = false # false/true # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # ignore/add/remove/force # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # number # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # ignore/add/remove/force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # number # Add or remove newline between '=' and '{' -nl_assign_brace = remove # ignore/add/remove/force +nl_assign_brace = remove # ignore/add/remove/force # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # ignore/add/remove/force # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # ignore/add/remove/force # The number of blank lines after a block of variable definitions at the top of a function body # 0 = No change (default) -nl_func_var_def_blk = 0 # number +nl_func_var_def_blk = 0 # number # The number of newlines before a block of typedefs # 0 = No change (default) -nl_typedef_blk_start = 0 # number +nl_typedef_blk_start = 0 # number # The number of newlines after a block of typedefs # 0 = No change (default) -nl_typedef_blk_end = 0 # number +nl_typedef_blk_end = 0 # number # The maximum consecutive newlines within a block of typedefs # 0 = No change (default) -nl_typedef_blk_in = 0 # number +nl_typedef_blk_in = 0 # number # The number of newlines before a block of variable definitions not at the top of a function body # 0 = No change (default) -nl_var_def_blk_start = 0 # number +nl_var_def_blk_start = 0 # number # The number of newlines after a block of variable definitions not at the top of a function body # 0 = No change (default) -nl_var_def_blk_end = 0 # number +nl_var_def_blk_end = 0 # number # The maximum consecutive newlines within a block of variable definitions # 0 = No change (default) -nl_var_def_blk_in = 0 # number +nl_var_def_blk_in = 0 # number # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = ignore # ignore/add/remove/force +nl_fcall_brace = ignore # ignore/add/remove/force # Add or remove newline between 'enum' and '{' -nl_enum_brace = ignore # ignore/add/remove/force +nl_enum_brace = ignore # ignore/add/remove/force # Add or remove newline between 'struct and '{' -nl_struct_brace = ignore # ignore/add/remove/force +nl_struct_brace = ignore # ignore/add/remove/force # Add or remove newline between 'union' and '{' -nl_union_brace = ignore # ignore/add/remove/force +nl_union_brace = ignore # ignore/add/remove/force # Add or remove newline between 'if' and '{' -nl_if_brace = remove # ignore/add/remove/force +nl_if_brace = remove # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = remove # ignore/add/remove/force +nl_brace_else = remove # ignore/add/remove/force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = remove # ignore/add/remove/force +nl_elseif_brace = remove # ignore/add/remove/force # Add or remove newline between 'else' and '{' -nl_else_brace = remove # ignore/add/remove/force +nl_else_brace = remove # ignore/add/remove/force # Add or remove newline between 'else' and 'if' -nl_else_if = remove # ignore/add/remove/force +nl_else_if = remove # ignore/add/remove/force # Add or remove newline between '}' and 'finally' -nl_brace_finally = ignore # ignore/add/remove/force +nl_brace_finally = ignore # ignore/add/remove/force # Add or remove newline between 'finally' and '{' -nl_finally_brace = ignore # ignore/add/remove/force +nl_finally_brace = ignore # ignore/add/remove/force # Add or remove newline between 'try' and '{' -nl_try_brace = ignore # ignore/add/remove/force +nl_try_brace = ignore # ignore/add/remove/force # Add or remove newline between get/set and '{' -nl_getset_brace = ignore # ignore/add/remove/force +nl_getset_brace = ignore # ignore/add/remove/force # Add or remove newline between 'for' and '{' -nl_for_brace = remove # ignore/add/remove/force +nl_for_brace = remove # ignore/add/remove/force # Add or remove newline between 'catch' and '{' -nl_catch_brace = ignore # ignore/add/remove/force +nl_catch_brace = ignore # ignore/add/remove/force # Add or remove newline between '}' and 'catch' -nl_brace_catch = ignore # ignore/add/remove/force +nl_brace_catch = ignore # ignore/add/remove/force # Add or remove newline between 'while' and '{' -nl_while_brace = ignore # ignore/add/remove/force +nl_while_brace = ignore # ignore/add/remove/force # Add or remove newline between 'scope (x)' and '{' (D) -nl_scope_brace = ignore # ignore/add/remove/force +nl_scope_brace = ignore # ignore/add/remove/force # Add or remove newline between 'unittest' and '{' (D) -nl_unittest_brace = ignore # ignore/add/remove/force +nl_unittest_brace = ignore # ignore/add/remove/force # Add or remove newline between 'version (x)' and '{' (D) -nl_version_brace = ignore # ignore/add/remove/force +nl_version_brace = ignore # ignore/add/remove/force # Add or remove newline between 'using' and '{' -nl_using_brace = ignore # ignore/add/remove/force +nl_using_brace = ignore # ignore/add/remove/force # Add or remove newline between two open or close braces. # Due to general newline/brace handling, REMOVE may not work. -nl_brace_brace = ignore # ignore/add/remove/force +nl_brace_brace = ignore # ignore/add/remove/force # Add or remove newline between 'do' and '{' -nl_do_brace = remove # ignore/add/remove/force +nl_do_brace = remove # ignore/add/remove/force # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # ignore/add/remove/force # Add or remove newline between 'switch' and '{' -nl_switch_brace = remove # ignore/add/remove/force +nl_switch_brace = remove # ignore/add/remove/force # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # false/true # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = false # false/true +nl_multi_line_define = false # false/true # Whether to put a newline before 'case' statement -nl_before_case = false # false/true +nl_before_case = false # false/true # Add or remove newline between ')' and 'throw' -nl_before_throw = ignore # ignore/add/remove/force +nl_before_throw = ignore # ignore/add/remove/force # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # false/true # Add or remove a newline between a case ':' and '{'. Overrides nl_after_case. -nl_case_colon_brace = ignore # ignore/add/remove/force +nl_case_colon_brace = ignore # ignore/add/remove/force # Newline between namespace and { -nl_namespace_brace = remove # ignore/add/remove/force +nl_namespace_brace = remove # ignore/add/remove/force # Add or remove newline between 'template<>' and whatever follows. -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # ignore/add/remove/force # Add or remove newline between 'class' and '{' -nl_class_brace = force # ignore/add/remove/force +nl_class_brace = force # ignore/add/remove/force # Add or remove newline after each ',' in the class base list -nl_class_init_args = remove # ignore/add/remove/force +nl_class_init_args = remove # ignore/add/remove/force # Add or remove newline after each ',' in the constructor member initialization -nl_constr_init_args = force # ignore/add/remove/force +nl_constr_init_args = force # ignore/add/remove/force # Add or remove newline between return type and function name in a function definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # ignore/add/remove/force # Add or remove newline between return type and function name inside a class {} # Uses nl_func_type_name or nl_func_proto_type_name if set to ignore. -nl_func_type_name_class = ignore # ignore/add/remove/force +nl_func_type_name_class = ignore # ignore/add/remove/force # Add or remove newline between function scope and name in a definition # Controls the newline after '::' in 'void A::f() { }' -nl_func_scope_name = ignore # ignore/add/remove/force +nl_func_scope_name = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = ignore # ignore/add/remove/force +nl_func_proto_type_name = ignore # ignore/add/remove/force # Add or remove newline between a function name and the opening '(' -nl_func_paren = remove # ignore/add/remove/force +nl_func_paren = remove # ignore/add/remove/force # Add or remove newline between a function name and the opening '(' in the definition -nl_func_def_paren = ignore # ignore/add/remove/force +nl_func_def_paren = ignore # ignore/add/remove/force # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # ignore/add/remove/force # Add or remove newline after '(' in a function definition -nl_func_def_start = ignore # ignore/add/remove/force +nl_func_def_start = ignore # ignore/add/remove/force # Overrides nl_func_decl_start when there is only one parameter. -nl_func_decl_start_single = ignore # ignore/add/remove/force +nl_func_decl_start_single = ignore # ignore/add/remove/force # Overrides nl_func_def_start when there is only one parameter. -nl_func_def_start_single = ignore # ignore/add/remove/force +nl_func_def_start_single = ignore # ignore/add/remove/force # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = remove # ignore/add/remove/force +nl_func_decl_args = remove # ignore/add/remove/force # Add or remove newline after each ',' in a function definition -nl_func_def_args = remove # ignore/add/remove/force +nl_func_def_args = remove # ignore/add/remove/force # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = remove # ignore/add/remove/force +nl_func_decl_end = remove # ignore/add/remove/force # Add or remove newline before the ')' in a function definition -nl_func_def_end = remove # ignore/add/remove/force +nl_func_def_end = remove # ignore/add/remove/force # Overrides nl_func_decl_end when there is only one parameter. -nl_func_decl_end_single = ignore # ignore/add/remove/force +nl_func_decl_end_single = ignore # ignore/add/remove/force # Overrides nl_func_def_end when there is only one parameter. -nl_func_def_end_single = ignore # ignore/add/remove/force +nl_func_def_end_single = ignore # ignore/add/remove/force # Add or remove newline between '()' in a function declaration. -nl_func_decl_empty = remove # ignore/add/remove/force +nl_func_decl_empty = remove # ignore/add/remove/force # Add or remove newline between '()' in a function definition. -nl_func_def_empty = remove # ignore/add/remove/force +nl_func_def_empty = remove # ignore/add/remove/force # Whether to put each OC message parameter on a separate line # See nl_oc_msg_leave_one_liner -nl_oc_msg_args = false # false/true +nl_oc_msg_args = false # false/true # Add or remove newline between function signature and '{' -nl_fdef_brace = force # ignore/add/remove/force +nl_fdef_brace = force # ignore/add/remove/force # Add or remove newline between C++11 lambda signature and '{' -nl_cpp_ldef_brace = ignore # ignore/add/remove/force +nl_cpp_ldef_brace = ignore # ignore/add/remove/force # Add or remove a newline between the return keyword and return expression. -nl_return_expr = ignore # ignore/add/remove/force +nl_return_expr = ignore # ignore/add/remove/force # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # false/true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = true # false/true +nl_after_brace_open = true # false/true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true +nl_after_brace_open_cmt = false # false/true # Whether to put a newline after a virtual brace open with a non-empty body. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = false # false/true +nl_after_vbrace_open = false # false/true # Whether to put a newline after a virtual brace open with an empty body. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open_empty = false # false/true +nl_after_vbrace_open_empty = false # false/true # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. -nl_after_brace_close = false # false/true +nl_after_brace_close = false # false/true # Whether to put a newline after a virtual brace close. # Would add a newline before return in: 'if (foo) a++; return;' -nl_after_vbrace_close = false # false/true +nl_after_vbrace_close = false # false/true # Control the newline between the close brace and 'b' in: 'struct { int a; } b;' # Affects enums, unions, and structures. If set to ignore, uses nl_after_brace_close -nl_brace_struct_var = ignore # ignore/add/remove/force +nl_brace_struct_var = ignore # ignore/add/remove/force # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # false/true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true +nl_squeeze_ifdef = false # false/true # Add or remove blank line before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # ignore/add/remove/force # Add or remove blank line after 'if' statement -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # ignore/add/remove/force # Add or remove blank line before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # ignore/add/remove/force # Add or remove blank line after 'for' statement -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # ignore/add/remove/force # Add or remove blank line before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # ignore/add/remove/force # Add or remove blank line after 'while' statement -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # ignore/add/remove/force # Add or remove blank line before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # ignore/add/remove/force # Add or remove blank line after 'switch' statement -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # ignore/add/remove/force # Add or remove blank line before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # ignore/add/remove/force # Add or remove blank line after 'do/while' statement -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # ignore/add/remove/force # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # false/true # Whether to double-space before the close brace of a struct/union/enum # (lower priority than 'eat_blanks_before_close_brace') -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # false/true # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = remove # ignore/add/remove/force +nl_class_colon = remove # ignore/add/remove/force # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # false/true # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # false/true # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # false/true # # Positioning options # # The position of arithmetic operators in wrapped expressions -pos_arith = lead # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_arith = lead # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of assignment in wrapped expressions. # Do not affect '=' followed by '{' -pos_assign = lead # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_assign = lead # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of boolean operators in wrapped expressions -pos_bool = lead # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_bool = lead # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of comparison operators in wrapped expressions -pos_compare = lead # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_compare = lead # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of conditional (b ? t : f) operators in wrapped expressions -pos_conditional = lead # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_conditional = lead # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of the comma in wrapped expressions -pos_comma = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_comma = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of the comma in the constructor initialization list -pos_class_comma = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_comma = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of colons between constructor and member initialization -pos_class_colon = lead # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_colon = lead # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force -pos_constr_comma = trail -pos_constr_colon = trail +pos_constr_comma = trail +pos_constr_colon = trail # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 120 # number +code_width = 120 # number # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true +ls_for_split_full = false # false/true # Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true +ls_func_split_full = false # false/true # Whether to split lines as close to code_width as possible and ignore some groupings -ls_code_width = false # false/true +ls_code_width = false # false/true # # Blank line options # # The maximum consecutive newlines -nl_max = 2 # number +nl_max = 2 # number # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # number # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 0 # number +nl_after_func_proto_group = 0 # number # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # number # The number of newlines after '}' of a multi-line function body in a class declaration -nl_after_func_body_class = 0 # number +nl_after_func_body_class = 0 # number # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 0 # number +nl_after_func_body_one_liner = 0 # number # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 0 # number +nl_before_block_comment = 0 # number # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # number # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # number # Whether to force a newline after a multi-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # false/true # The number of newlines after '}' or ';' of a struct/enum/union definition -nl_after_struct = 0 # number +nl_after_struct = 0 # number # The number of newlines after '}' or ';' of a class definition -nl_after_class = 0 # number +nl_after_class = 0 # number # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 0 # number +nl_before_access_spec = 0 # number # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # number # The number of newlines between a function def and the function comment. # 0 = No change. -nl_comment_func_def = 0 # number +nl_comment_func_def = 0 # number # The number of newlines after a try-catch-finally block that isn't followed by a brace close. # 0 = No change. -nl_after_try_catch_finally = 0 # number +nl_after_try_catch_finally = 0 # number # The number of newlines before and after a property, indexer or event decl. # 0 = No change. -nl_around_cs_property = 0 # number +nl_around_cs_property = 0 # number # The number of newlines between the get/set/add/remove handlers in C#. # 0 = No change. -nl_between_get_set = 0 # number +nl_between_get_set = 0 # number # Add or remove newline between C# property and the '{' -nl_property_brace = ignore # ignore/add/remove/force +nl_property_brace = ignore # ignore/add/remove/force # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # false/true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # false/true # How aggressively to remove extra newlines not in preproc. # 0: No change # 1: Remove most newlines not handled by other config # 2: Remove all newlines and reformat completely by config -nl_remove_extra_newlines = 0 # number +nl_remove_extra_newlines = 0 # number # Whether to put a blank line before 'return' statements, unless after an open brace. -nl_before_return = false # false/true +nl_before_return = false # false/true # Whether to put a blank line after 'return' statements, unless followed by a close brace. -nl_after_return = false # false/true +nl_after_return = false # false/true # Whether to put a newline after a Java annotation statement. # Only affects annotations that are after a newline. -nl_after_annotation = ignore # ignore/add/remove/force +nl_after_annotation = ignore # ignore/add/remove/force # Controls the newline between two annotations. -nl_between_annotation = ignore # ignore/add/remove/force +nl_between_annotation = ignore # ignore/add/remove/force # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = ignore # ignore/add/remove/force +mod_full_brace_do = ignore # ignore/add/remove/force # Add or remove braces on single-line 'for' statement -mod_full_brace_for = remove # ignore/add/remove/force +mod_full_brace_for = remove # ignore/add/remove/force # Add or remove braces on single-line function definitions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # ignore/add/remove/force # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = remove # ignore/add/remove/force +mod_full_brace_if = remove # ignore/add/remove/force # Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if. # If any must be braced, they are all braced. If all can be unbraced, then the braces are removed. -mod_full_brace_if_chain = true # false/true +mod_full_brace_if_chain = true # false/true # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 2 # number +mod_full_brace_nl = 2 # number # Add or remove braces on single-line 'while' statement -mod_full_brace_while = remove # ignore/add/remove/force +mod_full_brace_while = remove # ignore/add/remove/force # Add or remove braces on single-line 'using ()' statement -mod_full_brace_using = ignore # ignore/add/remove/force +mod_full_brace_using = ignore # ignore/add/remove/force # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = remove # ignore/add/remove/force +mod_paren_on_return = remove # ignore/add/remove/force # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # false/true # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = false # false/true +mod_full_paren_if_bool = false # false/true # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = true # false/true +mod_remove_extra_semicolon = true # false/true # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 0 # number +mod_add_long_function_closebrace_comment = 0 # number # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number +mod_add_long_switch_closebrace_comment = 0 # number # If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after # the #endif, a comment will be added. -mod_add_long_ifdef_endif_comment = 0 # number +mod_add_long_ifdef_endif_comment = 0 # number # If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after # the #else, a comment will be added. -mod_add_long_ifdef_else_comment = 0 # number +mod_add_long_ifdef_else_comment = 0 # number # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # false/true # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # false/true # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # false/true # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = true # false/true +mod_move_case_break = true # false/true # Will add or remove the braces around a fully braced case statement. # Will only remove the braces if there are no variable declarations in the block. -mod_case_brace = remove # remove/add/remove/force +mod_case_brace = remove # remove/add/remove/force # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = true # false/true +mod_remove_empty_return = true # false/true # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # number # Set the comment reflow mode (default: 0) # 0: no reflowing (apart from the line wrapping due to cmt_width) # 1: no touching at all # 2: full reflow -cmt_reflow_mode = 0 # number +cmt_reflow_mode = 0 # number # If false, disable all multi-line comment changes, including cmt_width. keyword substitution, and leading chars. # Default is true. -cmt_indent_multi = false # false/true +cmt_indent_multi = false # false/true # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # false/true # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # false/true # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # false/true # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # false/true # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # false/true # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # false/true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # number # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # number # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true # false/true # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # string # The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_footer = "" # string +cmt_insert_file_footer = "" # string # The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment. # Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # string # The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment. # Will substitute $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # string # The filename that contains text to insert before a Obj-C message specification if the method isn't preceeded with a C/C++ comment. # Will substitute $(message) with the function name and $(javaparam) with the javadoc @param and @return stuff. -cmt_insert_oc_msg_header = "" # string +cmt_insert_oc_msg_header = "" # string # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_oc_msg_header, cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true +cmt_insert_before_preproc = false # false/true # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # ignore/add/remove/force # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # false/true # If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. -pp_indent_count = 1 # number +pp_indent_count = 1 # number # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # ignore/add/remove/force # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # number # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # number # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # false/true # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # number # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true +pp_if_indent_code = false # false/true # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # false/true # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/issue_633_typename.cfg b/tests/config/issue_633_typename.cfg index 940ea97b80..914639e704 100644 --- a/tests/config/issue_633_typename.cfg +++ b/tests/config/issue_633_typename.cfg @@ -1,2 +1,2 @@ -align_var_def_span=1 -align_var_class_span=1 +align_var_def_span = 1 +align_var_class_span = 1 diff --git a/tests/config/java_foreach.cfg b/tests/config/java_foreach.cfg index ca791b7adb..4fd00afddc 100644 --- a/tests/config/java_foreach.cfg +++ b/tests/config/java_foreach.cfg @@ -1,195 +1,195 @@ -tok_split_gte=false -utf8_byte=false -utf8_force=false -indent_cmt_with_tabs=false -indent_align_string=false -indent_braces=false -indent_braces_no_func=false -indent_braces_no_class=false -indent_braces_no_struct=false -indent_brace_parent=false -indent_namespace=false -indent_extern=false -indent_class=true -indent_class_colon=false -indent_else_if=false -indent_var_def_cont=false -indent_func_call_param=false -indent_func_def_param=false -indent_func_proto_param=false -indent_func_class_param=false -indent_func_ctor_var_param=false -indent_template_param=false -indent_func_param_double=false -indent_relative_single_line_comments=true -indent_col1_comment=true -indent_access_spec_body=true -indent_paren_nl=false -indent_comma_paren=false -indent_bool_paren=false -indent_first_bool_expr=false -indent_square_nl=false -indent_preserve_sql=false -indent_align_assign=true -sp_balance_nested_parens=false -align_keep_tabs=false -align_with_tabs=false -align_on_tabstop=false -align_number_right=false -align_func_params=true -align_same_func_call_params=false -align_var_def_colon=false -align_var_def_attribute=false -align_var_def_inline=false -align_right_cmt_mix=false -align_on_operator=false -align_mix_var_proto=false -align_single_line_func=false -align_single_line_brace=false -align_nl_cont=true -align_left_shift=true -align_oc_decl_colon=false -nl_collapse_empty_body=true -nl_assign_leave_one_liners=true -nl_class_leave_one_liners=true -nl_enum_leave_one_liners=true -nl_getset_leave_one_liners=true -nl_func_leave_one_liners=true -nl_if_leave_one_liners=false -nl_multi_line_cond=false -nl_multi_line_define=false -nl_before_case=false -nl_after_case=false -nl_after_return=false -nl_after_semicolon=false -nl_after_brace_open=false -nl_after_brace_open_cmt=false -nl_after_vbrace_open=false -nl_after_vbrace_open_empty=false -nl_after_brace_close=false -nl_after_vbrace_close=false -nl_define_macro=false -nl_squeeze_ifdef=false -nl_ds_struct_enum_cmt=false -nl_ds_struct_enum_close_brace=false -nl_create_if_one_liner=false -nl_create_for_one_liner=false -nl_create_while_one_liner=false -ls_for_split_full=false -ls_func_split_full=false -nl_after_multiline_comment=false -eat_blanks_after_open_brace=false -eat_blanks_before_close_brace=false -mod_full_brace_if_chain=false -mod_pawn_semicolon=false -mod_full_paren_if_bool=false -mod_remove_extra_semicolon=false -mod_sort_import=true -mod_sort_using=false -mod_sort_include=false -mod_move_case_break=false -mod_remove_empty_return=false -cmt_indent_multi=true -cmt_c_group=false -cmt_c_nl_start=false -cmt_c_nl_end=false -cmt_cpp_group=false -cmt_cpp_nl_start=false -cmt_cpp_nl_end=false -cmt_cpp_to_c=false -cmt_star_cont=false -cmt_multi_check_last=true -cmt_insert_before_preproc=false -pp_indent_at_level=false -pp_region_indent_code=false -pp_if_indent_code=false -pp_define_at_level=false -indent_with_tabs=0 - -indent_columns = 4 # number -nl_start_of_file = remove # ignore/add/remove/force -nl_start_of_file_min = 0 # number -nl_end_of_file = add # ignore/add/remove/force -nl_end_of_file_min = 1 # number -nl_if_brace = remove # ignore/add/remove/force -nl_brace_else = add # ignore/add/remove/force -nl_elseif_brace = remove # ignore/add/remove/force -nl_else_brace = remove # ignore/add/remove/force -nl_else_if = remove # ignore/add/remove/force -nl_brace_finally = add # ignore/add/remove/force -nl_finally_brace = remove # ignore/add/remove/force -nl_try_brace = remove # ignore/add/remove/force -nl_getset_brace = remove # ignore/add/remove/force -nl_for_brace = remove # ignore/add/remove/force -nl_catch_brace = remove # ignore/add/remove/force -nl_brace_catch = add # ignore/add/remove/force -nl_while_brace = remove # ignore/add/remove/force -nl_do_brace = remove # ignore/add/remove/force -nl_brace_while = add # ignore/add/remove/force -nl_switch_brace = remove # ignore/add/remove/force -nl_class_brace = remove # ignore/add/remove/force -nl_class_init_args = remove # ignore/add/remove/force -nl_func_type_name = remove # ignore/add/remove/force -nl_func_type_name_class = remove # ignore/add/remove/force -nl_func_decl_empty = remove # ignore/add/remove/force -nl_func_def_empty = remove # ignore/add/remove/force -sp_arith = add # ignore/add/remove/force -sp_assign = add # ignore/add/remove/force -sp_assign_default = add # ignore/add/remove/force -sp_enum_assign = add # ignore/add/remove/force -sp_bool = add # ignore/add/remove/force -sp_compare = add # ignore/add/remove/force -sp_inside_paren = remove # ignore/add/remove/force -sp_paren_brace = add # ignore/add/remove/force -sp_before_angle = remove # ignore/add/remove/force -sp_inside_angle = remove # ignore/add/remove/force -sp_after_angle = remove # ignore/add/remove/force -sp_angle_paren = remove # ignore/add/remove/force -sp_angle_paren_empty = remove # ignore/add/remove/force -sp_angle_word = add # ignore/add/remove/force -sp_before_sparen = add # ignore/add/remove/force -sp_inside_sparen = remove # ignore/add/remove/force -sp_after_sparen = add # ignore/add/remove/force -sp_sparen_brace = add # ignore/add/remove/force -sp_before_squares = remove # ignore/add/remove/force -sp_inside_square = remove # ignore/add/remove/force -sp_after_comma = add # ignore/add/remove/force -code_width = 80 # number -ls_code_width = true # false/true -pos_arith = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force -pos_assign = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force -pos_bool = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force -pos_compare = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force -pos_conditional = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force -pos_comma = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force -pos_class_comma = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force -pos_class_colon = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force -sp_after_cast = add # ignore/add/remove/force -sp_inside_paren_cast = remove # ignore/add/remove/force -sp_after_type = add # ignore/add/remove/force -sp_annotation_paren = remove # ignore/add/remove/force -nl_after_annotation = add # ignore/add/remove/force -nl_between_annotation = add # ignore/add/remove/force - -# The maximum consecutive newlines -nl_max = 2 # number - -# sp_angle_shift cannot remove the space without this option. -sp_permit_cpp11_shift = true # false/true - -# Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add -sp_angle_shift = remove # ignore/add/remove/force - -# Add or remove space before '<>' -sp_before_angle = remove # ignore/add/remove/force - -# Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force - -# Add or remove space after '<>' -sp_after_angle = add # ignore/add/remove/force - -# Add or remove space between ')' and '{' of function -sp_fparen_brace = add # ignore/add/remove/force -sp_after_for_colon = force -sp_before_for_colon = remove +tok_split_gte = false +utf8_byte = false +utf8_force = false +indent_cmt_with_tabs = false +indent_align_string = false +indent_braces = false +indent_braces_no_func = false +indent_braces_no_class = false +indent_braces_no_struct = false +indent_brace_parent = false +indent_namespace = false +indent_extern = false +indent_class = true +indent_class_colon = false +indent_else_if = false +indent_var_def_cont = false +indent_func_call_param = false +indent_func_def_param = false +indent_func_proto_param = false +indent_func_class_param = false +indent_func_ctor_var_param = false +indent_template_param = false +indent_func_param_double = false +indent_relative_single_line_comments = true +indent_col1_comment = true +indent_access_spec_body = true +indent_paren_nl = false +indent_comma_paren = false +indent_bool_paren = false +indent_first_bool_expr = false +indent_square_nl = false +indent_preserve_sql = false +indent_align_assign = true +sp_balance_nested_parens = false +align_keep_tabs = false +align_with_tabs = false +align_on_tabstop = false +align_number_right = false +align_func_params = true +align_same_func_call_params = false +align_var_def_colon = false +align_var_def_attribute = false +align_var_def_inline = false +align_right_cmt_mix = false +align_on_operator = false +align_mix_var_proto = false +align_single_line_func = false +align_single_line_brace = false +align_nl_cont = true +align_left_shift = true +align_oc_decl_colon = false +nl_collapse_empty_body = true +nl_assign_leave_one_liners = true +nl_class_leave_one_liners = true +nl_enum_leave_one_liners = true +nl_getset_leave_one_liners = true +nl_func_leave_one_liners = true +nl_if_leave_one_liners = false +nl_multi_line_cond = false +nl_multi_line_define = false +nl_before_case = false +nl_after_case = false +nl_after_return = false +nl_after_semicolon = false +nl_after_brace_open = false +nl_after_brace_open_cmt = false +nl_after_vbrace_open = false +nl_after_vbrace_open_empty = false +nl_after_brace_close = false +nl_after_vbrace_close = false +nl_define_macro = false +nl_squeeze_ifdef = false +nl_ds_struct_enum_cmt = false +nl_ds_struct_enum_close_brace = false +nl_create_if_one_liner = false +nl_create_for_one_liner = false +nl_create_while_one_liner = false +ls_for_split_full = false +ls_func_split_full = false +nl_after_multiline_comment = false +eat_blanks_after_open_brace = false +eat_blanks_before_close_brace = false +mod_full_brace_if_chain = false +mod_pawn_semicolon = false +mod_full_paren_if_bool = false +mod_remove_extra_semicolon = false +mod_sort_import = true +mod_sort_using = false +mod_sort_include = false +mod_move_case_break = false +mod_remove_empty_return = false +cmt_indent_multi = true +cmt_c_group = false +cmt_c_nl_start = false +cmt_c_nl_end = false +cmt_cpp_group = false +cmt_cpp_nl_start = false +cmt_cpp_nl_end = false +cmt_cpp_to_c = false +cmt_star_cont = false +cmt_multi_check_last = true +cmt_insert_before_preproc = false +pp_indent_at_level = false +pp_region_indent_code = false +pp_if_indent_code = false +pp_define_at_level = false +indent_with_tabs = 0 + +indent_columns = 4 # number +nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file_min = 0 # number +nl_end_of_file = add # ignore/add/remove/force +nl_end_of_file_min = 1 # number +nl_if_brace = remove # ignore/add/remove/force +nl_brace_else = add # ignore/add/remove/force +nl_elseif_brace = remove # ignore/add/remove/force +nl_else_brace = remove # ignore/add/remove/force +nl_else_if = remove # ignore/add/remove/force +nl_brace_finally = add # ignore/add/remove/force +nl_finally_brace = remove # ignore/add/remove/force +nl_try_brace = remove # ignore/add/remove/force +nl_getset_brace = remove # ignore/add/remove/force +nl_for_brace = remove # ignore/add/remove/force +nl_catch_brace = remove # ignore/add/remove/force +nl_brace_catch = add # ignore/add/remove/force +nl_while_brace = remove # ignore/add/remove/force +nl_do_brace = remove # ignore/add/remove/force +nl_brace_while = add # ignore/add/remove/force +nl_switch_brace = remove # ignore/add/remove/force +nl_class_brace = remove # ignore/add/remove/force +nl_class_init_args = remove # ignore/add/remove/force +nl_func_type_name = remove # ignore/add/remove/force +nl_func_type_name_class = remove # ignore/add/remove/force +nl_func_decl_empty = remove # ignore/add/remove/force +nl_func_def_empty = remove # ignore/add/remove/force +sp_arith = add # ignore/add/remove/force +sp_assign = add # ignore/add/remove/force +sp_assign_default = add # ignore/add/remove/force +sp_enum_assign = add # ignore/add/remove/force +sp_bool = add # ignore/add/remove/force +sp_compare = add # ignore/add/remove/force +sp_inside_paren = remove # ignore/add/remove/force +sp_paren_brace = add # ignore/add/remove/force +sp_before_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # ignore/add/remove/force +sp_after_angle = remove # ignore/add/remove/force +sp_angle_paren = remove # ignore/add/remove/force +sp_angle_paren_empty = remove # ignore/add/remove/force +sp_angle_word = add # ignore/add/remove/force +sp_before_sparen = add # ignore/add/remove/force +sp_inside_sparen = remove # ignore/add/remove/force +sp_after_sparen = add # ignore/add/remove/force +sp_sparen_brace = add # ignore/add/remove/force +sp_before_squares = remove # ignore/add/remove/force +sp_inside_square = remove # ignore/add/remove/force +sp_after_comma = add # ignore/add/remove/force +code_width = 80 # number +ls_code_width = true # false/true +pos_arith = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_assign = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_bool = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_compare = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_conditional = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_comma = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_comma = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_colon = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +sp_after_cast = add # ignore/add/remove/force +sp_inside_paren_cast = remove # ignore/add/remove/force +sp_after_type = add # ignore/add/remove/force +sp_annotation_paren = remove # ignore/add/remove/force +nl_after_annotation = add # ignore/add/remove/force +nl_between_annotation = add # ignore/add/remove/force + +# The maximum consecutive newlines +nl_max = 2 # number + +# sp_angle_shift cannot remove the space without this option. +sp_permit_cpp11_shift = true # false/true + +# Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add +sp_angle_shift = remove # ignore/add/remove/force + +# Add or remove space before '<>' +sp_before_angle = remove # ignore/add/remove/force + +# Add or remove space inside '<' and '>' +sp_inside_angle = remove # ignore/add/remove/force + +# Add or remove space after '<>' +sp_after_angle = add # ignore/add/remove/force + +# Add or remove space between ')' and '{' of function +sp_fparen_brace = add # ignore/add/remove/force +sp_after_for_colon = force +sp_before_for_colon = remove diff --git a/tests/config/java_synchronized_1.cfg b/tests/config/java_synchronized_1.cfg index 18cc572168..24faaece55 100644 --- a/tests/config/java_synchronized_1.cfg +++ b/tests/config/java_synchronized_1.cfg @@ -1,8 +1,8 @@ -nl_synchronized_brace = force # ignore/add/remove/force -nl_before_synchronized = force # ignore/add/remove/force -nl_after_synchronized = force # ignore/add/remove/force -nl_remove_extra_newlines = 2 -nl_class_brace = force -indent_class = true -sp_before_sparen = force -sp_inside_sparen = force +nl_synchronized_brace = force # ignore/add/remove/force +nl_before_synchronized = force # ignore/add/remove/force +nl_after_synchronized = force # ignore/add/remove/force +nl_remove_extra_newlines = 2 +nl_class_brace = force +indent_class = true +sp_before_sparen = force +sp_inside_sparen = force diff --git a/tests/config/java_synchronized_2.cfg b/tests/config/java_synchronized_2.cfg index 1f75cce11d..d26b2daa92 100644 --- a/tests/config/java_synchronized_2.cfg +++ b/tests/config/java_synchronized_2.cfg @@ -1,8 +1,8 @@ -nl_synchronized_brace = force # ignore/add/remove/force -nl_before_synchronized = remove # ignore/add/remove/force -nl_after_synchronized = remove # ignore/add/remove/force -nl_remove_extra_newlines = 2 -nl_class_brace = remove -indent_class = true -sp_before_sparen = remove -sp_inside_sparen = remove +nl_synchronized_brace = force # ignore/add/remove/force +nl_before_synchronized = remove # ignore/add/remove/force +nl_after_synchronized = remove # ignore/add/remove/force +nl_remove_extra_newlines = 2 +nl_class_brace = remove +indent_class = true +sp_before_sparen = remove +sp_inside_sparen = remove diff --git a/tests/config/jdbi-f.cfg b/tests/config/jdbi-f.cfg index 6c9d42389b..cb6e3b2846 100644 --- a/tests/config/jdbi-f.cfg +++ b/tests/config/jdbi-f.cfg @@ -1,2 +1,2 @@ -include ben.cfg -nl_paren_dbrace_open = force +include ben.cfg +nl_paren_dbrace_open = force diff --git a/tests/config/jdbi-r.cfg b/tests/config/jdbi-r.cfg index cd2728feaa..a0cfc7869a 100644 --- a/tests/config/jdbi-r.cfg +++ b/tests/config/jdbi-r.cfg @@ -1,3 +1,3 @@ -include ben.cfg -nl_paren_dbrace_open = remove -sp_fparen_dbrace = force +include ben.cfg +nl_paren_dbrace_open = remove +sp_fparen_dbrace = force diff --git a/tests/config/kdepim.cfg b/tests/config/kdepim.cfg index 7dad49ef1c..bfa57148da 100644 --- a/tests/config/kdepim.cfg +++ b/tests/config/kdepim.cfg @@ -1,490 +1,490 @@ -newlines=auto -input_tab_size=8 -output_tab_size=8 -string_escape_char=92 -string_escape_char2=0 -string_replace_tab_chars=true -tok_split_gte=false -utf8_bom=ignore -utf8_byte=false -utf8_force=false -indent_columns=4 -indent_continue=0 -indent_with_tabs=0 -indent_cmt_with_tabs=false -indent_align_string=false -indent_xml_string=0 -indent_brace=0 -indent_braces=false -indent_braces_no_func=false -indent_braces_no_class=false -indent_braces_no_struct=false -indent_brace_parent=false -indent_paren_open_brace=false -indent_namespace=false -indent_namespace_single_indent=false -indent_namespace_level=0 -indent_namespace_limit=0 -indent_extern=false -indent_class=true -indent_class_colon=false -indent_class_on_colon=false -indent_constr_colon=false -indent_ctor_init_leading=2 -indent_ctor_init=0 -indent_else_if=false -indent_var_def_blk=0 -indent_var_def_cont=false -indent_func_def_force_col1=false -indent_func_call_param=false -indent_func_def_param=false -indent_func_proto_param=false -indent_func_class_param=false -indent_func_ctor_var_param=false -indent_template_param=false -indent_func_param_double=false -indent_func_const=0 -indent_func_throw=0 -indent_member=0 -indent_sing_line_comments=0 -indent_relative_single_line_comments=false -indent_switch_case=0 -indent_case_shift=0 -indent_case_brace=0 -indent_col1_comment=false -indent_label=1 -indent_access_spec=1 -indent_access_spec_body=false -indent_paren_nl=false -indent_paren_close=0 -indent_comma_paren=false -indent_bool_paren=false -indent_first_bool_expr=false -indent_square_nl=false -indent_preserve_sql=false -indent_align_assign=true -indent_oc_block=false -indent_oc_block_msg=0 -indent_oc_msg_colon=0 -indent_oc_msg_prioritize_first_colon=true -indent_oc_block_msg_xcode_style=false -indent_oc_block_msg_from_keyword=false -indent_oc_block_msg_from_colon=false -indent_oc_block_msg_from_caret=false -indent_oc_block_msg_from_brace=false -sp_arith=force -sp_assign=force -sp_cpp_lambda_assign=ignore -sp_cpp_lambda_paren=remove -sp_assign_default=force -sp_before_assign=add -sp_after_assign=add -sp_enum_paren=remove -sp_enum_assign=remove -sp_enum_before_assign=remove -sp_enum_after_assign=remove -sp_pp_concat=remove -sp_pp_stringify=remove -sp_before_pp_stringify=remove -sp_bool=force -sp_compare=force -sp_inside_paren=remove -sp_paren_paren=remove -sp_cparen_oparen=remove -sp_balance_nested_parens=false -sp_paren_brace=remove -sp_before_ptr_star=force -sp_before_unnamed_ptr_star=ignore -sp_between_ptr_star=remove -sp_after_ptr_star=remove -sp_after_ptr_star_qualifier=remove -sp_after_ptr_star_func=remove -sp_ptr_star_paren=remove -sp_before_ptr_star_func=force -sp_before_byref=force -sp_before_unnamed_byref=remove -sp_after_byref=remove -sp_after_byref_func=remove -sp_before_byref_func=force -sp_after_type=force -sp_before_template_paren=ignore -sp_template_angle=force -sp_before_angle=remove -sp_inside_angle=remove -sp_after_angle=remove -sp_angle_paren=remove -sp_angle_paren_empty=remove -sp_angle_word=force -sp_angle_shift=remove -sp_permit_cpp11_shift=false -sp_before_sparen=force -sp_inside_sparen=remove -sp_inside_sparen_close=remove -sp_inside_sparen_open=remove -sp_after_sparen=remove -sp_sparen_brace=force -sp_invariant_paren=remove -sp_after_invariant_paren=remove -sp_special_semi=remove -sp_before_semi=remove -sp_before_semi_for=remove -sp_before_semi_for_empty=remove -sp_after_semi=remove -sp_after_semi_for=force -sp_after_semi_for_empty=remove -sp_before_square=remove -sp_before_squares=force -sp_inside_square=remove -sp_after_comma=force -sp_before_comma=remove -sp_paren_comma=force -sp_before_ellipsis=remove -sp_after_class_colon=force -sp_before_class_colon=force -sp_after_constr_colon=force -sp_before_constr_colon=remove -sp_before_case_colon=remove -sp_after_operator=remove -sp_after_operator_sym=remove -sp_after_cast=force -sp_inside_paren_cast=remove -sp_cpp_cast_paren=remove -sp_sizeof_paren=remove -sp_after_tag=remove -sp_inside_braces_enum=remove -sp_inside_braces_struct=remove -sp_inside_braces=remove -sp_inside_braces_empty=remove -sp_type_func=remove -sp_func_proto_paren=remove -sp_func_def_paren=remove -sp_inside_fparens=remove -sp_inside_fparen=remove -sp_inside_tparen=remove -sp_after_tparen_close=remove -sp_square_fparen=remove -sp_fparen_brace=remove -sp_fparen_dbrace=remove -sp_func_call_paren=remove -sp_func_call_paren_empty=ignore -sp_func_call_user_paren=remove -sp_func_class_paren=remove -sp_return_paren=remove -sp_attribute_paren=remove -sp_defined_paren=remove -sp_throw_paren=remove -sp_after_throw=remove -sp_catch_paren=force -sp_version_paren=ignore -sp_scope_paren=ignore -sp_macro=remove -sp_macro_func=remove -sp_else_brace=force -sp_brace_else=force -sp_brace_typedef=remove -sp_catch_brace=remove -sp_brace_catch=force -sp_finally_brace=remove -sp_brace_finally=remove -sp_try_brace=force -sp_getset_brace=remove -sp_word_brace=remove -sp_word_brace_ns=force -sp_before_dc=remove -sp_after_dc=remove -sp_d_array_colon=remove -sp_not=remove -sp_inv=remove -sp_addr=remove -sp_member=remove -sp_deref=remove -sp_sign=remove -sp_incdec=remove -sp_before_nl_cont=remove -sp_after_oc_scope=remove -sp_after_oc_colon=remove -sp_before_oc_colon=remove -sp_after_oc_dict_colon=remove -sp_before_oc_dict_colon=remove -sp_after_send_oc_colon=remove -sp_before_send_oc_colon=remove -sp_after_oc_type=remove -sp_after_oc_return_type=remove -sp_after_oc_at_sel=remove -sp_after_oc_at_sel_parens=remove -sp_inside_oc_at_sel_parens=remove -sp_before_oc_block_caret=remove -sp_after_oc_block_caret=remove -sp_after_oc_msg_receiver=remove -sp_after_oc_property=remove -sp_cond_colon=remove -sp_cond_colon_before=remove -sp_cond_colon_after=remove -sp_cond_question=remove -sp_cond_question_before=remove -sp_cond_question_after=remove -sp_cond_ternary_short=remove -sp_case_label=remove -sp_range=remove -sp_after_for_colon=remove -sp_before_for_colon=remove -sp_extern_paren=remove -sp_cmt_cpp_start=force -sp_endif_cmt=remove -sp_after_new=force -sp_before_tr_emb_cmt=force -sp_num_before_tr_emb_cmt=0 -sp_annotation_paren=remove -align_keep_tabs=false -align_with_tabs=false -align_on_tabstop=false -align_number_right=false -align_keep_extra_space=false -align_func_params=false -align_same_func_call_params=false -align_var_def_span=0 -align_var_def_star_style=0 -align_var_def_amp_style=0 -align_var_def_thresh=0 -align_var_def_gap=0 -align_var_def_colon=false -align_var_def_attribute=false -align_var_def_inline=false -align_assign_span=0 -align_assign_thresh=0 -align_enum_equ_span=0 -align_enum_equ_thresh=0 -align_var_struct_span=0 -align_var_struct_thresh=0 -align_var_struct_gap=0 -align_struct_init_span=0 -align_typedef_gap=0 -align_typedef_span=0 -align_typedef_func=0 -align_typedef_star_style=0 -align_typedef_amp_style=0 -align_right_cmt_span=0 -align_right_cmt_mix=false -align_right_cmt_gap=0 -align_right_cmt_at_col=0 -align_func_proto_span=0 -align_func_proto_gap=0 -align_on_operator=false -align_mix_var_proto=false -align_single_line_func=false -align_single_line_brace=false -align_single_line_brace_gap=0 -align_oc_msg_spec_span=0 -align_nl_cont=false -align_pp_define_together=false -align_pp_define_gap=0 -align_pp_define_span=0 -align_left_shift=true -align_oc_msg_colon_span=0 -align_oc_msg_colon_first=false -align_oc_decl_colon=false -nl_collapse_empty_body=false -nl_assign_leave_one_liners=false -nl_class_leave_one_liners=false -nl_enum_leave_one_liners=false -nl_getset_leave_one_liners=false -nl_func_leave_one_liners=false -nl_cpp_lambda_leave_one_liners=false -nl_if_leave_one_liners=false -nl_oc_msg_leave_one_liner=false -nl_start_of_file=remove -nl_start_of_file_min=0 -nl_end_of_file=force -nl_end_of_file_min=1 -nl_assign_brace=ignore -nl_assign_square=ignore -nl_after_square_assign=ignore -nl_func_var_def_blk=1 -nl_typedef_blk_start=2 -nl_typedef_blk_end=2 -nl_typedef_blk_in=0 -nl_var_def_blk_end=1 -nl_var_def_blk_in=0 -nl_fcall_brace=force -nl_enum_brace=remove -nl_struct_brace=force -nl_union_brace=remove -nl_if_brace=remove -nl_brace_else=remove -nl_elseif_brace=remove -nl_else_brace=remove -nl_else_if=remove -nl_brace_finally=ignore -nl_finally_brace=ignore -nl_try_brace=remove -nl_getset_brace=ignore -nl_for_brace=remove -nl_catch_brace=remove -nl_brace_catch=remove -nl_brace_square=ignore -nl_brace_fparen=ignore -nl_while_brace=remove -nl_scope_brace=ignore -nl_unittest_brace=ignore -nl_version_brace=ignore -nl_using_brace=ignore -nl_brace_brace=ignore -nl_do_brace=remove -nl_brace_while=remove -nl_switch_brace=remove -nl_multi_line_cond=false -nl_multi_line_define=true -nl_before_case=false -nl_before_throw=ignore -nl_after_case=true -nl_case_colon_brace=remove -nl_namespace_brace=remove -nl_template_class=ignore -nl_class_brace=force -nl_class_init_args=ignore -nl_constr_init_args=force -nl_func_type_name=remove -nl_func_type_name_class=remove -nl_func_scope_name=remove -nl_func_proto_type_name=ignore -nl_func_paren=remove -nl_func_def_paren=remove -nl_func_decl_start=ignore -nl_func_def_start=ignore -nl_func_decl_start_single=ignore -nl_func_def_start_single=remove -nl_func_decl_args=remove -nl_func_def_args=ignore -nl_func_decl_end=ignore -nl_func_def_end=remove -nl_func_decl_end_single=remove -nl_func_def_end_single=remove -nl_func_decl_empty=remove -nl_func_def_empty=remove -nl_oc_msg_args=false -nl_fdef_brace=force -nl_cpp_ldef_brace=remove -nl_return_expr=remove -nl_after_semicolon=true -nl_paren_dbrace_open=ignore -nl_after_brace_open=false -nl_after_brace_open_cmt=false -nl_after_vbrace_open=false -nl_after_vbrace_open_empty=false -nl_after_brace_close=false -nl_after_vbrace_close=false -nl_brace_struct_var=ignore -nl_define_macro=false -nl_squeeze_ifdef=false -nl_before_if=ignore -nl_after_if=ignore -nl_before_for=ignore -nl_after_for=ignore -nl_before_while=ignore -nl_after_while=ignore -nl_before_switch=ignore -nl_after_switch=ignore -nl_before_do=ignore -nl_after_do=ignore -nl_ds_struct_enum_cmt=false -nl_ds_struct_enum_close_brace=false -nl_class_colon=remove -nl_constr_colon=ignore -nl_create_if_one_liner=false -nl_create_for_one_liner=false -nl_create_while_one_liner=false -pos_arith=ignore -pos_assign=ignore -pos_bool=ignore -pos_compare=ignore -pos_conditional=ignore -pos_comma=trail -pos_class_comma=lead -pos_constr_comma=lead_force -pos_class_colon=lead_force -pos_constr_colon=lead_break -code_width=0 -ls_for_split_full=false -ls_func_split_full=false -ls_code_width=false -nl_max=2 -nl_after_func_proto=0 -nl_after_func_proto_group=0 -nl_after_func_body=2 -nl_after_func_body_class=0 -nl_after_func_body_one_liner=0 -nl_before_block_comment=0 -nl_before_c_comment=0 -nl_before_cpp_comment=0 -nl_after_multiline_comment=false -nl_after_label_colon=true -nl_after_struct=0 -nl_after_class=0 -nl_before_access_spec=2 -nl_after_access_spec=1 -nl_comment_func_def=0 -nl_after_try_catch_finally=0 -nl_around_cs_property=0 -nl_between_get_set=0 -nl_property_brace=ignore -eat_blanks_after_open_brace=false -eat_blanks_before_close_brace=false -nl_remove_extra_newlines=0 -nl_before_return=false -nl_after_return=false -nl_after_annotation=ignore -nl_between_annotation=ignore -mod_full_brace_do=ignore -mod_full_brace_for=ignore -mod_full_brace_function=ignore -mod_full_brace_if=ignore -mod_full_brace_if_chain=false -mod_full_brace_nl=0 -mod_full_brace_while=ignore -mod_full_brace_using=ignore -mod_paren_on_return=ignore -mod_pawn_semicolon=false -mod_full_paren_if_bool=false -mod_remove_extra_semicolon=false -mod_add_long_function_closebrace_comment=0 -mod_add_long_namespace_closebrace_comment=0 -mod_add_long_switch_closebrace_comment=0 -mod_add_long_ifdef_endif_comment=0 -mod_add_long_ifdef_else_comment=0 -mod_sort_import=false -mod_sort_using=false -mod_sort_include=false -mod_move_case_break=false -mod_case_brace=ignore -mod_remove_empty_return=false -cmt_width=0 -cmt_reflow_mode=0 -cmt_convert_tab_to_spaces=true -cmt_indent_multi=false -cmt_c_group=false -cmt_c_nl_start=false -cmt_c_nl_end=false -cmt_cpp_group=false -cmt_cpp_nl_start=false -cmt_cpp_nl_end=false -cmt_cpp_to_c=false -cmt_star_cont=false -cmt_sp_before_star_cont=0 -cmt_sp_after_star_cont=0 -cmt_multi_check_last=true -cmt_insert_file_header="" -cmt_insert_file_footer="" -cmt_insert_func_header="" -cmt_insert_class_header="" -cmt_insert_oc_msg_header="" -cmt_insert_before_preproc=false -pp_indent=ignore -pp_indent_at_level=false -pp_indent_count=1 -pp_space=ignore -pp_space_count=0 -pp_indent_region=0 -pp_region_indent_code=false -pp_indent_if=0 -pp_if_indent_code=false -pp_define_at_level=false +newlines = auto +input_tab_size = 8 +output_tab_size = 8 +string_escape_char = 92 +string_escape_char2 = 0 +string_replace_tab_chars = true +tok_split_gte = false +utf8_bom = ignore +utf8_byte = false +utf8_force = false +indent_columns = 4 +indent_continue = 0 +indent_with_tabs = 0 +indent_cmt_with_tabs = false +indent_align_string = false +indent_xml_string = 0 +indent_brace = 0 +indent_braces = false +indent_braces_no_func = false +indent_braces_no_class = false +indent_braces_no_struct = false +indent_brace_parent = false +indent_paren_open_brace = false +indent_namespace = false +indent_namespace_single_indent = false +indent_namespace_level = 0 +indent_namespace_limit = 0 +indent_extern = false +indent_class = true +indent_class_colon = false +indent_class_on_colon = false +indent_constr_colon = false +indent_ctor_init_leading = 2 +indent_ctor_init = 0 +indent_else_if = false +indent_var_def_blk = 0 +indent_var_def_cont = false +indent_func_def_force_col1 = false +indent_func_call_param = false +indent_func_def_param = false +indent_func_proto_param = false +indent_func_class_param = false +indent_func_ctor_var_param = false +indent_template_param = false +indent_func_param_double = false +indent_func_const = 0 +indent_func_throw = 0 +indent_member = 0 +indent_sing_line_comments = 0 +indent_relative_single_line_comments = false +indent_switch_case = 0 +indent_case_shift = 0 +indent_case_brace = 0 +indent_col1_comment = false +indent_label = 1 +indent_access_spec = 1 +indent_access_spec_body = false +indent_paren_nl = false +indent_paren_close = 0 +indent_comma_paren = false +indent_bool_paren = false +indent_first_bool_expr = false +indent_square_nl = false +indent_preserve_sql = false +indent_align_assign = true +indent_oc_block = false +indent_oc_block_msg = 0 +indent_oc_msg_colon = 0 +indent_oc_msg_prioritize_first_colon = true +indent_oc_block_msg_xcode_style = false +indent_oc_block_msg_from_keyword = false +indent_oc_block_msg_from_colon = false +indent_oc_block_msg_from_caret = false +indent_oc_block_msg_from_brace = false +sp_arith = force +sp_assign = force +sp_cpp_lambda_assign = ignore +sp_cpp_lambda_paren = remove +sp_assign_default = force +sp_before_assign = add +sp_after_assign = add +sp_enum_paren = remove +sp_enum_assign = remove +sp_enum_before_assign = remove +sp_enum_after_assign = remove +sp_pp_concat = remove +sp_pp_stringify = remove +sp_before_pp_stringify = remove +sp_bool = force +sp_compare = force +sp_inside_paren = remove +sp_paren_paren = remove +sp_cparen_oparen = remove +sp_balance_nested_parens = false +sp_paren_brace = remove +sp_before_ptr_star = force +sp_before_unnamed_ptr_star = ignore +sp_between_ptr_star = remove +sp_after_ptr_star = remove +sp_after_ptr_star_qualifier = remove +sp_after_ptr_star_func = remove +sp_ptr_star_paren = remove +sp_before_ptr_star_func = force +sp_before_byref = force +sp_before_unnamed_byref = remove +sp_after_byref = remove +sp_after_byref_func = remove +sp_before_byref_func = force +sp_after_type = force +sp_before_template_paren = ignore +sp_template_angle = force +sp_before_angle = remove +sp_inside_angle = remove +sp_after_angle = remove +sp_angle_paren = remove +sp_angle_paren_empty = remove +sp_angle_word = force +sp_angle_shift = remove +sp_permit_cpp11_shift = false +sp_before_sparen = force +sp_inside_sparen = remove +sp_inside_sparen_close = remove +sp_inside_sparen_open = remove +sp_after_sparen = remove +sp_sparen_brace = force +sp_invariant_paren = remove +sp_after_invariant_paren = remove +sp_special_semi = remove +sp_before_semi = remove +sp_before_semi_for = remove +sp_before_semi_for_empty = remove +sp_after_semi = remove +sp_after_semi_for = force +sp_after_semi_for_empty = remove +sp_before_square = remove +sp_before_squares = force +sp_inside_square = remove +sp_after_comma = force +sp_before_comma = remove +sp_paren_comma = force +sp_before_ellipsis = remove +sp_after_class_colon = force +sp_before_class_colon = force +sp_after_constr_colon = force +sp_before_constr_colon = remove +sp_before_case_colon = remove +sp_after_operator = remove +sp_after_operator_sym = remove +sp_after_cast = force +sp_inside_paren_cast = remove +sp_cpp_cast_paren = remove +sp_sizeof_paren = remove +sp_after_tag = remove +sp_inside_braces_enum = remove +sp_inside_braces_struct = remove +sp_inside_braces = remove +sp_inside_braces_empty = remove +sp_type_func = remove +sp_func_proto_paren = remove +sp_func_def_paren = remove +sp_inside_fparens = remove +sp_inside_fparen = remove +sp_inside_tparen = remove +sp_after_tparen_close = remove +sp_square_fparen = remove +sp_fparen_brace = remove +sp_fparen_dbrace = remove +sp_func_call_paren = remove +sp_func_call_paren_empty = ignore +sp_func_call_user_paren = remove +sp_func_class_paren = remove +sp_return_paren = remove +sp_attribute_paren = remove +sp_defined_paren = remove +sp_throw_paren = remove +sp_after_throw = remove +sp_catch_paren = force +sp_version_paren = ignore +sp_scope_paren = ignore +sp_macro = remove +sp_macro_func = remove +sp_else_brace = force +sp_brace_else = force +sp_brace_typedef = remove +sp_catch_brace = remove +sp_brace_catch = force +sp_finally_brace = remove +sp_brace_finally = remove +sp_try_brace = force +sp_getset_brace = remove +sp_word_brace = remove +sp_word_brace_ns = force +sp_before_dc = remove +sp_after_dc = remove +sp_d_array_colon = remove +sp_not = remove +sp_inv = remove +sp_addr = remove +sp_member = remove +sp_deref = remove +sp_sign = remove +sp_incdec = remove +sp_before_nl_cont = remove +sp_after_oc_scope = remove +sp_after_oc_colon = remove +sp_before_oc_colon = remove +sp_after_oc_dict_colon = remove +sp_before_oc_dict_colon = remove +sp_after_send_oc_colon = remove +sp_before_send_oc_colon = remove +sp_after_oc_type = remove +sp_after_oc_return_type = remove +sp_after_oc_at_sel = remove +sp_after_oc_at_sel_parens = remove +sp_inside_oc_at_sel_parens = remove +sp_before_oc_block_caret = remove +sp_after_oc_block_caret = remove +sp_after_oc_msg_receiver = remove +sp_after_oc_property = remove +sp_cond_colon = remove +sp_cond_colon_before = remove +sp_cond_colon_after = remove +sp_cond_question = remove +sp_cond_question_before = remove +sp_cond_question_after = remove +sp_cond_ternary_short = remove +sp_case_label = remove +sp_range = remove +sp_after_for_colon = remove +sp_before_for_colon = remove +sp_extern_paren = remove +sp_cmt_cpp_start = force +sp_endif_cmt = remove +sp_after_new = force +sp_before_tr_emb_cmt = force +sp_num_before_tr_emb_cmt = 0 +sp_annotation_paren = remove +align_keep_tabs = false +align_with_tabs = false +align_on_tabstop = false +align_number_right = false +align_keep_extra_space = false +align_func_params = false +align_same_func_call_params = false +align_var_def_span = 0 +align_var_def_star_style = 0 +align_var_def_amp_style = 0 +align_var_def_thresh = 0 +align_var_def_gap = 0 +align_var_def_colon = false +align_var_def_attribute = false +align_var_def_inline = false +align_assign_span = 0 +align_assign_thresh = 0 +align_enum_equ_span = 0 +align_enum_equ_thresh = 0 +align_var_struct_span = 0 +align_var_struct_thresh = 0 +align_var_struct_gap = 0 +align_struct_init_span = 0 +align_typedef_gap = 0 +align_typedef_span = 0 +align_typedef_func = 0 +align_typedef_star_style = 0 +align_typedef_amp_style = 0 +align_right_cmt_span = 0 +align_right_cmt_mix = false +align_right_cmt_gap = 0 +align_right_cmt_at_col = 0 +align_func_proto_span = 0 +align_func_proto_gap = 0 +align_on_operator = false +align_mix_var_proto = false +align_single_line_func = false +align_single_line_brace = false +align_single_line_brace_gap = 0 +align_oc_msg_spec_span = 0 +align_nl_cont = false +align_pp_define_together = false +align_pp_define_gap = 0 +align_pp_define_span = 0 +align_left_shift = true +align_oc_msg_colon_span = 0 +align_oc_msg_colon_first = false +align_oc_decl_colon = false +nl_collapse_empty_body = false +nl_assign_leave_one_liners = false +nl_class_leave_one_liners = false +nl_enum_leave_one_liners = false +nl_getset_leave_one_liners = false +nl_func_leave_one_liners = false +nl_cpp_lambda_leave_one_liners = false +nl_if_leave_one_liners = false +nl_oc_msg_leave_one_liner = false +nl_start_of_file = remove +nl_start_of_file_min = 0 +nl_end_of_file = force +nl_end_of_file_min = 1 +nl_assign_brace = ignore +nl_assign_square = ignore +nl_after_square_assign = ignore +nl_func_var_def_blk = 1 +nl_typedef_blk_start = 2 +nl_typedef_blk_end = 2 +nl_typedef_blk_in = 0 +nl_var_def_blk_end = 1 +nl_var_def_blk_in = 0 +nl_fcall_brace = force +nl_enum_brace = remove +nl_struct_brace = force +nl_union_brace = remove +nl_if_brace = remove +nl_brace_else = remove +nl_elseif_brace = remove +nl_else_brace = remove +nl_else_if = remove +nl_brace_finally = ignore +nl_finally_brace = ignore +nl_try_brace = remove +nl_getset_brace = ignore +nl_for_brace = remove +nl_catch_brace = remove +nl_brace_catch = remove +nl_brace_square = ignore +nl_brace_fparen = ignore +nl_while_brace = remove +nl_scope_brace = ignore +nl_unittest_brace = ignore +nl_version_brace = ignore +nl_using_brace = ignore +nl_brace_brace = ignore +nl_do_brace = remove +nl_brace_while = remove +nl_switch_brace = remove +nl_multi_line_cond = false +nl_multi_line_define = true +nl_before_case = false +nl_before_throw = ignore +nl_after_case = true +nl_case_colon_brace = remove +nl_namespace_brace = remove +nl_template_class = ignore +nl_class_brace = force +nl_class_init_args = ignore +nl_constr_init_args = force +nl_func_type_name = remove +nl_func_type_name_class = remove +nl_func_scope_name = remove +nl_func_proto_type_name = ignore +nl_func_paren = remove +nl_func_def_paren = remove +nl_func_decl_start = ignore +nl_func_def_start = ignore +nl_func_decl_start_single = ignore +nl_func_def_start_single = remove +nl_func_decl_args = remove +nl_func_def_args = ignore +nl_func_decl_end = ignore +nl_func_def_end = remove +nl_func_decl_end_single = remove +nl_func_def_end_single = remove +nl_func_decl_empty = remove +nl_func_def_empty = remove +nl_oc_msg_args = false +nl_fdef_brace = force +nl_cpp_ldef_brace = remove +nl_return_expr = remove +nl_after_semicolon = true +nl_paren_dbrace_open = ignore +nl_after_brace_open = false +nl_after_brace_open_cmt = false +nl_after_vbrace_open = false +nl_after_vbrace_open_empty = false +nl_after_brace_close = false +nl_after_vbrace_close = false +nl_brace_struct_var = ignore +nl_define_macro = false +nl_squeeze_ifdef = false +nl_before_if = ignore +nl_after_if = ignore +nl_before_for = ignore +nl_after_for = ignore +nl_before_while = ignore +nl_after_while = ignore +nl_before_switch = ignore +nl_after_switch = ignore +nl_before_do = ignore +nl_after_do = ignore +nl_ds_struct_enum_cmt = false +nl_ds_struct_enum_close_brace = false +nl_class_colon = remove +nl_constr_colon = ignore +nl_create_if_one_liner = false +nl_create_for_one_liner = false +nl_create_while_one_liner = false +pos_arith = ignore +pos_assign = ignore +pos_bool = ignore +pos_compare = ignore +pos_conditional = ignore +pos_comma = trail +pos_class_comma = lead +pos_constr_comma = lead_force +pos_class_colon = lead_force +pos_constr_colon = lead_break +code_width = 0 +ls_for_split_full = false +ls_func_split_full = false +ls_code_width = false +nl_max = 2 +nl_after_func_proto = 0 +nl_after_func_proto_group = 0 +nl_after_func_body = 2 +nl_after_func_body_class = 0 +nl_after_func_body_one_liner = 0 +nl_before_block_comment = 0 +nl_before_c_comment = 0 +nl_before_cpp_comment = 0 +nl_after_multiline_comment = false +nl_after_label_colon = true +nl_after_struct = 0 +nl_after_class = 0 +nl_before_access_spec = 2 +nl_after_access_spec = 1 +nl_comment_func_def = 0 +nl_after_try_catch_finally = 0 +nl_around_cs_property = 0 +nl_between_get_set = 0 +nl_property_brace = ignore +eat_blanks_after_open_brace = false +eat_blanks_before_close_brace = false +nl_remove_extra_newlines = 0 +nl_before_return = false +nl_after_return = false +nl_after_annotation = ignore +nl_between_annotation = ignore +mod_full_brace_do = ignore +mod_full_brace_for = ignore +mod_full_brace_function = ignore +mod_full_brace_if = ignore +mod_full_brace_if_chain = false +mod_full_brace_nl = 0 +mod_full_brace_while = ignore +mod_full_brace_using = ignore +mod_paren_on_return = ignore +mod_pawn_semicolon = false +mod_full_paren_if_bool = false +mod_remove_extra_semicolon = false +mod_add_long_function_closebrace_comment = 0 +mod_add_long_namespace_closebrace_comment = 0 +mod_add_long_switch_closebrace_comment = 0 +mod_add_long_ifdef_endif_comment = 0 +mod_add_long_ifdef_else_comment = 0 +mod_sort_import = false +mod_sort_using = false +mod_sort_include = false +mod_move_case_break = false +mod_case_brace = ignore +mod_remove_empty_return = false +cmt_width = 0 +cmt_reflow_mode = 0 +cmt_convert_tab_to_spaces = true +cmt_indent_multi = false +cmt_c_group = false +cmt_c_nl_start = false +cmt_c_nl_end = false +cmt_cpp_group = false +cmt_cpp_nl_start = false +cmt_cpp_nl_end = false +cmt_cpp_to_c = false +cmt_star_cont = false +cmt_sp_before_star_cont = 0 +cmt_sp_after_star_cont = 0 +cmt_multi_check_last = true +cmt_insert_file_header = "" +cmt_insert_file_footer = "" +cmt_insert_func_header = "" +cmt_insert_class_header = "" +cmt_insert_oc_msg_header = "" +cmt_insert_before_preproc = false +pp_indent = ignore +pp_indent_at_level = false +pp_indent_count = 1 +pp_space = ignore +pp_space_count = 0 +pp_indent_region = 0 +pp_region_indent_code = false +pp_indent_if = 0 +pp_if_indent_code = false +pp_define_at_level = false diff --git a/tests/config/kw_subst.cfg b/tests/config/kw_subst.cfg index 805b72d609..57d0601be6 100644 --- a/tests/config/kw_subst.cfg +++ b/tests/config/kw_subst.cfg @@ -1,9 +1,9 @@ -cmt_insert_file_header = file-header.h -cmt_insert_func_header = func-header.h -cmt_insert_class_header = class-header.h +cmt_insert_file_header = file-header.h +cmt_insert_func_header = func-header.h +cmt_insert_class_header = class-header.h -cmt_insert_before_preproc = true +cmt_insert_before_preproc = true -indent_namespace = true +indent_namespace = true diff --git a/tests/config/kw_subst2.cfg b/tests/config/kw_subst2.cfg index 4a889fff0a..0094a4af9a 100644 --- a/tests/config/kw_subst2.cfg +++ b/tests/config/kw_subst2.cfg @@ -1,5 +1,5 @@ -cmt_insert_file_header = file-header.h -cmt_insert_func_header = func-header2.h -cmt_insert_class_header = class-header.h +cmt_insert_file_header = file-header.h +cmt_insert_func_header = func-header2.h +cmt_insert_class_header = class-header.h diff --git a/tests/config/kw_subst3.cfg b/tests/config/kw_subst3.cfg index cefd764e45..1236ee636c 100644 --- a/tests/config/kw_subst3.cfg +++ b/tests/config/kw_subst3.cfg @@ -5,19 +5,19 @@ # # The type of line endings -newlines = auto # auto/lf/crlf/cr +newlines = auto # auto/lf/crlf/cr # The original size of tabs in the input -input_tab_size = 4 # number +input_tab_size = 4 # number # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 4 # number +output_tab_size = 4 # number # The ascii value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # number # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # number # # Indenting @@ -25,940 +25,940 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 4 # number +indent_columns = 4 # number # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # number # Whether to indent strings broken by '\' so that they line up -indent_align_string = false # false/true +indent_align_string = false # false/true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # number # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # number # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # false/true # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # false/true # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # false/true # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # false/true # Whether the 'class' body is indented -indent_class = false # false/true +indent_class = false # false/true # Whether to indent the stuff after a leading class colon -indent_class_colon = false # false/true +indent_class_colon = false # false/true # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = false # false/true +indent_func_call_param = false # false/true # Same as indent_func_call_param, but for function defs -indent_func_def_param = false # false/true +indent_func_def_param = false # false/true # Same as indent_func_call_param, but for function protos -indent_func_proto_param = false # false/true +indent_func_proto_param = false # false/true # Same as indent_func_call_param, but for class declarations -indent_func_class_param = false # false/true +indent_func_class_param = false # false/true # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = false # false/true +indent_func_ctor_var_param = false # false/true # Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true +indent_func_param_double = false # false/true # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 0 # number +indent_member = 0 # number # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # number # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = false # false/true +indent_relative_single_line_comments = false # false/true # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 4 # number +indent_switch_case = 4 # number # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # number # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 0 # number +indent_case_brace = 0 # number # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # false/true # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # number # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # number # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # false/true # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # false/true # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 0 # number +indent_paren_close = 0 # number # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # false/true # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # false/true # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # false/true # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # false/true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = add # ignore/add/remove/force +sp_arith = add # ignore/add/remove/force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = add # ignore/add/remove/force +sp_assign = add # ignore/add/remove/force # Add or remove space around assignment '=' in enum -sp_enum_assign = add # ignore/add/remove/force +sp_enum_assign = add # ignore/add/remove/force # Add or remove space around boolean operators '&&' and '||' -sp_bool = add # ignore/add/remove/force +sp_bool = add # ignore/add/remove/force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = add # ignore/add/remove/force +sp_compare = add # ignore/add/remove/force # Add or remove space inside '(' and ')' -sp_inside_paren = ignore # ignore/add/remove/force +sp_inside_paren = ignore # ignore/add/remove/force # Add or remove space between nested parens -sp_paren_paren = ignore # ignore/add/remove/force +sp_paren_paren = ignore # ignore/add/remove/force # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # false/true # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # ignore/add/remove/force # Add or remove space before pointer star '*' -sp_before_ptr_star = ignore # ignore/add/remove/force +sp_before_ptr_star = ignore # ignore/add/remove/force # Add or remove space between pointer stars '*' -sp_between_ptr_star = ignore # ignore/add/remove/force +sp_between_ptr_star = ignore # ignore/add/remove/force # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = ignore # ignore/add/remove/force +sp_after_ptr_star = ignore # ignore/add/remove/force # Add or remove space before reference sign '&' -sp_before_byref = ignore # ignore/add/remove/force +sp_before_byref = ignore # ignore/add/remove/force # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = ignore # ignore/add/remove/force +sp_after_byref = ignore # ignore/add/remove/force # Add or remove space between type and word -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # ignore/add/remove/force # Add or remove space before '<>' -sp_before_angle = ignore # ignore/add/remove/force +sp_before_angle = ignore # ignore/add/remove/force # Add or remove space after '<>' -sp_after_angle = ignore # ignore/add/remove/force +sp_after_angle = ignore # ignore/add/remove/force # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = ignore # ignore/add/remove/force +sp_angle_paren = ignore # ignore/add/remove/force # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = ignore # ignore/add/remove/force +sp_angle_word = ignore # ignore/add/remove/force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = add # ignore/add/remove/force +sp_before_sparen = add # ignore/add/remove/force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # ignore/add/remove/force # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = add # ignore/add/remove/force +sp_after_sparen = add # ignore/add/remove/force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = add # ignore/add/remove/force +sp_sparen_brace = add # ignore/add/remove/force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = add # ignore/add/remove/force +sp_special_semi = add # ignore/add/remove/force # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # ignore/add/remove/force # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = ignore # ignore/add/remove/force +sp_before_semi_for = ignore # ignore/add/remove/force # Add or remove space before a semicolon of an empty part of a for statment. -sp_before_semi_for_empty = ignore # ignore/add/remove/force +sp_before_semi_for_empty = ignore # ignore/add/remove/force # Add or remove space after the final semicolon of an empty part of a for statment: for ( ; ; ). -sp_after_semi_for_empty = ignore # ignore/add/remove/force +sp_after_semi_for_empty = ignore # ignore/add/remove/force # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # ignore/add/remove/force # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # ignore/add/remove/force # Add or remove space inside '[' and ']' -sp_inside_square = ignore # ignore/add/remove/force +sp_inside_square = ignore # ignore/add/remove/force # Add or remove space after ',' -sp_after_comma = add # ignore/add/remove/force +sp_after_comma = add # ignore/add/remove/force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # ignore/add/remove/force # Add or remove space after class ':' -sp_after_class_colon = ignore # ignore/add/remove/force +sp_after_class_colon = ignore # ignore/add/remove/force # Add or remove space before class ':' -sp_before_class_colon = ignore # ignore/add/remove/force +sp_before_class_colon = ignore # ignore/add/remove/force # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # ignore/add/remove/force # Add or remove space after cast -sp_after_cast = ignore # ignore/add/remove/force +sp_after_cast = ignore # ignore/add/remove/force # Add or remove spaces inside cast parens -sp_inside_paren_cast = ignore # ignore/add/remove/force +sp_inside_paren_cast = ignore # ignore/add/remove/force # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # ignore/add/remove/force # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # ignore/add/remove/force # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = ignore # ignore/add/remove/force +sp_inside_braces_enum = ignore # ignore/add/remove/force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = ignore # ignore/add/remove/force +sp_inside_braces_struct = ignore # ignore/add/remove/force # Add or remove space inside '{' and '}' -sp_inside_braces = ignore # ignore/add/remove/force +sp_inside_braces = ignore # ignore/add/remove/force # Add or remove space inside '<' and '>' -sp_inside_angle = ignore # ignore/add/remove/force +sp_inside_angle = ignore # ignore/add/remove/force # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = add # ignore/add/remove/force +sp_type_func = add # ignore/add/remove/force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # ignore/add/remove/force # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # ignore/add/remove/force # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # ignore/add/remove/force # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # ignore/add/remove/force # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # ignore/add/remove/force # Add or remove space between ')' and '{' of function -sp_fparen_brace = ignore # ignore/add/remove/force +sp_fparen_brace = ignore # ignore/add/remove/force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # ignore/add/remove/force # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = ignore # ignore/add/remove/force +sp_func_class_paren = ignore # ignore/add/remove/force # Add or remove space between 'return' and '(' -sp_return_paren = ignore # ignore/add/remove/force +sp_return_paren = ignore # ignore/add/remove/force # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # ignore/add/remove/force # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # ignore/add/remove/force # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # ignore/add/remove/force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = add # ignore/add/remove/force +sp_else_brace = add # ignore/add/remove/force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # ignore/add/remove/force # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # ignore/add/remove/force # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # ignore/add/remove/force # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # ignore/add/remove/force # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # ignore/add/remove/force # Add or remove space before the '::' operator -sp_before_dc = ignore # ignore/add/remove/force +sp_before_dc = ignore # ignore/add/remove/force # Add or remove space after the '::' operator -sp_after_dc = ignore # ignore/add/remove/force +sp_after_dc = ignore # ignore/add/remove/force # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # ignore/add/remove/force # Add or remove space after the '!' (not) operator. -sp_not = remove # ignore/add/remove/force +sp_not = remove # ignore/add/remove/force # Add or remove space after the '~' (invert) operator. -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # ignore/add/remove/force # Add or remove space after the '&' (address-of) operator. # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # ignore/add/remove/force # Add or remove space around the '.' or '->' operators -sp_member = remove # ignore/add/remove/force +sp_member = remove # ignore/add/remove/force # Add or remove space after the '*' (dereference) operator. # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # ignore/add/remove/force # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7' -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # ignore/add/remove/force # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;' -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # ignore/add/remove/force # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force +sp_after_oc_scope = ignore # ignore/add/remove/force # Add or remove space after the colon in message specs # '-(int) f: (int) x;' vs '+(int) f : (int) x;' -sp_before_oc_colon = ignore # ignore/add/remove/force +sp_before_oc_colon = ignore # ignore/add/remove/force # Add or remove space after the (type) in message specs # '-(int) f: (int) x;' vs '+(int)f : (int)x;' -sp_after_oc_type = ignore # ignore/add/remove/force +sp_after_oc_type = ignore # ignore/add/remove/force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # false/true # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # false/true # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # false/true # Align variable definitions in prototypes and functions -align_func_params = false # false/true +align_func_params = false # false/true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 10 # number +align_var_def_span = 10 # number # How to align the star in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_star_style = 1 # number +align_var_def_star_style = 1 # number # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 1 # number +align_var_def_amp_style = 1 # number # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # number # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # number # Whether to align the colon in struct bit fields -align_var_def_colon = true # false/true +align_var_def_colon = true # false/true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = false # false/true +align_var_def_inline = false # false/true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 10 # number +align_assign_span = 10 # number # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 4 # number +align_assign_thresh = 4 # number # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 10 # number +align_enum_equ_span = 10 # number # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # number # The span for aligning struct/union (0=don't align) -align_var_struct_span = 0 # number +align_var_struct_span = 0 # number # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # number # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # number # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 0 # number +align_struct_init_span = 0 # number # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number +align_typedef_gap = 0 # number # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 0 # number +align_typedef_span = 0 # number # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # number # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # number # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typdef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # number # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 0 # number +align_right_cmt_span = 0 # number # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # false/true # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # number # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # number # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # false/true # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true +align_single_line_func = false # false/true # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # false/true # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # number # The span for aligning ObjC msg spec (0=don't align) -align_oc_msg_spec_span = 0 # number +align_oc_msg_spec_span = 0 # number # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = false # false/true +align_nl_cont = false # false/true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 0 # number +align_pp_define_gap = 0 # number # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 0 # number +align_pp_define_span = 0 # number # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # false/true # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = false # false/true +nl_assign_leave_one_liners = false # false/true # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = false # false/true +nl_class_leave_one_liners = false # false/true # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = false # false/true +nl_enum_leave_one_liners = false # false/true # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # false/true # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # false/true # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # false/true # Add or remove newlines at the start of the file -nl_start_of_file = ignore # ignore/add/remove/force +nl_start_of_file = ignore # ignore/add/remove/force # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # number # Add or remove newline at the end of the file -nl_end_of_file = add # ignore/add/remove/force +nl_end_of_file = add # ignore/add/remove/force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # number # Add or remove newline between '=' and '{' -nl_assign_brace = add # ignore/add/remove/force +nl_assign_brace = add # ignore/add/remove/force # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # ignore/add/remove/force # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # ignore/add/remove/force # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # number # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = ignore # ignore/add/remove/force +nl_fcall_brace = ignore # ignore/add/remove/force # Add or remove newline between 'enum' and '{' -nl_enum_brace = add # ignore/add/remove/force +nl_enum_brace = add # ignore/add/remove/force # Add or remove newline between 'struct and '{' -nl_struct_brace = add # ignore/add/remove/force +nl_struct_brace = add # ignore/add/remove/force # Add or remove newline between 'union' and '{' -nl_union_brace = add # ignore/add/remove/force +nl_union_brace = add # ignore/add/remove/force # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # ignore/add/remove/force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = add # ignore/add/remove/force +nl_elseif_brace = add # ignore/add/remove/force # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'finally' -nl_brace_finally = ignore # ignore/add/remove/force +nl_brace_finally = ignore # ignore/add/remove/force # Add or remove newline between 'finally' and '{' -nl_finally_brace = ignore # ignore/add/remove/force +nl_finally_brace = ignore # ignore/add/remove/force # Add or remove newline between 'try' and '{' -nl_try_brace = ignore # ignore/add/remove/force +nl_try_brace = ignore # ignore/add/remove/force # Add or remove newline between get/set and '{' -nl_getset_brace = ignore # ignore/add/remove/force +nl_getset_brace = ignore # ignore/add/remove/force # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # ignore/add/remove/force # Add or remove newline between 'catch' and '{' -nl_catch_brace = ignore # ignore/add/remove/force +nl_catch_brace = ignore # ignore/add/remove/force # Add or remove newline between '}' and 'catch' -nl_brace_catch = ignore # ignore/add/remove/force +nl_brace_catch = ignore # ignore/add/remove/force # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # ignore/add/remove/force # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = ignore # ignore/add/remove/force +nl_brace_while = ignore # ignore/add/remove/force # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # ignore/add/remove/force # Add or remove newline when condition spans two or more lines -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # false/true # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = false # false/true +nl_multi_line_define = false # false/true # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # false/true # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # false/true # Newline between namespace and { -nl_namespace_brace = ignore # ignore/add/remove/force +nl_namespace_brace = ignore # ignore/add/remove/force # Add or remove newline between 'template<>' and 'class' -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # ignore/add/remove/force # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # ignore/add/remove/force # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = ignore # ignore/add/remove/force +nl_func_proto_type_name = ignore # ignore/add/remove/force # Add or remove newline between a function name and the opening '(' -nl_func_paren = ignore # ignore/add/remove/force +nl_func_paren = ignore # ignore/add/remove/force # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # ignore/add/remove/force # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # ignore/add/remove/force # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # ignore/add/remove/force # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # ignore/add/remove/force # Whether to put a newline after 'return' statement -nl_after_return = true # false/true +nl_after_return = true # false/true # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # false/true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = true # false/true +nl_after_brace_open = true # false/true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = true # false/true +nl_after_brace_open_cmt = true # false/true # Whether to put a newline after a virtual brace open. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = false # false/true +nl_after_vbrace_open = false # false/true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # false/true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true +nl_squeeze_ifdef = false # false/true # Add or remove newline before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # ignore/add/remove/force # Add or remove newline after 'if' -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # ignore/add/remove/force # Add or remove newline before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # ignore/add/remove/force # Add or remove newline after 'for' -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # ignore/add/remove/force # Add or remove newline before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # ignore/add/remove/force # Add or remove newline after 'while' -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # ignore/add/remove/force # Add or remove newline before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # ignore/add/remove/force # Add or remove newline after 'switch' -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # ignore/add/remove/force # Add or remove newline before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # ignore/add/remove/force # Add or remove newline after 'do' -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # ignore/add/remove/force # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # false/true # Whether to double-space before the close brace of a struct/union/enum -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # false/true # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # ignore/add/remove/force # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # false/true # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # false/true # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # false/true # # Positioning options # # The position of boolean operators in wrapped expressions -pos_bool = ignore # ignore/lead/trail +pos_bool = ignore # ignore/lead/trail # The position of the comma in wrapped expressions -pos_comma = ignore # ignore/lead/trail +pos_comma = ignore # ignore/lead/trail # The position of the comma in the constructor initialization list -pos_class_comma = ignore # ignore/lead/trail +pos_class_comma = ignore # ignore/lead/trail # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # ignore/lead/trail # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # number # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true +ls_for_split_full = false # false/true # Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true +ls_func_split_full = false # false/true # # Blank line options # # The maximum consecutive newlines -nl_max = 0 # number +nl_max = 0 # number # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # number # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 4 # number +nl_after_func_proto_group = 4 # number # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 4 # number +nl_after_func_body = 4 # number # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 4 # number +nl_after_func_body_one_liner = 4 # number # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 0 # number +nl_before_block_comment = 0 # number # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # number # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # number # Whether to force a newline after a mulit-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # false/true # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 0 # number +nl_before_access_spec = 0 # number # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # number # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = false # false/true +eat_blanks_after_open_brace = false # false/true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = false # false/true +eat_blanks_before_close_brace = false # false/true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # ignore/add/remove/force # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # ignore/add/remove/force # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # ignore/add/remove/force # Add or remove braces on single-line 'if' statement -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # ignore/add/remove/force # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # number # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # ignore/add/remove/force # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = ignore # ignore/add/remove/force +mod_paren_on_return = ignore # ignore/add/remove/force # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # false/true # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = false # false/true +mod_full_paren_if_bool = false # false/true # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = true # false/true +mod_remove_extra_semicolon = true # false/true # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 50 # number +mod_add_long_function_closebrace_comment = 50 # number # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 50 # number +mod_add_long_switch_closebrace_comment = 50 # number # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # false/true # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # false/true # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # false/true # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # number # Whether to mess with the indent of multi-line comments -cmt_indent_multi = true # false/true +cmt_indent_multi = true # false/true # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # false/true # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # false/true # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # false/true # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # false/true # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # false/true # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # false/true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 1 # number +cmt_sp_before_star_cont = 1 # number # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # number # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitue $(filename) with the current file's name. -cmt_insert_file_header = "file_header.txt" # string -cmt_insert_file_footer = "file_footer.txt" # string +cmt_insert_file_header = "file_header.txt" # string +cmt_insert_file_footer = "file_footer.txt" # string # The filename that contains text to insert before a function implementation if the function isn't preceeded with a C/C++ comment. # Will substitue $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "function_header.txt" # string +cmt_insert_func_header = "function_header.txt" # string # The filename that contains text to insert before a class if the class isn't preceeded with a C/C++ comment. # Will substitue $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # string # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # ignore/add/remove/force # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = true # false/true +pp_indent_at_level = true # false/true # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # ignore/add/remove/force # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # number # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # number # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # false/true # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # number # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = true # false/true +pp_if_indent_code = true # false/true # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = true # false/true +pp_define_at_level = true # false/true # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/kw_subst4.cfg b/tests/config/kw_subst4.cfg index 59b7bf4d54..8d60df85e7 100644 --- a/tests/config/kw_subst4.cfg +++ b/tests/config/kw_subst4.cfg @@ -1,5 +1,5 @@ -cmt_insert_file_header = file-header.h -cmt_insert_func_header = func-header2.h -cmt_insert_class_header = class-header.h -cmt_indent_multi = false +cmt_insert_file_header = file-header.h +cmt_insert_func_header = func-header2.h +cmt_insert_class_header = class-header.h +cmt_indent_multi = false diff --git a/tests/config/label_colon_nl_1.cfg b/tests/config/label_colon_nl_1.cfg index 67ee339922..8d03ac30f4 100644 --- a/tests/config/label_colon_nl_1.cfg +++ b/tests/config/label_colon_nl_1.cfg @@ -13,7 +13,7 @@ align_var_struct_thresh = 16 align_right_cmt_span = 3 align_pp_define_span = 3 align_pp_define_gap = 4 -align_number_right = TRUE +align_number_right = TRUE align_typedef_span = 5 align_typedef_gap = 3 nl_before_case = TRUE diff --git a/tests/config/label_colon_nl_2.cfg b/tests/config/label_colon_nl_2.cfg index 5575864034..5b9a75a65e 100644 --- a/tests/config/label_colon_nl_2.cfg +++ b/tests/config/label_colon_nl_2.cfg @@ -13,7 +13,7 @@ align_var_struct_thresh = 16 align_right_cmt_span = 3 align_pp_define_span = 3 align_pp_define_gap = 4 -align_number_right = TRUE +align_number_right = TRUE align_typedef_span = 5 align_typedef_gap = 3 nl_before_case = TRUE diff --git a/tests/config/lambda1.cfg b/tests/config/lambda1.cfg index 42240ba583..eb54d9fbea 100644 --- a/tests/config/lambda1.cfg +++ b/tests/config/lambda1.cfg @@ -1,222 +1,222 @@ -newlines = auto -input_tab_size = 8 -output_tab_size = 3 -string_escape_char = 92 -indent_columns = 3 -indent_with_tabs = 0 -indent_align_string = false -indent_xml_string = 0 -indent_brace = 0 -indent_braces = false -indent_braces_no_func = false -indent_brace_parent = false -indent_namespace = false -indent_class = true -indent_class_colon = false -indent_func_call_param = false -indent_member = 3 -indent_sing_line_comments = 0 -indent_switch_case = 0 -indent_case_brace = 0 -indent_col1_comment = false -indent_label = 2 -indent_access_spec = 2 -indent_paren_nl = false -indent_square_nl = false -sp_arith = force -sp_assign = force -sp_assign_default = remove -sp_bool = force -sp_compare = force -sp_inside_paren = remove -sp_paren_paren = remove -sp_balance_nested_parens = false -sp_paren_brace = ignore -sp_before_ptr_star = force -sp_between_ptr_star = remove -sp_after_ptr_star = remove -sp_before_byref = remove -sp_after_byref = ignore -sp_before_angle = remove -sp_after_angle = force -sp_angle_paren = remove -sp_angle_paren_empty = remove -sp_angle_word = force -sp_before_sparen = force -sp_inside_sparen = remove -sp_after_sparen = force -sp_sparen_brace = ignore -sp_special_semi = ignore -sp_before_semi = remove -sp_before_semi_for = ignore -sp_before_square = ignore -sp_before_squares = ignore -sp_inside_square = remove -sp_after_comma = force -sp_before_comma = remove -sp_after_operator = ignore -sp_after_cast = remove -sp_sizeof_paren = remove -sp_after_tag = ignore -sp_inside_braces_enum = force -sp_inside_braces_struct = force -sp_inside_braces = force -sp_inside_angle = remove -sp_type_func = ignore -sp_func_proto_paren = remove -sp_func_def_paren = remove -sp_inside_fparens = ignore -sp_inside_fparen = remove -sp_square_fparen = ignore -sp_fparen_brace = force -sp_func_call_paren = remove -sp_func_class_paren = ignore -sp_return_paren = remove -sp_macro = ignore -sp_before_semi_for_empty = force +newlines = auto +input_tab_size = 8 +output_tab_size = 3 +string_escape_char = 92 +indent_columns = 3 +indent_with_tabs = 0 +indent_align_string = false +indent_xml_string = 0 +indent_brace = 0 +indent_braces = false +indent_braces_no_func = false +indent_brace_parent = false +indent_namespace = false +indent_class = true +indent_class_colon = false +indent_func_call_param = false +indent_member = 3 +indent_sing_line_comments = 0 +indent_switch_case = 0 +indent_case_brace = 0 +indent_col1_comment = false +indent_label = 2 +indent_access_spec = 2 +indent_paren_nl = false +indent_square_nl = false +sp_arith = force +sp_assign = force +sp_assign_default = remove +sp_bool = force +sp_compare = force +sp_inside_paren = remove +sp_paren_paren = remove +sp_balance_nested_parens = false +sp_paren_brace = ignore +sp_before_ptr_star = force +sp_between_ptr_star = remove +sp_after_ptr_star = remove +sp_before_byref = remove +sp_after_byref = ignore +sp_before_angle = remove +sp_after_angle = force +sp_angle_paren = remove +sp_angle_paren_empty = remove +sp_angle_word = force +sp_before_sparen = force +sp_inside_sparen = remove +sp_after_sparen = force +sp_sparen_brace = ignore +sp_special_semi = ignore +sp_before_semi = remove +sp_before_semi_for = ignore +sp_before_square = ignore +sp_before_squares = ignore +sp_inside_square = remove +sp_after_comma = force +sp_before_comma = remove +sp_after_operator = ignore +sp_after_cast = remove +sp_sizeof_paren = remove +sp_after_tag = ignore +sp_inside_braces_enum = force +sp_inside_braces_struct = force +sp_inside_braces = force +sp_inside_angle = remove +sp_type_func = ignore +sp_func_proto_paren = remove +sp_func_def_paren = remove +sp_inside_fparens = ignore +sp_inside_fparen = remove +sp_square_fparen = ignore +sp_fparen_brace = force +sp_func_call_paren = remove +sp_func_class_paren = ignore +sp_return_paren = remove +sp_macro = ignore +sp_before_semi_for_empty = force -sp_macro_func = ignore -sp_else_brace = ignore -sp_brace_else = ignore -sp_catch_brace = ignore -sp_brace_catch = ignore -sp_finally_brace = ignore -sp_brace_finally = ignore -sp_try_brace = ignore -sp_getset_brace = ignore -align_keep_tabs = false -align_with_tabs = false -align_on_tabstop = false -align_number_right = true -align_func_params = true -align_var_def_span = 2 -align_var_def_star_style = 1 -align_var_def_thresh = 0 -align_var_def_colon = true -align_var_def_inline = true -align_assign_span = 1 -align_assign_thresh = 0 -align_enum_equ_span = 4 -align_enum_equ_thresh = 0 -align_var_struct_span = 3 -align_struct_init_span = 3 -align_typedef_gap = 3 -align_typedef_span = 5 -align_typedef_star_style = 0 -align_right_cmt_span = 3 -align_func_proto_span = 0 -align_nl_cont = true -align_pp_define_gap = 4 -align_pp_define_span = 3 -code_width = 0 -nl_collapse_empty_body = false -nl_class_leave_one_liners = true -nl_assign_leave_one_liners = true -nl_start_of_file = ignore -nl_start_of_file_min = 0 -nl_end_of_file = ignore -nl_end_of_file_min = 0 -nl_assign_brace = add -nl_func_var_def_blk = 1 -nl_fcall_brace = add -nl_enum_brace = add -nl_struct_brace = add -nl_union_brace = add -nl_if_brace = add -nl_brace_else = add -nl_elseif_brace = ignore -nl_else_brace = add -nl_brace_finally = ignore -nl_finally_brace = add -nl_try_brace = add -nl_getset_brace = ignore -nl_for_brace = add -nl_catch_brace = add -nl_brace_catch = ignore -nl_while_brace = add -nl_do_brace = add -nl_brace_while = remove -nl_switch_brace = add -nl_before_case = true -nl_after_case = false -nl_namespace_brace = ignore -nl_template_class = ignore -nl_class_brace = ignore -nl_class_init_args = ignore -nl_func_type_name = ignore -nl_func_decl_start = ignore -nl_func_decl_args = ignore -nl_func_decl_end = ignore -nl_fdef_brace = add -nl_cpp_ldef_brace = remove -nl_after_return = true -nl_after_semicolon = true -nl_after_brace_open = true -nl_after_vbrace_open = true -nl_after_access_spec = 1 -nl_assign_leave_one_liners = true -nl_class_leave_one_liners = true -nl_enum_leave_one_liners = true -nl_getset_leave_one_liners = true -nl_cpp_lambda_leave_one_liners= true -nl_define_macro = false -nl_squeeze_ifdef = true -nl_before_if = ignore -nl_after_if = ignore -nl_before_for = ignore -nl_after_for = ignore -nl_before_while = ignore -nl_after_while = ignore -nl_before_switch = ignore -nl_after_switch = ignore -nl_before_do = ignore -nl_after_do = ignore -nl_ds_struct_enum_cmt = false -pos_bool = ignore -pos_class_colon = ignore -ls_for_split_full = false -ls_func_split_full = false -nl_max = 0 -nl_after_func_proto = 0 -nl_after_func_proto_group = 0 -nl_after_func_body = 0 -nl_after_func_body_one_liner = 0 -nl_before_block_comment = 0 -nl_before_c_comment = 0 -nl_before_cpp_comment = 0 -eat_blanks_after_open_brace = true -eat_blanks_before_close_brace = true -mod_full_brace_do = add -mod_full_brace_for = add -mod_full_brace_function = ignore -mod_full_brace_if = add -mod_full_brace_nl = 0 -mod_full_brace_while = add -mod_paren_on_return = add -mod_pawn_semicolon = false -mod_full_paren_if_bool = false -cmt_cpp_group = false -cmt_cpp_nl_start = false -cmt_cpp_nl_end = false -cmt_cpp_to_c = false -cmt_star_cont = true -cmt_sp_before_star_cont = 0 -cmt_sp_after_star_cont = 0 -pp_indent = remove -pp_space = remove -sp_after_dc = remove -sp_before_dc = remove -sp_attribute_paren = remove -sp_defined_paren = force +sp_macro_func = ignore +sp_else_brace = ignore +sp_brace_else = ignore +sp_catch_brace = ignore +sp_brace_catch = ignore +sp_finally_brace = ignore +sp_brace_finally = ignore +sp_try_brace = ignore +sp_getset_brace = ignore +align_keep_tabs = false +align_with_tabs = false +align_on_tabstop = false +align_number_right = true +align_func_params = true +align_var_def_span = 2 +align_var_def_star_style = 1 +align_var_def_thresh = 0 +align_var_def_colon = true +align_var_def_inline = true +align_assign_span = 1 +align_assign_thresh = 0 +align_enum_equ_span = 4 +align_enum_equ_thresh = 0 +align_var_struct_span = 3 +align_struct_init_span = 3 +align_typedef_gap = 3 +align_typedef_span = 5 +align_typedef_star_style = 0 +align_right_cmt_span = 3 +align_func_proto_span = 0 +align_nl_cont = true +align_pp_define_gap = 4 +align_pp_define_span = 3 +code_width = 0 +nl_collapse_empty_body = false +nl_class_leave_one_liners = true +nl_assign_leave_one_liners = true +nl_start_of_file = ignore +nl_start_of_file_min = 0 +nl_end_of_file = ignore +nl_end_of_file_min = 0 +nl_assign_brace = add +nl_func_var_def_blk = 1 +nl_fcall_brace = add +nl_enum_brace = add +nl_struct_brace = add +nl_union_brace = add +nl_if_brace = add +nl_brace_else = add +nl_elseif_brace = ignore +nl_else_brace = add +nl_brace_finally = ignore +nl_finally_brace = add +nl_try_brace = add +nl_getset_brace = ignore +nl_for_brace = add +nl_catch_brace = add +nl_brace_catch = ignore +nl_while_brace = add +nl_do_brace = add +nl_brace_while = remove +nl_switch_brace = add +nl_before_case = true +nl_after_case = false +nl_namespace_brace = ignore +nl_template_class = ignore +nl_class_brace = ignore +nl_class_init_args = ignore +nl_func_type_name = ignore +nl_func_decl_start = ignore +nl_func_decl_args = ignore +nl_func_decl_end = ignore +nl_fdef_brace = add +nl_cpp_ldef_brace = remove +nl_after_return = true +nl_after_semicolon = true +nl_after_brace_open = true +nl_after_vbrace_open = true +nl_after_access_spec = 1 +nl_assign_leave_one_liners = true +nl_class_leave_one_liners = true +nl_enum_leave_one_liners = true +nl_getset_leave_one_liners = true +nl_cpp_lambda_leave_one_liners = true +nl_define_macro = false +nl_squeeze_ifdef = true +nl_before_if = ignore +nl_after_if = ignore +nl_before_for = ignore +nl_after_for = ignore +nl_before_while = ignore +nl_after_while = ignore +nl_before_switch = ignore +nl_after_switch = ignore +nl_before_do = ignore +nl_after_do = ignore +nl_ds_struct_enum_cmt = false +pos_bool = ignore +pos_class_colon = ignore +ls_for_split_full = false +ls_func_split_full = false +nl_max = 0 +nl_after_func_proto = 0 +nl_after_func_proto_group = 0 +nl_after_func_body = 0 +nl_after_func_body_one_liner = 0 +nl_before_block_comment = 0 +nl_before_c_comment = 0 +nl_before_cpp_comment = 0 +eat_blanks_after_open_brace = true +eat_blanks_before_close_brace = true +mod_full_brace_do = add +mod_full_brace_for = add +mod_full_brace_function = ignore +mod_full_brace_if = add +mod_full_brace_nl = 0 +mod_full_brace_while = add +mod_paren_on_return = add +mod_pawn_semicolon = false +mod_full_paren_if_bool = false +cmt_cpp_group = false +cmt_cpp_nl_start = false +cmt_cpp_nl_end = false +cmt_cpp_to_c = false +cmt_star_cont = true +cmt_sp_before_star_cont = 0 +cmt_sp_after_star_cont = 0 +pp_indent = remove +pp_space = remove +sp_after_dc = remove +sp_before_dc = remove +sp_attribute_paren = remove +sp_defined_paren = force mod_add_long_function_closebrace_comment = 40 -mod_add_long_switch_closebrace_comment = 40 -mod_remove_extra_semicolon = TRUE +mod_add_long_switch_closebrace_comment = 40 +mod_remove_extra_semicolon = TRUE -sp_brace_typedef = force -nl_after_brace_close = false -sp_before_ellipsis = remove -tok_split_gte = true +sp_brace_typedef = force +nl_after_brace_close = false +sp_before_ellipsis = remove +tok_split_gte = true -sp_cpp_lambda_assign = remove -sp_cpp_lambda_paren = force +sp_cpp_lambda_assign = remove +sp_cpp_lambda_paren = force diff --git a/tests/config/lambda2.cfg b/tests/config/lambda2.cfg index fdd55b85d1..a9ab109b2b 100644 --- a/tests/config/lambda2.cfg +++ b/tests/config/lambda2.cfg @@ -1,223 +1,223 @@ -newlines = auto -input_tab_size = 8 -output_tab_size = 3 -string_escape_char = 92 -indent_columns = 3 -indent_with_tabs = 0 -indent_align_string = false -indent_xml_string = 0 -indent_brace = 0 -indent_braces = false -indent_braces_no_func = false -indent_brace_parent = false -indent_namespace = false -indent_class = true -indent_class_colon = false -indent_func_call_param = false -indent_member = 3 -indent_sing_line_comments = 0 -indent_switch_case = 0 -indent_case_brace = 0 -indent_col1_comment = false -indent_label = 2 -indent_access_spec = 2 -indent_paren_nl = false -indent_square_nl = false -sp_arith = force -sp_assign = force -sp_assign_default = remove -sp_bool = force -sp_compare = force -sp_inside_paren = remove -sp_paren_paren = remove -sp_balance_nested_parens = false -sp_paren_brace = ignore -sp_before_ptr_star = force -sp_between_ptr_star = remove -sp_after_ptr_star = remove -sp_before_byref = remove -sp_after_byref = ignore -sp_before_angle = remove -sp_after_angle = force -sp_angle_paren = remove -sp_angle_paren_empty = remove -sp_angle_word = force -sp_before_sparen = force -sp_inside_sparen = remove -sp_after_sparen = force -sp_sparen_brace = ignore -sp_special_semi = ignore -sp_before_semi = remove -sp_before_semi_for = ignore -sp_before_square = ignore -sp_before_squares = ignore -sp_inside_square = remove -sp_after_comma = force -sp_before_comma = remove -sp_after_operator = ignore -sp_after_cast = remove -sp_sizeof_paren = remove -sp_after_tag = ignore -sp_inside_braces_enum = force -sp_inside_braces_struct = force -sp_inside_braces = force -sp_inside_angle = remove -sp_type_func = ignore -sp_func_proto_paren = remove -sp_func_def_paren = remove -sp_inside_fparens = ignore -sp_inside_fparen = remove -sp_square_fparen = ignore -sp_fparen_brace = ignore -sp_func_call_paren = remove -sp_func_class_paren = ignore -sp_return_paren = remove -sp_macro = ignore -sp_before_semi_for_empty = force +newlines = auto +input_tab_size = 8 +output_tab_size = 3 +string_escape_char = 92 +indent_columns = 3 +indent_with_tabs = 0 +indent_align_string = false +indent_xml_string = 0 +indent_brace = 0 +indent_braces = false +indent_braces_no_func = false +indent_brace_parent = false +indent_namespace = false +indent_class = true +indent_class_colon = false +indent_func_call_param = false +indent_member = 3 +indent_sing_line_comments = 0 +indent_switch_case = 0 +indent_case_brace = 0 +indent_col1_comment = false +indent_label = 2 +indent_access_spec = 2 +indent_paren_nl = false +indent_square_nl = false +sp_arith = force +sp_assign = force +sp_assign_default = remove +sp_bool = force +sp_compare = force +sp_inside_paren = remove +sp_paren_paren = remove +sp_balance_nested_parens = false +sp_paren_brace = ignore +sp_before_ptr_star = force +sp_between_ptr_star = remove +sp_after_ptr_star = remove +sp_before_byref = remove +sp_after_byref = ignore +sp_before_angle = remove +sp_after_angle = force +sp_angle_paren = remove +sp_angle_paren_empty = remove +sp_angle_word = force +sp_before_sparen = force +sp_inside_sparen = remove +sp_after_sparen = force +sp_sparen_brace = ignore +sp_special_semi = ignore +sp_before_semi = remove +sp_before_semi_for = ignore +sp_before_square = ignore +sp_before_squares = ignore +sp_inside_square = remove +sp_after_comma = force +sp_before_comma = remove +sp_after_operator = ignore +sp_after_cast = remove +sp_sizeof_paren = remove +sp_after_tag = ignore +sp_inside_braces_enum = force +sp_inside_braces_struct = force +sp_inside_braces = force +sp_inside_angle = remove +sp_type_func = ignore +sp_func_proto_paren = remove +sp_func_def_paren = remove +sp_inside_fparens = ignore +sp_inside_fparen = remove +sp_square_fparen = ignore +sp_fparen_brace = ignore +sp_func_call_paren = remove +sp_func_class_paren = ignore +sp_return_paren = remove +sp_macro = ignore +sp_before_semi_for_empty = force -sp_macro_func = ignore -sp_else_brace = ignore -sp_brace_else = ignore -sp_catch_brace = ignore -sp_brace_catch = ignore -sp_finally_brace = ignore -sp_brace_finally = ignore -sp_try_brace = ignore -sp_getset_brace = ignore -align_keep_tabs = false -align_with_tabs = false -align_on_tabstop = false +sp_macro_func = ignore +sp_else_brace = ignore +sp_brace_else = ignore +sp_catch_brace = ignore +sp_brace_catch = ignore +sp_finally_brace = ignore +sp_brace_finally = ignore +sp_try_brace = ignore +sp_getset_brace = ignore +align_keep_tabs = false +align_with_tabs = false +align_on_tabstop = false align_number_right = true -align_func_params = true -align_var_def_span = 2 -align_var_def_star_style = 1 -align_var_def_thresh = 0 -align_var_def_colon = true -align_var_def_inline = true -align_assign_span = 1 -align_assign_thresh = 0 -align_enum_equ_span = 4 -align_enum_equ_thresh = 0 -align_var_struct_span = 3 -align_struct_init_span = 3 -align_typedef_gap = 3 -align_typedef_span = 5 -align_typedef_star_style = 0 -align_right_cmt_span = 3 -align_func_proto_span = 0 -align_nl_cont = true -align_pp_define_gap = 4 -align_pp_define_span = 3 -code_width = 0 -nl_collapse_empty_body = false -nl_class_leave_one_liners = true -nl_assign_leave_one_liners = true -nl_start_of_file = ignore -nl_start_of_file_min = 0 -nl_end_of_file = ignore -nl_end_of_file_min = 0 -nl_assign_brace = add -nl_func_var_def_blk = 1 -nl_fcall_brace = add -nl_enum_brace = add -nl_struct_brace = add -nl_union_brace = add -nl_if_brace = add -nl_brace_else = add -nl_elseif_brace = ignore -nl_else_brace = add -nl_brace_finally = ignore -nl_finally_brace = add -nl_try_brace = add -nl_getset_brace = ignore -nl_for_brace = add -nl_catch_brace = add -nl_brace_catch = ignore -nl_while_brace = add -nl_do_brace = add -nl_brace_while = remove -nl_switch_brace = add -nl_before_case = true -nl_after_case = false -nl_namespace_brace = ignore -nl_template_class = ignore -nl_class_brace = ignore -nl_class_init_args = ignore -nl_func_type_name = ignore -nl_func_decl_start = ignore -nl_func_decl_args = ignore -nl_func_decl_end = ignore -nl_fdef_brace = add -nl_brace_fparen = add -nl_cpp_ldef_brace = add -nl_after_return = true -nl_after_semicolon = true -nl_after_brace_open = true -nl_after_vbrace_open = true -nl_after_access_spec = 1 -nl_assign_leave_one_liners = true -nl_class_leave_one_liners = true -nl_enum_leave_one_liners = true -nl_getset_leave_one_liners = true -nl_cpp_lambda_leave_one_liners = false -nl_define_macro = false -nl_squeeze_ifdef = true -nl_before_if = ignore -nl_after_if = ignore -nl_before_for = ignore -nl_after_for = ignore -nl_before_while = ignore -nl_after_while = ignore -nl_before_switch = ignore -nl_after_switch = ignore -nl_before_do = ignore -nl_after_do = ignore -nl_ds_struct_enum_cmt = false -pos_bool = ignore -pos_class_colon = ignore -ls_for_split_full = false -ls_func_split_full = false -nl_max = 0 -nl_after_func_proto = 0 -nl_after_func_proto_group = 0 -nl_after_func_body = 0 -nl_after_func_body_one_liner = 0 -nl_before_block_comment = 0 -nl_before_c_comment = 0 -nl_before_cpp_comment = 0 -eat_blanks_after_open_brace = true -eat_blanks_before_close_brace = true -mod_full_brace_do = add -mod_full_brace_for = add -mod_full_brace_function = ignore -mod_full_brace_if = add -mod_full_brace_nl = 0 -mod_full_brace_while = add -mod_paren_on_return = add -mod_pawn_semicolon = false -mod_full_paren_if_bool = false -cmt_cpp_group = false -cmt_cpp_nl_start = false -cmt_cpp_nl_end = false -cmt_cpp_to_c = false -cmt_star_cont = true -cmt_sp_before_star_cont = 0 -cmt_sp_after_star_cont = 0 -pp_indent = remove -pp_space = remove -sp_after_dc = remove -sp_before_dc = remove -sp_attribute_paren = remove -sp_defined_paren = force +align_func_params = true +align_var_def_span = 2 +align_var_def_star_style = 1 +align_var_def_thresh = 0 +align_var_def_colon = true +align_var_def_inline = true +align_assign_span = 1 +align_assign_thresh = 0 +align_enum_equ_span = 4 +align_enum_equ_thresh = 0 +align_var_struct_span = 3 +align_struct_init_span = 3 +align_typedef_gap = 3 +align_typedef_span = 5 +align_typedef_star_style = 0 +align_right_cmt_span = 3 +align_func_proto_span = 0 +align_nl_cont = true +align_pp_define_gap = 4 +align_pp_define_span = 3 +code_width = 0 +nl_collapse_empty_body = false +nl_class_leave_one_liners = true +nl_assign_leave_one_liners = true +nl_start_of_file = ignore +nl_start_of_file_min = 0 +nl_end_of_file = ignore +nl_end_of_file_min = 0 +nl_assign_brace = add +nl_func_var_def_blk = 1 +nl_fcall_brace = add +nl_enum_brace = add +nl_struct_brace = add +nl_union_brace = add +nl_if_brace = add +nl_brace_else = add +nl_elseif_brace = ignore +nl_else_brace = add +nl_brace_finally = ignore +nl_finally_brace = add +nl_try_brace = add +nl_getset_brace = ignore +nl_for_brace = add +nl_catch_brace = add +nl_brace_catch = ignore +nl_while_brace = add +nl_do_brace = add +nl_brace_while = remove +nl_switch_brace = add +nl_before_case = true +nl_after_case = false +nl_namespace_brace = ignore +nl_template_class = ignore +nl_class_brace = ignore +nl_class_init_args = ignore +nl_func_type_name = ignore +nl_func_decl_start = ignore +nl_func_decl_args = ignore +nl_func_decl_end = ignore +nl_fdef_brace = add +nl_brace_fparen = add +nl_cpp_ldef_brace = add +nl_after_return = true +nl_after_semicolon = true +nl_after_brace_open = true +nl_after_vbrace_open = true +nl_after_access_spec = 1 +nl_assign_leave_one_liners = true +nl_class_leave_one_liners = true +nl_enum_leave_one_liners = true +nl_getset_leave_one_liners = true +nl_cpp_lambda_leave_one_liners = false +nl_define_macro = false +nl_squeeze_ifdef = true +nl_before_if = ignore +nl_after_if = ignore +nl_before_for = ignore +nl_after_for = ignore +nl_before_while = ignore +nl_after_while = ignore +nl_before_switch = ignore +nl_after_switch = ignore +nl_before_do = ignore +nl_after_do = ignore +nl_ds_struct_enum_cmt = false +pos_bool = ignore +pos_class_colon = ignore +ls_for_split_full = false +ls_func_split_full = false +nl_max = 0 +nl_after_func_proto = 0 +nl_after_func_proto_group = 0 +nl_after_func_body = 0 +nl_after_func_body_one_liner = 0 +nl_before_block_comment = 0 +nl_before_c_comment = 0 +nl_before_cpp_comment = 0 +eat_blanks_after_open_brace = true +eat_blanks_before_close_brace = true +mod_full_brace_do = add +mod_full_brace_for = add +mod_full_brace_function = ignore +mod_full_brace_if = add +mod_full_brace_nl = 0 +mod_full_brace_while = add +mod_paren_on_return = add +mod_pawn_semicolon = false +mod_full_paren_if_bool = false +cmt_cpp_group = false +cmt_cpp_nl_start = false +cmt_cpp_nl_end = false +cmt_cpp_to_c = false +cmt_star_cont = true +cmt_sp_before_star_cont = 0 +cmt_sp_after_star_cont = 0 +pp_indent = remove +pp_space = remove +sp_after_dc = remove +sp_before_dc = remove +sp_attribute_paren = remove +sp_defined_paren = force -mod_add_long_function_closebrace_comment = 40 -mod_add_long_switch_closebrace_comment = 40 -mod_remove_extra_semicolon = TRUE +mod_add_long_function_closebrace_comment = 40 +mod_add_long_switch_closebrace_comment = 40 +mod_remove_extra_semicolon = TRUE -sp_brace_typedef = force -nl_after_brace_close = TRUE -sp_before_ellipsis = remove -tok_split_gte = true +sp_brace_typedef = force +nl_after_brace_close = TRUE +sp_before_ellipsis = remove +tok_split_gte = true -sp_cpp_lambda_assign = remove -sp_cpp_lambda_paren = force +sp_cpp_lambda_assign = remove +sp_cpp_lambda_paren = force diff --git a/tests/config/lambda3.cfg b/tests/config/lambda3.cfg index cb0cfbdd70..b62f12972f 100644 --- a/tests/config/lambda3.cfg +++ b/tests/config/lambda3.cfg @@ -1,223 +1,223 @@ -newlines = auto -input_tab_size = 8 -output_tab_size = 3 -string_escape_char = 92 -indent_columns = 3 -indent_with_tabs = 0 -indent_align_string = false -indent_xml_string = 0 -indent_brace = 0 -indent_braces = false -indent_braces_no_func = false -indent_brace_parent = false -indent_namespace = false -indent_class = true -indent_class_colon = false -indent_func_call_param = false -indent_member = 3 -indent_sing_line_comments = 0 -indent_switch_case = 0 -indent_case_brace = 0 -indent_col1_comment = false -indent_label = 2 -indent_access_spec = 2 -indent_paren_nl = false -indent_square_nl = false -indent_cpp_lambda_body = true -sp_arith = force -sp_assign = force -sp_assign_default = remove -sp_bool = force -sp_compare = force -sp_inside_paren = remove -sp_paren_paren = remove -sp_balance_nested_parens = false -sp_paren_brace = ignore -sp_before_ptr_star = force -sp_between_ptr_star = remove -sp_after_ptr_star = remove -sp_before_byref = remove -sp_after_byref = ignore -sp_before_angle = remove -sp_after_angle = force -sp_angle_paren = remove -sp_angle_paren_empty = remove -sp_angle_word = force -sp_before_sparen = force -sp_inside_sparen = remove -sp_after_sparen = force -sp_sparen_brace = ignore -sp_special_semi = ignore -sp_before_semi = remove -sp_before_semi_for = ignore -sp_before_square = ignore -sp_before_squares = ignore -sp_inside_square = remove -sp_after_comma = force -sp_before_comma = remove -sp_after_operator = ignore -sp_after_cast = remove -sp_sizeof_paren = remove -sp_after_tag = ignore -sp_inside_braces_enum = force -sp_inside_braces_struct = force -sp_inside_braces = force -sp_inside_angle = remove -sp_type_func = ignore -sp_func_proto_paren = remove -sp_func_def_paren = remove -sp_inside_fparens = ignore -sp_inside_fparen = remove -sp_square_fparen = ignore -sp_fparen_brace = force -sp_func_call_paren = remove -sp_func_class_paren = ignore -sp_return_paren = remove -sp_macro = ignore -sp_before_semi_for_empty = force +newlines = auto +input_tab_size = 8 +output_tab_size = 3 +string_escape_char = 92 +indent_columns = 3 +indent_with_tabs = 0 +indent_align_string = false +indent_xml_string = 0 +indent_brace = 0 +indent_braces = false +indent_braces_no_func = false +indent_brace_parent = false +indent_namespace = false +indent_class = true +indent_class_colon = false +indent_func_call_param = false +indent_member = 3 +indent_sing_line_comments = 0 +indent_switch_case = 0 +indent_case_brace = 0 +indent_col1_comment = false +indent_label = 2 +indent_access_spec = 2 +indent_paren_nl = false +indent_square_nl = false +indent_cpp_lambda_body = true +sp_arith = force +sp_assign = force +sp_assign_default = remove +sp_bool = force +sp_compare = force +sp_inside_paren = remove +sp_paren_paren = remove +sp_balance_nested_parens = false +sp_paren_brace = ignore +sp_before_ptr_star = force +sp_between_ptr_star = remove +sp_after_ptr_star = remove +sp_before_byref = remove +sp_after_byref = ignore +sp_before_angle = remove +sp_after_angle = force +sp_angle_paren = remove +sp_angle_paren_empty = remove +sp_angle_word = force +sp_before_sparen = force +sp_inside_sparen = remove +sp_after_sparen = force +sp_sparen_brace = ignore +sp_special_semi = ignore +sp_before_semi = remove +sp_before_semi_for = ignore +sp_before_square = ignore +sp_before_squares = ignore +sp_inside_square = remove +sp_after_comma = force +sp_before_comma = remove +sp_after_operator = ignore +sp_after_cast = remove +sp_sizeof_paren = remove +sp_after_tag = ignore +sp_inside_braces_enum = force +sp_inside_braces_struct = force +sp_inside_braces = force +sp_inside_angle = remove +sp_type_func = ignore +sp_func_proto_paren = remove +sp_func_def_paren = remove +sp_inside_fparens = ignore +sp_inside_fparen = remove +sp_square_fparen = ignore +sp_fparen_brace = force +sp_func_call_paren = remove +sp_func_class_paren = ignore +sp_return_paren = remove +sp_macro = ignore +sp_before_semi_for_empty = force -sp_macro_func = ignore -sp_else_brace = ignore -sp_brace_else = ignore -sp_catch_brace = ignore -sp_brace_catch = ignore -sp_finally_brace = ignore -sp_brace_finally = ignore -sp_try_brace = ignore -sp_getset_brace = ignore -align_keep_tabs = false -align_with_tabs = false -align_on_tabstop = false -align_number_right = true -align_func_params = true -align_var_def_span = 2 -align_var_def_star_style = 1 -align_var_def_thresh = 0 -align_var_def_colon = true -align_var_def_inline = true -align_assign_span = 1 -align_assign_thresh = 0 -align_enum_equ_span = 4 -align_enum_equ_thresh = 0 -align_var_struct_span = 3 -align_struct_init_span = 3 -align_typedef_gap = 3 -align_typedef_span = 5 -align_typedef_star_style = 0 -align_right_cmt_span = 3 -align_func_proto_span = 0 -align_nl_cont = true -align_pp_define_gap = 4 -align_pp_define_span = 3 -code_width = 0 -nl_collapse_empty_body = false -nl_class_leave_one_liners = true -nl_assign_leave_one_liners = true -nl_start_of_file = ignore -nl_start_of_file_min = 0 -nl_end_of_file = ignore -nl_end_of_file_min = 0 -nl_assign_brace = add -nl_func_var_def_blk = 1 -nl_fcall_brace = add -nl_enum_brace = add -nl_struct_brace = add -nl_union_brace = add -nl_if_brace = add -nl_brace_else = add -nl_elseif_brace = ignore -nl_else_brace = add -nl_brace_finally = ignore -nl_finally_brace = add -nl_try_brace = add -nl_getset_brace = ignore -nl_for_brace = add -nl_catch_brace = add -nl_brace_catch = ignore -nl_while_brace = add -nl_do_brace = add -nl_brace_while = remove -nl_switch_brace = add -nl_before_case = true -nl_after_case = false -nl_namespace_brace = ignore -nl_template_class = ignore -nl_class_brace = ignore -nl_class_init_args = ignore -nl_func_type_name = ignore -nl_func_decl_start = ignore -nl_func_decl_args = ignore -nl_func_decl_end = ignore -nl_fdef_brace = add -nl_cpp_ldef_brace = remove -nl_after_return = true -nl_after_semicolon = true -nl_after_brace_open = true -nl_after_vbrace_open = true -nl_after_access_spec = 1 -nl_assign_leave_one_liners = true -nl_class_leave_one_liners = true -nl_enum_leave_one_liners = true -nl_getset_leave_one_liners = true -nl_cpp_lambda_leave_one_liners= true -nl_define_macro = false -nl_squeeze_ifdef = true -nl_before_if = ignore -nl_after_if = ignore -nl_before_for = ignore -nl_after_for = ignore -nl_before_while = ignore -nl_after_while = ignore -nl_before_switch = ignore -nl_after_switch = ignore -nl_before_do = ignore -nl_after_do = ignore -nl_ds_struct_enum_cmt = false -pos_bool = ignore -pos_class_colon = ignore -ls_for_split_full = false -ls_func_split_full = false -nl_max = 0 -nl_after_func_proto = 0 -nl_after_func_proto_group = 0 -nl_after_func_body = 0 -nl_after_func_body_one_liner = 0 -nl_before_block_comment = 0 -nl_before_c_comment = 0 -nl_before_cpp_comment = 0 -eat_blanks_after_open_brace = true -eat_blanks_before_close_brace = true -mod_full_brace_do = add -mod_full_brace_for = add -mod_full_brace_function = ignore -mod_full_brace_if = add -mod_full_brace_nl = 0 -mod_full_brace_while = add -mod_paren_on_return = add -mod_pawn_semicolon = false -mod_full_paren_if_bool = false -cmt_cpp_group = false -cmt_cpp_nl_start = false -cmt_cpp_nl_end = false -cmt_cpp_to_c = false -cmt_star_cont = true -cmt_sp_before_star_cont = 0 -cmt_sp_after_star_cont = 0 -pp_indent = remove -pp_space = remove -sp_after_dc = remove -sp_before_dc = remove -sp_attribute_paren = remove -sp_defined_paren = force +sp_macro_func = ignore +sp_else_brace = ignore +sp_brace_else = ignore +sp_catch_brace = ignore +sp_brace_catch = ignore +sp_finally_brace = ignore +sp_brace_finally = ignore +sp_try_brace = ignore +sp_getset_brace = ignore +align_keep_tabs = false +align_with_tabs = false +align_on_tabstop = false +align_number_right = true +align_func_params = true +align_var_def_span = 2 +align_var_def_star_style = 1 +align_var_def_thresh = 0 +align_var_def_colon = true +align_var_def_inline = true +align_assign_span = 1 +align_assign_thresh = 0 +align_enum_equ_span = 4 +align_enum_equ_thresh = 0 +align_var_struct_span = 3 +align_struct_init_span = 3 +align_typedef_gap = 3 +align_typedef_span = 5 +align_typedef_star_style = 0 +align_right_cmt_span = 3 +align_func_proto_span = 0 +align_nl_cont = true +align_pp_define_gap = 4 +align_pp_define_span = 3 +code_width = 0 +nl_collapse_empty_body = false +nl_class_leave_one_liners = true +nl_assign_leave_one_liners = true +nl_start_of_file = ignore +nl_start_of_file_min = 0 +nl_end_of_file = ignore +nl_end_of_file_min = 0 +nl_assign_brace = add +nl_func_var_def_blk = 1 +nl_fcall_brace = add +nl_enum_brace = add +nl_struct_brace = add +nl_union_brace = add +nl_if_brace = add +nl_brace_else = add +nl_elseif_brace = ignore +nl_else_brace = add +nl_brace_finally = ignore +nl_finally_brace = add +nl_try_brace = add +nl_getset_brace = ignore +nl_for_brace = add +nl_catch_brace = add +nl_brace_catch = ignore +nl_while_brace = add +nl_do_brace = add +nl_brace_while = remove +nl_switch_brace = add +nl_before_case = true +nl_after_case = false +nl_namespace_brace = ignore +nl_template_class = ignore +nl_class_brace = ignore +nl_class_init_args = ignore +nl_func_type_name = ignore +nl_func_decl_start = ignore +nl_func_decl_args = ignore +nl_func_decl_end = ignore +nl_fdef_brace = add +nl_cpp_ldef_brace = remove +nl_after_return = true +nl_after_semicolon = true +nl_after_brace_open = true +nl_after_vbrace_open = true +nl_after_access_spec = 1 +nl_assign_leave_one_liners = true +nl_class_leave_one_liners = true +nl_enum_leave_one_liners = true +nl_getset_leave_one_liners = true +nl_cpp_lambda_leave_one_liners = true +nl_define_macro = false +nl_squeeze_ifdef = true +nl_before_if = ignore +nl_after_if = ignore +nl_before_for = ignore +nl_after_for = ignore +nl_before_while = ignore +nl_after_while = ignore +nl_before_switch = ignore +nl_after_switch = ignore +nl_before_do = ignore +nl_after_do = ignore +nl_ds_struct_enum_cmt = false +pos_bool = ignore +pos_class_colon = ignore +ls_for_split_full = false +ls_func_split_full = false +nl_max = 0 +nl_after_func_proto = 0 +nl_after_func_proto_group = 0 +nl_after_func_body = 0 +nl_after_func_body_one_liner = 0 +nl_before_block_comment = 0 +nl_before_c_comment = 0 +nl_before_cpp_comment = 0 +eat_blanks_after_open_brace = true +eat_blanks_before_close_brace = true +mod_full_brace_do = add +mod_full_brace_for = add +mod_full_brace_function = ignore +mod_full_brace_if = add +mod_full_brace_nl = 0 +mod_full_brace_while = add +mod_paren_on_return = add +mod_pawn_semicolon = false +mod_full_paren_if_bool = false +cmt_cpp_group = false +cmt_cpp_nl_start = false +cmt_cpp_nl_end = false +cmt_cpp_to_c = false +cmt_star_cont = true +cmt_sp_before_star_cont = 0 +cmt_sp_after_star_cont = 0 +pp_indent = remove +pp_space = remove +sp_after_dc = remove +sp_before_dc = remove +sp_attribute_paren = remove +sp_defined_paren = force mod_add_long_function_closebrace_comment = 40 -mod_add_long_switch_closebrace_comment = 40 -mod_remove_extra_semicolon = TRUE +mod_add_long_switch_closebrace_comment = 40 +mod_remove_extra_semicolon = TRUE -sp_brace_typedef = force -nl_after_brace_close = false -sp_before_ellipsis = remove -tok_split_gte = true +sp_brace_typedef = force +nl_after_brace_close = false +sp_before_ellipsis = remove +tok_split_gte = true -sp_cpp_lambda_assign = remove -sp_cpp_lambda_paren = force +sp_cpp_lambda_assign = remove +sp_cpp_lambda_paren = force diff --git a/tests/config/libd.cfg b/tests/config/libd.cfg index 662818d9af..04e5450072 100644 --- a/tests/config/libd.cfg +++ b/tests/config/libd.cfg @@ -1,197 +1,197 @@ -tok_split_gte=false -utf8_byte=false -utf8_force=false -indent_continue=4 -indent_cmt_with_tabs=true -indent_align_string=true -indent_braces=false -indent_braces_no_func=false -indent_braces_no_class=false -indent_braces_no_struct=false -indent_brace_parent=false -indent_namespace=true -indent_extern=false -indent_class=true -indent_class_colon=false -indent_else_if=false -indent_var_def_cont=true -indent_func_call_param=true -indent_func_def_param=false -indent_func_proto_param=false -indent_func_class_param=false -indent_func_ctor_var_param=false -indent_template_param=false -indent_func_param_double=false -indent_relative_single_line_comments=false -indent_col1_comment=false -indent_access_spec_body=false -indent_paren_nl=true -indent_paren_open_brace=true -indent_comma_paren=false -indent_bool_paren=false -indent_first_bool_expr=false -indent_square_nl=false -indent_preserve_sql=false -indent_align_assign=true -sp_balance_nested_parens=false -align_keep_tabs=false -align_with_tabs=false -align_on_tabstop=false -align_number_right=false -align_func_params=false -align_same_func_call_params=false -align_var_def_colon=false -align_var_def_attribute=false -align_var_def_inline=false -align_right_cmt_mix=false -align_on_operator=false -align_mix_var_proto=false -align_single_line_func=false -align_single_line_brace=false -align_nl_cont=false -align_left_shift=false -align_oc_decl_colon=false -nl_collapse_empty_body=true -nl_assign_leave_one_liners=true -nl_class_leave_one_liners=true -nl_enum_leave_one_liners=true -nl_getset_leave_one_liners=false -nl_func_leave_one_liners=true -nl_if_leave_one_liners=true -nl_multi_line_cond=false -nl_multi_line_define=false -nl_before_case=false -nl_after_case=true -nl_after_switch=remove -nl_after_return=false -nl_after_semicolon=true -nl_after_brace_open=true -nl_after_brace_open_cmt=false -nl_after_vbrace_open=true -nl_after_vbrace_open_empty=true -nl_after_brace_close=false -nl_after_vbrace_close=false -nl_define_macro=false -nl_squeeze_ifdef=false -nl_ds_struct_enum_cmt=false -nl_ds_struct_enum_close_brace=false -nl_create_if_one_liner=false -nl_create_for_one_liner=false -nl_create_while_one_liner=false -ls_for_split_full=true -ls_func_split_full=true -nl_after_multiline_comment=false -eat_blanks_after_open_brace=true -eat_blanks_before_close_brace=true -mod_full_brace_if_chain=false -mod_pawn_semicolon=false -mod_full_paren_if_bool=false -mod_remove_extra_semicolon=false -mod_sort_import=true -mod_sort_using=false -mod_sort_include=false -mod_move_case_break=false -mod_remove_empty_return=false -cmt_indent_multi=false -cmt_c_group=false -cmt_c_nl_start=false -cmt_c_nl_end=false -cmt_cpp_group=false -cmt_cpp_nl_start=false -cmt_cpp_nl_end=false -cmt_cpp_to_c=false -cmt_star_cont=false -cmt_multi_check_last=false -cmt_insert_before_preproc=false -pp_indent_at_level=false -pp_region_indent_code=false -pp_if_indent_code=false -pp_define_at_level=false -input_tab_size=4 -output_tab_size=4 -indent_columns=4 -indent_switch_case=4 -indent_label=0 -indent_access_spec=-4 -indent_paren_close=0 -nl_end_of_file_min=2 -nl_max=2 -nl_after_struct=2 -nl_after_class=2 -indent_with_tabs=1 -sp_arith=add -sp_assign=add -sp_compare=add -sp_inside_paren=remove -sp_paren_paren=remove -sp_paren_brace=add -sp_before_sparen=add -sp_inside_sparen=remove -sp_after_sparen=add -sp_sparen_brace=add -sp_before_semi_for=remove -sp_after_semi_for=add -sp_after_semi_for_empty=add -sp_after_comma=add -sp_before_comma=remove -sp_before_ellipsis=remove -sp_after_class_colon=add -sp_before_class_colon=add -sp_after_cast=add -sp_sizeof_paren=remove -sp_type_func=add -sp_func_proto_paren=remove -sp_func_def_paren=remove -sp_inside_fparens=remove -sp_inside_fparen=remove -sp_square_fparen=remove -sp_fparen_brace=add -sp_func_call_paren=remove -sp_func_class_paren=add -sp_return_paren=add -sp_throw_paren=add -sp_catch_paren=add -sp_version_paren=add -sp_scope_paren=add -sp_else_brace=add -sp_brace_else=add -sp_catch_brace=add -sp_brace_catch=add -sp_finally_brace=add -sp_brace_finally=add -sp_try_brace=add -sp_not=remove -sp_inv=add -sp_member=remove -sp_cond_colon=add -sp_cond_question=add -sp_case_label=add -sp_before_case_colon=add -nl_start_of_file=remove -nl_end_of_file=add -nl_enum_brace=remove -nl_struct_brace=remove -nl_union_brace=remove -nl_if_brace=remove -nl_brace_else=remove -nl_elseif_brace=remove -nl_else_brace=remove -nl_else_if=remove -nl_brace_finally=remove -nl_finally_brace=remove -nl_try_brace=remove -nl_for_brace=remove -nl_catch_brace=remove -nl_brace_catch=remove -nl_while_brace=remove -nl_brace_brace=add -nl_do_brace=remove -nl_brace_while=remove -nl_switch_brace=remove -nl_namespace_brace=remove -nl_template_class=remove -nl_class_brace=remove -nl_func_scope_name=remove -nl_fdef_brace=remove -nl_fcall_brace=remove # "foo() {" vs "foo()\n{" +tok_split_gte = false +utf8_byte = false +utf8_force = false +indent_continue = 4 +indent_cmt_with_tabs = true +indent_align_string = true +indent_braces = false +indent_braces_no_func = false +indent_braces_no_class = false +indent_braces_no_struct = false +indent_brace_parent = false +indent_namespace = true +indent_extern = false +indent_class = true +indent_class_colon = false +indent_else_if = false +indent_var_def_cont = true +indent_func_call_param = true +indent_func_def_param = false +indent_func_proto_param = false +indent_func_class_param = false +indent_func_ctor_var_param = false +indent_template_param = false +indent_func_param_double = false +indent_relative_single_line_comments = false +indent_col1_comment = false +indent_access_spec_body = false +indent_paren_nl = true +indent_paren_open_brace = true +indent_comma_paren = false +indent_bool_paren = false +indent_first_bool_expr = false +indent_square_nl = false +indent_preserve_sql = false +indent_align_assign = true +sp_balance_nested_parens = false +align_keep_tabs = false +align_with_tabs = false +align_on_tabstop = false +align_number_right = false +align_func_params = false +align_same_func_call_params = false +align_var_def_colon = false +align_var_def_attribute = false +align_var_def_inline = false +align_right_cmt_mix = false +align_on_operator = false +align_mix_var_proto = false +align_single_line_func = false +align_single_line_brace = false +align_nl_cont = false +align_left_shift = false +align_oc_decl_colon = false +nl_collapse_empty_body = true +nl_assign_leave_one_liners = true +nl_class_leave_one_liners = true +nl_enum_leave_one_liners = true +nl_getset_leave_one_liners = false +nl_func_leave_one_liners = true +nl_if_leave_one_liners = true +nl_multi_line_cond = false +nl_multi_line_define = false +nl_before_case = false +nl_after_case = true +nl_after_switch = remove +nl_after_return = false +nl_after_semicolon = true +nl_after_brace_open = true +nl_after_brace_open_cmt = false +nl_after_vbrace_open = true +nl_after_vbrace_open_empty = true +nl_after_brace_close = false +nl_after_vbrace_close = false +nl_define_macro = false +nl_squeeze_ifdef = false +nl_ds_struct_enum_cmt = false +nl_ds_struct_enum_close_brace = false +nl_create_if_one_liner = false +nl_create_for_one_liner = false +nl_create_while_one_liner = false +ls_for_split_full = true +ls_func_split_full = true +nl_after_multiline_comment = false +eat_blanks_after_open_brace = true +eat_blanks_before_close_brace = true +mod_full_brace_if_chain = false +mod_pawn_semicolon = false +mod_full_paren_if_bool = false +mod_remove_extra_semicolon = false +mod_sort_import = true +mod_sort_using = false +mod_sort_include = false +mod_move_case_break = false +mod_remove_empty_return = false +cmt_indent_multi = false +cmt_c_group = false +cmt_c_nl_start = false +cmt_c_nl_end = false +cmt_cpp_group = false +cmt_cpp_nl_start = false +cmt_cpp_nl_end = false +cmt_cpp_to_c = false +cmt_star_cont = false +cmt_multi_check_last = false +cmt_insert_before_preproc = false +pp_indent_at_level = false +pp_region_indent_code = false +pp_if_indent_code = false +pp_define_at_level = false +input_tab_size = 4 +output_tab_size = 4 +indent_columns = 4 +indent_switch_case = 4 +indent_label = 0 +indent_access_spec = -4 +indent_paren_close = 0 +nl_end_of_file_min = 2 +nl_max = 2 +nl_after_struct = 2 +nl_after_class = 2 +indent_with_tabs = 1 +sp_arith = add +sp_assign = add +sp_compare = add +sp_inside_paren = remove +sp_paren_paren = remove +sp_paren_brace = add +sp_before_sparen = add +sp_inside_sparen = remove +sp_after_sparen = add +sp_sparen_brace = add +sp_before_semi_for = remove +sp_after_semi_for = add +sp_after_semi_for_empty = add +sp_after_comma = add +sp_before_comma = remove +sp_before_ellipsis = remove +sp_after_class_colon = add +sp_before_class_colon = add +sp_after_cast = add +sp_sizeof_paren = remove +sp_type_func = add +sp_func_proto_paren = remove +sp_func_def_paren = remove +sp_inside_fparens = remove +sp_inside_fparen = remove +sp_square_fparen = remove +sp_fparen_brace = add +sp_func_call_paren = remove +sp_func_class_paren = add +sp_return_paren = add +sp_throw_paren = add +sp_catch_paren = add +sp_version_paren = add +sp_scope_paren = add +sp_else_brace = add +sp_brace_else = add +sp_catch_brace = add +sp_brace_catch = add +sp_finally_brace = add +sp_brace_finally = add +sp_try_brace = add +sp_not = remove +sp_inv = add +sp_member = remove +sp_cond_colon = add +sp_cond_question = add +sp_case_label = add +sp_before_case_colon = add +nl_start_of_file = remove +nl_end_of_file = add +nl_enum_brace = remove +nl_struct_brace = remove +nl_union_brace = remove +nl_if_brace = remove +nl_brace_else = remove +nl_elseif_brace = remove +nl_else_brace = remove +nl_else_if = remove +nl_brace_finally = remove +nl_finally_brace = remove +nl_try_brace = remove +nl_for_brace = remove +nl_catch_brace = remove +nl_brace_catch = remove +nl_while_brace = remove +nl_brace_brace = add +nl_do_brace = remove +nl_brace_while = remove +nl_switch_brace = remove +nl_namespace_brace = remove +nl_template_class = remove +nl_class_brace = remove +nl_func_scope_name = remove +nl_fdef_brace = remove +nl_fcall_brace = remove # "foo() {" vs "foo()\n{" diff --git a/tests/config/long_br_cmt.cfg b/tests/config/long_br_cmt.cfg index b94d6f6500..2c0dc40013 100644 --- a/tests/config/long_br_cmt.cfg +++ b/tests/config/long_br_cmt.cfg @@ -1,7 +1,7 @@ -include "ben.cfg" +include "ben.cfg" -mod_add_long_function_closebrace_comment = 10 +mod_add_long_function_closebrace_comment = 10 mod_add_long_namespace_closebrace_comment = 10 -mod_add_long_class_closebrace_comment = 8 -mod_add_long_switch_closebrace_comment = 8 -indent_namespace = true +mod_add_long_class_closebrace_comment = 8 +mod_add_long_switch_closebrace_comment = 8 +indent_namespace = true diff --git a/tests/config/long_namespace.cfg b/tests/config/long_namespace.cfg index c6bdb3de1d..a4e66aafbf 100644 --- a/tests/config/long_namespace.cfg +++ b/tests/config/long_namespace.cfg @@ -1,2 +1,2 @@ -indent_namespace = true -indent_namespace_limit = 6 +indent_namespace = true +indent_namespace_limit = 6 diff --git a/tests/config/mda_space_a.cfg b/tests/config/mda_space_a.cfg index e8e202fa7a..326abc3f26 100644 --- a/tests/config/mda_space_a.cfg +++ b/tests/config/mda_space_a.cfg @@ -1,4 +1,4 @@ -sp_after_comma=add -sp_before_mdatype_commas = force -sp_between_mdatype_commas = force -sp_after_mdatype_commas = force +sp_after_comma = add +sp_before_mdatype_commas = force +sp_between_mdatype_commas = force +sp_after_mdatype_commas = force diff --git a/tests/config/mda_space_b.cfg b/tests/config/mda_space_b.cfg index e88c5b2249..e47e58fdc7 100644 --- a/tests/config/mda_space_b.cfg +++ b/tests/config/mda_space_b.cfg @@ -1,4 +1,4 @@ -sp_after_comma=add -sp_before_mdatype_commas = remove -sp_between_mdatype_commas = remove -sp_after_mdatype_commas = remove +sp_after_comma = add +sp_before_mdatype_commas = remove +sp_between_mdatype_commas = remove +sp_after_mdatype_commas = remove diff --git a/tests/config/mda_space_c.cfg b/tests/config/mda_space_c.cfg index 490f70575a..87271fdd57 100644 --- a/tests/config/mda_space_c.cfg +++ b/tests/config/mda_space_c.cfg @@ -1,4 +1,4 @@ -sp_after_comma=add -sp_before_mdatype_commas = remove -sp_between_mdatype_commas = force -sp_after_mdatype_commas = remove +sp_after_comma = add +sp_before_mdatype_commas = remove +sp_between_mdatype_commas = force +sp_after_mdatype_commas = remove diff --git a/tests/config/misc6.cfg b/tests/config/misc6.cfg index b27eea3c01..a182dc27e6 100644 --- a/tests/config/misc6.cfg +++ b/tests/config/misc6.cfg @@ -1,4 +1,4 @@ -sp_after_angle = remove -sp_before_ptr_star = force -sp_before_byref = force +sp_after_angle = remove +sp_before_ptr_star = force +sp_before_byref = force diff --git a/tests/config/mod-paren.cfg b/tests/config/mod-paren.cfg index d62f9f8695..55999aee8f 100644 --- a/tests/config/mod-paren.cfg +++ b/tests/config/mod-paren.cfg @@ -8,508 +8,508 @@ # # The type of line endings -newlines = lf # auto/lf/crlf/cr +newlines = lf # auto/lf/crlf/cr # The original size of tabs in the input -input_tab_size = 8 # number +input_tab_size = 8 # number # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 3 # number +output_tab_size = 3 # number # The ascii value of the string escape char, usually 92 (\). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # number # # Indenting # # The number of columns to indent per level (usually 2, 3, 4, or 8) -indent_columns = 3 # number +indent_columns = 3 # number # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # number # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # false/true # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # number # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # false/true # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # false/true # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # false/true # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # false/true # Whether to indent the stuff after a leading class colon -indent_class_colon = false # false/true +indent_class_colon = false # false/true # Whether to indent continued function call parameters one indent level (true) or aligns instead of indent (false) -indent_func_call_param = false # false/true +indent_func_call_param = false # false/true # The number of spaces to indent a continued '->' or '.' # Usually set to indent_columns. -indent_member = 3 # number +indent_member = 3 # number # Spaces to indent 'case' from 'switch' -indent_switch_case = 0 # number +indent_switch_case = 0 # number # Spaces to indent '{' from 'case' -indent_case_brace = 0 # number +indent_case_brace = 0 # number # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # false/true # How to indent goto labels (>0=absolute column where 1 is the leftmost column, <=0=subtract from brace indent) -indent_label = 1 # number +indent_label = 1 # number # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # false/true # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # false/true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # ignore/add/remove/force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # ignore/add/remove/force # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # ignore/add/remove/force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # ignore/add/remove/force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # ignore/add/remove/force # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # ignore/add/remove/force # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # ignore/add/remove/force # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # ignore/add/remove/force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # ignore/add/remove/force # Add or remove space after pointer star '*' -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # ignore/add/remove/force # Add or remove space before reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # ignore/add/remove/force # Add or remove space after reference sign '&' -sp_after_byref = ignore # ignore/add/remove/force +sp_after_byref = ignore # ignore/add/remove/force # Add or remove space before '<>' -sp_before_angle = force # ignore/add/remove/force +sp_before_angle = force # ignore/add/remove/force # Add or remove space after '<>' -sp_after_angle = force # ignore/add/remove/force +sp_after_angle = force # ignore/add/remove/force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # ignore/add/remove/force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # ignore/add/remove/force # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # ignore/add/remove/force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = add # ignore/add/remove/force +sp_sparen_brace = add # ignore/add/remove/force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # ignore/add/remove/force # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # ignore/add/remove/force # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # ignore/add/remove/force # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # ignore/add/remove/force # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # ignore/add/remove/force # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # ignore/add/remove/force # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # ignore/add/remove/force # Add or remove space after cast -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # ignore/add/remove/force # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # ignore/add/remove/force # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # ignore/add/remove/force # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = force # ignore/add/remove/force +sp_inside_braces_enum = force # ignore/add/remove/force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = force # ignore/add/remove/force +sp_inside_braces_struct = force # ignore/add/remove/force # Add or remove space inside '{' and '}' -sp_inside_braces = force # ignore/add/remove/force +sp_inside_braces = force # ignore/add/remove/force # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # ignore/add/remove/force # Add or remove space between return type and function name (a minimum of 1 is forced except for pointer return types) -sp_type_func = ignore # ignore/add/remove/force +sp_type_func = ignore # ignore/add/remove/force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # ignore/add/remove/force # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # ignore/add/remove/force # Add or remove space inside empty function '()' -sp_inside_fparens = ignore # ignore/add/remove/force +sp_inside_fparens = ignore # ignore/add/remove/force # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # ignore/add/remove/force # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # ignore/add/remove/force # Add or remove space between ')' and '{' of function -sp_fparen_brace = add # ignore/add/remove/force +sp_fparen_brace = add # ignore/add/remove/force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # ignore/add/remove/force # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # ignore/add/remove/force # Add or remove space between 'return' and '(' -sp_return_paren = remove # ignore/add/remove/force +sp_return_paren = remove # ignore/add/remove/force # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # ignore/add/remove/force # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # ignore/add/remove/force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = ignore # ignore/add/remove/force +sp_else_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # ignore/add/remove/force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # false/true # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # false/true # Whether to right-align numbers -align_number_right = true # false/true +align_number_right = true # false/true -align_func_params = true +align_func_params = true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 1 # number +align_var_def_span = 1 # number # Whether the pointer star is part of the variable name or not -align_var_def_star_style = 1 # number +align_var_def_star_style = 1 # number # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 12 # number +align_var_def_thresh = 12 # number # Whether to align the colon in struct bit fields -align_var_def_colon = true # false/true +align_var_def_colon = true # false/true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = true # false/true +align_var_def_inline = true # false/true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 1 # number +align_assign_span = 1 # number # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 12 # number +align_assign_thresh = 12 # number # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 16 # number +align_enum_equ_span = 16 # number # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # number # The span for aligning struct/union (0=don't align) -align_var_struct_span = 99 # number +align_var_struct_span = 99 # number # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 3 # number +align_struct_init_span = 3 # number # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 3 # number +align_typedef_gap = 3 # number # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 5 # number +align_typedef_span = 5 # number # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type: typedef int * pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # number # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 3 # number +align_right_cmt_span = 3 # number # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # number # Whether to align macros wrapped with a backslash and a newline -align_nl_cont = true # false/true +align_nl_cont = true # false/true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 4 # number +align_pp_define_gap = 4 # number # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 3 # number +align_pp_define_span = 3 # number # # Newline adding and removing options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # number # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # false/true # Don't touch one-line function bodies inside a class xx { } body -nl_class_leave_one_liners = true # false/true +nl_class_leave_one_liners = true # false/true # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # ignore/add/remove/force # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # number # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # ignore/add/remove/force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # number # Add or remove newline between '=' and '{' -nl_assign_brace = add # ignore/add/remove/force +nl_assign_brace = add # ignore/add/remove/force # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # number # Add or remove newline between function call and '(' -nl_fcall_brace = add # ignore/add/remove/force +nl_fcall_brace = add # ignore/add/remove/force # Add or remove newline between 'enum' and '{' -nl_enum_brace = add # ignore/add/remove/force +nl_enum_brace = add # ignore/add/remove/force # Add or remove newline between 'struct and '{' -nl_struct_brace = add # ignore/add/remove/force +nl_struct_brace = add # ignore/add/remove/force # Add or remove newline between 'union' and '{' -nl_union_brace = add # ignore/add/remove/force +nl_union_brace = add # ignore/add/remove/force # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # ignore/add/remove/force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = ignore # ignore/add/remove/force +nl_elseif_brace = ignore # ignore/add/remove/force # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # ignore/add/remove/force # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # ignore/add/remove/force # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # ignore/add/remove/force # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # ignore/add/remove/force # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # ignore/add/remove/force # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # false/true # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # false/true # Newline between namespace and { -nl_namespace_brace = ignore # ignore/add/remove/force +nl_namespace_brace = ignore # ignore/add/remove/force # Add or remove newline between 'template<>' and 'class' -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # ignore/add/remove/force # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # ignore/add/remove/force # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # ignore/add/remove/force # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # ignore/add/remove/force # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # ignore/add/remove/force # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # ignore/add/remove/force # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # ignore/add/remove/force # Whether to put a newline after 'return' statement -nl_after_return = true # false/true +nl_after_return = true # false/true # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # false/true # Whether to put a newline after brace open -nl_after_brace_open = true # false/true +nl_after_brace_open = true # false/true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # false/true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = true # false/true +nl_squeeze_ifdef = true # false/true # # Positioning options # # The position of boolean operators in wrapped expressions -pos_bool = trail # ignore/lead/trail +pos_bool = trail # ignore/lead/trail # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # ignore/lead/trail # # Blank line options # # The maximum consecutive newlines -nl_max = 4 # number +nl_max = 4 # number # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # number # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # number # The number of newlines after '}' of the function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # number # The minimum number of newlines before a multi-line comment (doesn't apply if after a brace open) -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # number # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # false/true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # false/true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # ignore/add/remove/force # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # ignore/add/remove/force # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # ignore/add/remove/force # Add or remove braces on single-line 'if' statement -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # ignore/add/remove/force # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # number # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # ignore/add/remove/force # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = add # ignore/add/remove/force +mod_paren_on_return = add # ignore/add/remove/force # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # false/true # # Comment modifications # # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # false/true # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # false/true # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # false/true # Whether to put a star on subsequent comment lines -cmt_star_cont = true # false/true +cmt_star_cont = true # false/true # # Preprocessor options # # Add or remove indent of preprocessor directives -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # ignore/add/remove/force # Add or remove space between # and, say, define -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # ignore/add/remove/force -nl_getset_brace = force +nl_getset_brace = force -mod_full_paren_if_bool = true +mod_full_paren_if_bool = true diff --git a/tests/config/mod-paren2.cfg b/tests/config/mod-paren2.cfg index e04715786d..843153cc1d 100644 --- a/tests/config/mod-paren2.cfg +++ b/tests/config/mod-paren2.cfg @@ -10,508 +10,508 @@ # # The type of line endings -newlines = lf # auto/lf/crlf/cr +newlines = lf # auto/lf/crlf/cr # The original size of tabs in the input -input_tab_size = 8 # number +input_tab_size = 8 # number # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 3 # number +output_tab_size = 3 # number # The ascii value of the string escape char, usually 92 (\). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # number # # Indenting # # The number of columns to indent per level (usually 2, 3, 4, or 8) -indent_columns = 3 # number +indent_columns = 3 # number # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # number # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # false/true # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # number # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # false/true # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # false/true # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # false/true # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # false/true # Whether to indent the stuff after a leading class colon -indent_class_colon = false # false/true +indent_class_colon = false # false/true # Whether to indent continued function call parameters one indent level (true) or aligns instead of indent (false) -indent_func_call_param = false # false/true +indent_func_call_param = false # false/true # The number of spaces to indent a continued '->' or '.' # Usually set to indent_columns. -indent_member = 3 # number +indent_member = 3 # number # Spaces to indent 'case' from 'switch' -indent_switch_case = 0 # number +indent_switch_case = 0 # number # Spaces to indent '{' from 'case' -indent_case_brace = 0 # number +indent_case_brace = 0 # number # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # false/true # How to indent goto labels (>0=absolute column where 1 is the leftmost column, <=0=subtract from brace indent) -indent_label = 1 # number +indent_label = 1 # number # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # false/true # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # false/true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # ignore/add/remove/force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # ignore/add/remove/force # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # ignore/add/remove/force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # ignore/add/remove/force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # ignore/add/remove/force # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # ignore/add/remove/force # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # ignore/add/remove/force # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # ignore/add/remove/force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # ignore/add/remove/force # Add or remove space after pointer star '*' -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # ignore/add/remove/force # Add or remove space before reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # ignore/add/remove/force # Add or remove space after reference sign '&' -sp_after_byref = ignore # ignore/add/remove/force +sp_after_byref = ignore # ignore/add/remove/force # Add or remove space before '<>' -sp_before_angle = force # ignore/add/remove/force +sp_before_angle = force # ignore/add/remove/force # Add or remove space after '<>' -sp_after_angle = force # ignore/add/remove/force +sp_after_angle = force # ignore/add/remove/force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # ignore/add/remove/force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # ignore/add/remove/force # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # ignore/add/remove/force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = add # ignore/add/remove/force +sp_sparen_brace = add # ignore/add/remove/force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # ignore/add/remove/force # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # ignore/add/remove/force # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # ignore/add/remove/force # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # ignore/add/remove/force # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # ignore/add/remove/force # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # ignore/add/remove/force # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # ignore/add/remove/force # Add or remove space after cast -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # ignore/add/remove/force # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # ignore/add/remove/force # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # ignore/add/remove/force # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = force # ignore/add/remove/force +sp_inside_braces_enum = force # ignore/add/remove/force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = force # ignore/add/remove/force +sp_inside_braces_struct = force # ignore/add/remove/force # Add or remove space inside '{' and '}' -sp_inside_braces = force # ignore/add/remove/force +sp_inside_braces = force # ignore/add/remove/force # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # ignore/add/remove/force # Add or remove space between return type and function name (a minimum of 1 is forced except for pointer return types) -sp_type_func = ignore # ignore/add/remove/force +sp_type_func = ignore # ignore/add/remove/force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # ignore/add/remove/force # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # ignore/add/remove/force # Add or remove space inside empty function '()' -sp_inside_fparens = ignore # ignore/add/remove/force +sp_inside_fparens = ignore # ignore/add/remove/force # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # ignore/add/remove/force # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # ignore/add/remove/force # Add or remove space between ')' and '{' of function -sp_fparen_brace = add # ignore/add/remove/force +sp_fparen_brace = add # ignore/add/remove/force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # ignore/add/remove/force # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # ignore/add/remove/force # Add or remove space between 'return' and '(' -sp_return_paren = remove # ignore/add/remove/force +sp_return_paren = remove # ignore/add/remove/force # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # ignore/add/remove/force # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # ignore/add/remove/force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = ignore # ignore/add/remove/force +sp_else_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # ignore/add/remove/force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # false/true # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # false/true # Whether to right-align numbers -align_number_right = true # false/true +align_number_right = true # false/true -align_func_params = true +align_func_params = true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 1 # number +align_var_def_span = 1 # number # Whether the pointer star is part of the variable name or not -align_var_def_star_style = 1 # number +align_var_def_star_style = 1 # number # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 12 # number +align_var_def_thresh = 12 # number # Whether to align the colon in struct bit fields -align_var_def_colon = true # false/true +align_var_def_colon = true # false/true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = true # false/true +align_var_def_inline = true # false/true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 1 # number +align_assign_span = 1 # number # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 12 # number +align_assign_thresh = 12 # number # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 16 # number +align_enum_equ_span = 16 # number # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # number # The span for aligning struct/union (0=don't align) -align_var_struct_span = 99 # number +align_var_struct_span = 99 # number # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 3 # number +align_struct_init_span = 3 # number # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 3 # number +align_typedef_gap = 3 # number # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 5 # number +align_typedef_span = 5 # number # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type: typedef int * pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # number # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 3 # number +align_right_cmt_span = 3 # number # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # number # Whether to align macros wrapped with a backslash and a newline -align_nl_cont = true # false/true +align_nl_cont = true # false/true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 4 # number +align_pp_define_gap = 4 # number # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 3 # number +align_pp_define_span = 3 # number # # Newline adding and removing options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # number # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # false/true # Don't touch one-line function bodies inside a class xx { } body -nl_class_leave_one_liners = true # false/true +nl_class_leave_one_liners = true # false/true # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # ignore/add/remove/force # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # number # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # ignore/add/remove/force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # number # Add or remove newline between '=' and '{' -nl_assign_brace = add # ignore/add/remove/force +nl_assign_brace = add # ignore/add/remove/force # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # number # Add or remove newline between function call and '(' -nl_fcall_brace = add # ignore/add/remove/force +nl_fcall_brace = add # ignore/add/remove/force # Add or remove newline between 'enum' and '{' -nl_enum_brace = add # ignore/add/remove/force +nl_enum_brace = add # ignore/add/remove/force # Add or remove newline between 'struct and '{' -nl_struct_brace = add # ignore/add/remove/force +nl_struct_brace = add # ignore/add/remove/force # Add or remove newline between 'union' and '{' -nl_union_brace = add # ignore/add/remove/force +nl_union_brace = add # ignore/add/remove/force # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # ignore/add/remove/force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = ignore # ignore/add/remove/force +nl_elseif_brace = ignore # ignore/add/remove/force # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # ignore/add/remove/force # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # ignore/add/remove/force # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # ignore/add/remove/force # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # ignore/add/remove/force # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # ignore/add/remove/force # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # false/true # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # false/true # Newline between namespace and { -nl_namespace_brace = ignore # ignore/add/remove/force +nl_namespace_brace = ignore # ignore/add/remove/force # Add or remove newline between 'template<>' and 'class' -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # ignore/add/remove/force # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # ignore/add/remove/force # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # ignore/add/remove/force # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # ignore/add/remove/force # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # ignore/add/remove/force # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # ignore/add/remove/force # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # ignore/add/remove/force # Whether to put a newline after 'return' statement -nl_after_return = true # false/true +nl_after_return = true # false/true # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # false/true # Whether to put a newline after brace open -nl_after_brace_open = true # false/true +nl_after_brace_open = true # false/true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # false/true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = true # false/true +nl_squeeze_ifdef = true # false/true # # Positioning options # # The position of boolean operators in wrapped expressions -pos_bool = trail # ignore/lead/trail +pos_bool = trail # ignore/lead/trail # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # ignore/lead/trail # # Blank line options # # The maximum consecutive newlines -nl_max = 4 # number +nl_max = 4 # number # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # number # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # number # The number of newlines after '}' of the function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # number # The minimum number of newlines before a multi-line comment (doesn't apply if after a brace open) -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # number # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # false/true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # false/true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # ignore/add/remove/force # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # ignore/add/remove/force # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # ignore/add/remove/force # Add or remove braces on single-line 'if' statement -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # ignore/add/remove/force # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # number # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # ignore/add/remove/force # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = remove # ignore/add/remove/force +mod_paren_on_return = remove # ignore/add/remove/force # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # false/true # # Comment modifications # # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # false/true # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # false/true # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # false/true # Whether to put a star on subsequent comment lines -cmt_star_cont = true # false/true +cmt_star_cont = true # false/true # # Preprocessor options # # Add or remove indent of preprocessor directives -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # ignore/add/remove/force # Add or remove space between # and, say, define -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # ignore/add/remove/force -nl_getset_brace = force +nl_getset_brace = force -mod_full_paren_if_bool = true +mod_full_paren_if_bool = true diff --git a/tests/config/mod_case_brace_add.cfg b/tests/config/mod_case_brace_add.cfg index ac412e7317..c27304fa25 100644 --- a/tests/config/mod_case_brace_add.cfg +++ b/tests/config/mod_case_brace_add.cfg @@ -1,25 +1,25 @@ # Uncrustify 0.52+svn -mod_case_brace = add +mod_case_brace = add # # General options # # The type of line endings -newlines = lf # auto/lf/crlf/cr +newlines = lf # auto/lf/crlf/cr # The original size of tabs in the input -input_tab_size = 8 # number +input_tab_size = 8 # number # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 3 # number +output_tab_size = 3 # number # The ascii value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # number # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # number # # Indenting @@ -27,1142 +27,1142 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 3 # number +indent_columns = 3 # number # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # number # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # false/true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # number # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # number # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # false/true # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # false/true # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # false/true # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # false/true # Whether the 'extern "C"' body is indented -indent_extern = false # false/true +indent_extern = false # false/true # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # false/true # Whether to indent the stuff after a leading class colon -indent_class_colon = true # false/true +indent_class_colon = true # false/true # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level -indent_else_if = false # false/true +indent_else_if = false # false/true # Amount to indent variable declarations after a open brace. neg=relative, pos=absolute -indent_var_def_blk = 0 # number +indent_var_def_blk = 0 # number # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = false # false/true +indent_func_call_param = false # false/true # Same as indent_func_call_param, but for function defs -indent_func_def_param = false # false/true +indent_func_def_param = false # false/true # Same as indent_func_call_param, but for function protos -indent_func_proto_param = false # false/true +indent_func_proto_param = false # false/true # Same as indent_func_call_param, but for class declarations -indent_func_class_param = false # false/true +indent_func_class_param = false # false/true # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = false # false/true +indent_func_ctor_var_param = false # false/true # Same as indent_func_call_param, but for templates -indent_template_param = false # false/true +indent_template_param = false # false/true # Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true +indent_func_param_double = false # false/true # Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 0 # number +indent_func_const = 0 # number # Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 0 # number +indent_func_throw = 0 # number # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 3 # number +indent_member = 3 # number # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # number # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = false # false/true +indent_relative_single_line_comments = false # false/true # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 0 # number +indent_switch_case = 0 # number # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # number # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 3 # number +indent_case_brace = 3 # number # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # false/true # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # number # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # number # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # false/true # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # false/true # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 0 # number +indent_paren_close = 0 # number # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # false/true # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # false/true # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # false/true # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # false/true # Align continued statements at the '='. Default=True # If FALSE or the '=' is followed by a newline, the next line is indent one tab. -indent_align_assign = true # false/true +indent_align_assign = true # false/true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # ignore/add/remove/force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # ignore/add/remove/force # Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. -sp_before_assign = ignore # ignore/add/remove/force +sp_before_assign = ignore # ignore/add/remove/force # Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. -sp_after_assign = ignore # ignore/add/remove/force +sp_after_assign = ignore # ignore/add/remove/force # Add or remove space around assignment '=' in enum -sp_enum_assign = ignore # ignore/add/remove/force +sp_enum_assign = ignore # ignore/add/remove/force # Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_before_assign = ignore # ignore/add/remove/force +sp_enum_before_assign = ignore # ignore/add/remove/force # Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_after_assign = ignore # ignore/add/remove/force +sp_enum_after_assign = ignore # ignore/add/remove/force # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # ignore/add/remove/force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # ignore/add/remove/force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # ignore/add/remove/force # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # ignore/add/remove/force # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # false/true # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # ignore/add/remove/force # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # ignore/add/remove/force # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force +sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # ignore/add/remove/force # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # ignore/add/remove/force # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = ignore # ignore/add/remove/force +sp_after_ptr_star_func = ignore # ignore/add/remove/force # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = ignore # ignore/add/remove/force +sp_before_ptr_star_func = ignore # ignore/add/remove/force # Add or remove space before a reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # ignore/add/remove/force # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force +sp_before_unnamed_byref = ignore # ignore/add/remove/force # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = force # ignore/add/remove/force +sp_after_byref = force # ignore/add/remove/force # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = ignore # ignore/add/remove/force +sp_after_byref_func = ignore # ignore/add/remove/force # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = ignore # ignore/add/remove/force +sp_before_byref_func = ignore # ignore/add/remove/force # Add or remove space between type and word -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # ignore/add/remove/force # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. -sp_template_angle = ignore # ignore/add/remove/force +sp_template_angle = ignore # ignore/add/remove/force # Add or remove space before '<>' -sp_before_angle = remove # ignore/add/remove/force +sp_before_angle = remove # ignore/add/remove/force # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # ignore/add/remove/force # Add or remove space after '<>' -sp_after_angle = force # ignore/add/remove/force +sp_after_angle = force # ignore/add/remove/force # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = ignore # ignore/add/remove/force +sp_angle_paren = ignore # ignore/add/remove/force # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = ignore # ignore/add/remove/force +sp_angle_word = ignore # ignore/add/remove/force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # ignore/add/remove/force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # ignore/add/remove/force # Add or remove space before if-condition ')'. Overrides sp_inside_sparen. -sp_inside_sparen_close = ignore # ignore/add/remove/force +sp_inside_sparen_close = ignore # ignore/add/remove/force # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # ignore/add/remove/force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = add # ignore/add/remove/force +sp_sparen_brace = add # ignore/add/remove/force # Add or remove space between 'invariant' and '(' in the D language. -sp_invariant_paren = ignore # ignore/add/remove/force +sp_invariant_paren = ignore # ignore/add/remove/force # Add or remove space after the ')' in 'invariant (C) c' in the D language. -sp_after_invariant_paren = ignore # ignore/add/remove/force +sp_after_invariant_paren = ignore # ignore/add/remove/force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # ignore/add/remove/force # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # ignore/add/remove/force # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = ignore # ignore/add/remove/force +sp_before_semi_for = ignore # ignore/add/remove/force # Add or remove space before a semicolon of an empty part of a for statment. -sp_before_semi_for_empty = force # ignore/add/remove/force +sp_before_semi_for_empty = force # ignore/add/remove/force # Add or remove space after the final semicolon of an empty part of a for statment: for ( ; ; ). -sp_after_semi_for_empty = ignore # ignore/add/remove/force +sp_after_semi_for_empty = ignore # ignore/add/remove/force # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # ignore/add/remove/force # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # ignore/add/remove/force # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # ignore/add/remove/force # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # ignore/add/remove/force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # ignore/add/remove/force # Add or remove space after class ':' -sp_after_class_colon = ignore # ignore/add/remove/force +sp_after_class_colon = ignore # ignore/add/remove/force # Add or remove space before class ':' -sp_before_class_colon = ignore # ignore/add/remove/force +sp_before_class_colon = ignore # ignore/add/remove/force # Add or remove space before case ':' -sp_before_case_colon = remove # ignore/add/remove/force +sp_before_case_colon = remove # ignore/add/remove/force # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # ignore/add/remove/force # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = ignore # ignore/add/remove/force +sp_after_operator_sym = ignore # ignore/add/remove/force # Add or remove space after C/D cast, ie 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # ignore/add/remove/force # Add or remove spaces inside cast parens -sp_inside_paren_cast = ignore # ignore/add/remove/force +sp_inside_paren_cast = ignore # ignore/add/remove/force # Add or remove space between the type and open paren in a C++ cast, ie 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = ignore # ignore/add/remove/force +sp_cpp_cast_paren = ignore # ignore/add/remove/force # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # ignore/add/remove/force # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # ignore/add/remove/force # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = force # ignore/add/remove/force +sp_inside_braces_enum = force # ignore/add/remove/force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = force # ignore/add/remove/force +sp_inside_braces_struct = force # ignore/add/remove/force # Add or remove space inside '{' and '}' -sp_inside_braces = force # ignore/add/remove/force +sp_inside_braces = force # ignore/add/remove/force # Add or remove space inside '{}' -sp_inside_braces_empty = ignore # ignore/add/remove/force +sp_inside_braces_empty = ignore # ignore/add/remove/force # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = force # ignore/add/remove/force +sp_type_func = force # ignore/add/remove/force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # ignore/add/remove/force # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # ignore/add/remove/force # Add or remove space inside empty function '()' -sp_inside_fparens = ignore # ignore/add/remove/force +sp_inside_fparens = ignore # ignore/add/remove/force # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # ignore/add/remove/force # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # ignore/add/remove/force # Add or remove space between ')' and '{' of function -sp_fparen_brace = add # ignore/add/remove/force +sp_fparen_brace = add # ignore/add/remove/force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # ignore/add/remove/force # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = ignore # ignore/add/remove/force +sp_func_call_user_paren = ignore # ignore/add/remove/force # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # ignore/add/remove/force # Add or remove space between 'return' and '(' -sp_return_paren = remove # ignore/add/remove/force +sp_return_paren = remove # ignore/add/remove/force # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # ignore/add/remove/force # Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = ignore # ignore/add/remove/force +sp_defined_paren = ignore # ignore/add/remove/force # Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = ignore # ignore/add/remove/force +sp_throw_paren = ignore # ignore/add/remove/force # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # ignore/add/remove/force # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # ignore/add/remove/force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = ignore # ignore/add/remove/force +sp_else_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # ignore/add/remove/force # Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = force # ignore/add/remove/force +sp_brace_typedef = force # ignore/add/remove/force # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # ignore/add/remove/force # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # ignore/add/remove/force # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # ignore/add/remove/force # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # ignore/add/remove/force # Add or remove space before the '::' operator -sp_before_dc = remove # ignore/add/remove/force +sp_before_dc = remove # ignore/add/remove/force # Add or remove space after the '::' operator -sp_after_dc = remove # ignore/add/remove/force +sp_after_dc = remove # ignore/add/remove/force # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # ignore/add/remove/force # Add or remove space after the '!' (not) operator. -sp_not = remove # ignore/add/remove/force +sp_not = remove # ignore/add/remove/force # Add or remove space after the '~' (invert) operator. -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # ignore/add/remove/force # Add or remove space after the '&' (address-of) operator. # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # ignore/add/remove/force # Add or remove space around the '.' or '->' operators -sp_member = remove # ignore/add/remove/force +sp_member = remove # ignore/add/remove/force # Add or remove space after the '*' (dereference) operator. # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # ignore/add/remove/force # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7' -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # ignore/add/remove/force # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;' -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # ignore/add/remove/force # Add or remove space before a backslash-newline at the end of a line -sp_before_nl_cont = add # ignore/add/remove/force +sp_before_nl_cont = add # ignore/add/remove/force # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force +sp_after_oc_scope = ignore # ignore/add/remove/force # Add or remove space after the colon in message specs # '-(int) f:(int) x;' vs '-(int) f: (int) x;' -sp_after_oc_colon = ignore # ignore/add/remove/force +sp_after_oc_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in message specs # '-(int) f: (int) x;' vs '-(int) f : (int) x;' -sp_before_oc_colon = ignore # ignore/add/remove/force +sp_before_oc_colon = ignore # ignore/add/remove/force # Add or remove space after the colon in message specs # '[object setValue:1];' vs '[object setValue: 1];' -sp_after_send_oc_colon = ignore # ignore/add/remove/force +sp_after_send_oc_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in message specs # '[object setValue:1];' vs '[object setValue :1];' -sp_before_send_oc_colon = ignore # ignore/add/remove/force +sp_before_send_oc_colon = ignore # ignore/add/remove/force # Add or remove space after the (type) in message specs # '-(int) f: (int) x;' vs '-(int) f: (int)x;' -sp_after_oc_type = ignore # ignore/add/remove/force +sp_after_oc_type = ignore # ignore/add/remove/force # Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = ignore # ignore/add/remove/force +sp_cond_colon = ignore # ignore/add/remove/force # Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = ignore # ignore/add/remove/force +sp_cond_question = ignore # ignore/add/remove/force # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = remove # ignore/add/remove/force +sp_case_label = remove # ignore/add/remove/force # Control the space around the D '..' operator. -sp_range = ignore # ignore/add/remove/force +sp_range = ignore # ignore/add/remove/force # Control the space after the opening of a C++ comment '// A' vs '//A' -sp_cmt_cpp_start = ignore # ignore/add/remove/force +sp_cmt_cpp_start = ignore # ignore/add/remove/force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # false/true # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # false/true # Whether to right-align numbers -align_number_right = true # false/true +align_number_right = true # false/true # Align variable definitions in prototypes and functions -align_func_params = true # false/true +align_func_params = true # false/true # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = false # false/true +align_same_func_call_params = false # false/true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 1 # number +align_var_def_span = 1 # number # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 1 # number +align_var_def_star_style = 1 # number # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # number # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 16 # number +align_var_def_thresh = 16 # number # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # number # Whether to align the colon in struct bit fields -align_var_def_colon = true # false/true +align_var_def_colon = true # false/true # Whether to align any attribute after the variable name -align_var_def_attribute = false # false/true +align_var_def_attribute = false # false/true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = true # false/true +align_var_def_inline = true # false/true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 1 # number +align_assign_span = 1 # number # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 12 # number +align_assign_thresh = 12 # number # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 16 # number +align_enum_equ_span = 16 # number # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # number # The span for aligning struct/union (0=don't align) -align_var_struct_span = 99 # number +align_var_struct_span = 99 # number # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # number # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # number # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 3 # number +align_struct_init_span = 3 # number # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 3 # number +align_typedef_gap = 3 # number # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 5 # number +align_typedef_span = 5 # number # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # number # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # number # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typdef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # number # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 3 # number +align_right_cmt_span = 3 # number # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # false/true # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. -align_right_cmt_gap = 0 # number +align_right_cmt_gap = 0 # number # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # number # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # number # Align function protos on the 'operator' keyword instead of what follows -align_on_operator = false # false/true +align_on_operator = false # false/true # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # false/true # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true +align_single_line_func = false # false/true # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # false/true # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # number # The span for aligning ObjC msg spec (0=don't align) -align_oc_msg_spec_span = 0 # number +align_oc_msg_spec_span = 0 # number # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = true # false/true +align_nl_cont = true # false/true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 4 # number +align_pp_define_gap = 4 # number # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 3 # number +align_pp_define_span = 3 # number # Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = true # false/true +align_left_shift = true # false/true # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # false/true # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = true # false/true +nl_assign_leave_one_liners = true # false/true # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = true # false/true +nl_class_leave_one_liners = true # false/true # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = false # false/true +nl_enum_leave_one_liners = false # false/true # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # false/true # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # false/true # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # false/true # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # ignore/add/remove/force # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # number # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # ignore/add/remove/force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # number # Add or remove newline between '=' and '{' -nl_assign_brace = add # ignore/add/remove/force +nl_assign_brace = add # ignore/add/remove/force # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # ignore/add/remove/force # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # ignore/add/remove/force # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # number # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = add # ignore/add/remove/force +nl_fcall_brace = add # ignore/add/remove/force # Add or remove newline between 'enum' and '{' -nl_enum_brace = force # ignore/add/remove/force +nl_enum_brace = force # ignore/add/remove/force # Add or remove newline between 'struct and '{' -nl_struct_brace = force # ignore/add/remove/force +nl_struct_brace = force # ignore/add/remove/force # Add or remove newline between 'union' and '{' -nl_union_brace = force # ignore/add/remove/force +nl_union_brace = force # ignore/add/remove/force # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # ignore/add/remove/force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = ignore # ignore/add/remove/force +nl_elseif_brace = ignore # ignore/add/remove/force # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # ignore/add/remove/force # Add or remove newline between 'else' and 'if' -nl_else_if = ignore # ignore/add/remove/force +nl_else_if = ignore # ignore/add/remove/force # Add or remove newline between '}' and 'finally' -nl_brace_finally = ignore # ignore/add/remove/force +nl_brace_finally = ignore # ignore/add/remove/force # Add or remove newline between 'finally' and '{' -nl_finally_brace = ignore # ignore/add/remove/force +nl_finally_brace = ignore # ignore/add/remove/force # Add or remove newline between 'try' and '{' -nl_try_brace = ignore # ignore/add/remove/force +nl_try_brace = ignore # ignore/add/remove/force # Add or remove newline between get/set and '{' -nl_getset_brace = force # ignore/add/remove/force +nl_getset_brace = force # ignore/add/remove/force # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # ignore/add/remove/force # Add or remove newline between 'catch' and '{' -nl_catch_brace = ignore # ignore/add/remove/force +nl_catch_brace = ignore # ignore/add/remove/force # Add or remove newline between '}' and 'catch' -nl_brace_catch = ignore # ignore/add/remove/force +nl_brace_catch = ignore # ignore/add/remove/force # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # ignore/add/remove/force # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # ignore/add/remove/force # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # ignore/add/remove/force # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # false/true # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = true # false/true +nl_multi_line_define = true # false/true # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # false/true # Add or remove newline between ')' and 'throw' -nl_before_throw = ignore # ignore/add/remove/force +nl_before_throw = ignore # ignore/add/remove/force # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # false/true # Newline between namespace and { -nl_namespace_brace = ignore # ignore/add/remove/force +nl_namespace_brace = ignore # ignore/add/remove/force # Add or remove newline between 'template<>' and whatever follows. -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # ignore/add/remove/force # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # ignore/add/remove/force # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # ignore/add/remove/force # Add or remove newline between function scope and name in a definition # Controls the newline after '::' in 'void A::f() { }' -nl_func_scope_name = ignore # ignore/add/remove/force +nl_func_scope_name = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = ignore # ignore/add/remove/force +nl_func_proto_type_name = ignore # ignore/add/remove/force # Add or remove newline between a function name and the opening '(' -nl_func_paren = remove # ignore/add/remove/force +nl_func_paren = remove # ignore/add/remove/force # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # ignore/add/remove/force # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # ignore/add/remove/force # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # ignore/add/remove/force # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # ignore/add/remove/force # Whether to put a newline after 'return' statement -nl_after_return = true # false/true +nl_after_return = true # false/true # Add or remove a newline between the return keyword and return expression. -nl_return_expr = ignore # ignore/add/remove/force +nl_return_expr = ignore # ignore/add/remove/force # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # false/true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = true # false/true +nl_after_brace_open = true # false/true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true +nl_after_brace_open_cmt = false # false/true # Whether to put a newline after a virtual brace open. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = false # false/true +nl_after_vbrace_open = false # false/true # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. -nl_after_brace_close = true # false/true +nl_after_brace_close = true # false/true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # false/true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = true # false/true +nl_squeeze_ifdef = true # false/true # Add or remove newline before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # ignore/add/remove/force # Add or remove newline after 'if' -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # ignore/add/remove/force # Add or remove newline before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # ignore/add/remove/force # Add or remove newline after 'for' -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # ignore/add/remove/force # Add or remove newline before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # ignore/add/remove/force # Add or remove newline after 'while' -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # ignore/add/remove/force # Add or remove newline before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # ignore/add/remove/force # Add or remove newline after 'switch' -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # ignore/add/remove/force # Add or remove newline before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # ignore/add/remove/force # Add or remove newline after 'do' -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # ignore/add/remove/force # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # false/true # Whether to double-space before the close brace of a struct/union/enum -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # false/true # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # ignore/add/remove/force # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # false/true # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # false/true # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # false/true # # Positioning options # # The position of arithmetic operators in wrapped expressions -pos_arith = ignore # ignore/lead/trail +pos_arith = ignore # ignore/lead/trail # The position of assignment in wrapped expressions -pos_assign = ignore # ignore/lead/trail +pos_assign = ignore # ignore/lead/trail # The position of boolean operators in wrapped expressions -pos_bool = trail # ignore/lead/trail +pos_bool = trail # ignore/lead/trail # The position of the comma in wrapped expressions -pos_comma = ignore # ignore/lead/trail +pos_comma = ignore # ignore/lead/trail # The position of the comma in the constructor initialization list -pos_class_comma = ignore # ignore/lead/trail +pos_class_comma = ignore # ignore/lead/trail # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # ignore/lead/trail # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # number # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true +ls_for_split_full = false # false/true # Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true +ls_func_split_full = false # false/true # # Blank line options # # The maximum consecutive newlines -nl_max = 4 # number +nl_max = 4 # number # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # number # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # number # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 3 # number +nl_after_func_body = 3 # number # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 0 # number +nl_after_func_body_one_liner = 0 # number # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # number # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # number # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # number # Whether to force a newline after a mulit-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # false/true # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 0 # number +nl_before_access_spec = 0 # number # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # number # The number of newlines between a function def and the function comment. # 0 = No change. -nl_comment_func_def = 1 # number +nl_comment_func_def = 1 # number # The number of newlines after a try-catch-finally block that isn't followed by a brace close. # 0 = No change. -nl_after_try_catch_finally = 0 # number +nl_after_try_catch_finally = 0 # number # The number of newlines before and after a property, indexer or event decl. # 0 = No change. -nl_around_cs_property = 0 # number +nl_around_cs_property = 0 # number # The number of newlines between the get/set/add/remove handlers in C#. # 0 = No change. -nl_between_get_set = 0 # number +nl_between_get_set = 0 # number # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # false/true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # false/true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # ignore/add/remove/force # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # ignore/add/remove/force # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # ignore/add/remove/force # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # ignore/add/remove/force # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # number # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # ignore/add/remove/force # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = add # ignore/add/remove/force +mod_paren_on_return = add # ignore/add/remove/force # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # false/true # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = true # false/true +mod_full_paren_if_bool = true # false/true # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = true # false/true +mod_remove_extra_semicolon = true # false/true # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 0 # number +mod_add_long_function_closebrace_comment = 0 # number # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number +mod_add_long_switch_closebrace_comment = 0 # number # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # false/true # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # false/true # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # false/true # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = false # false/true +mod_move_case_break = false # false/true # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = true # false/true +mod_remove_empty_return = true # false/true # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # number # If false, disable all multi-line comment changes, including cmt_width and leading chars. # Default is true. -cmt_indent_multi = true # false/true +cmt_indent_multi = true # false/true # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # false/true # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # false/true # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # false/true # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # false/true # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # false/true # Whether to put a star on subsequent comment lines -cmt_star_cont = true # false/true +cmt_star_cont = true # false/true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # number # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # number # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true # false/true # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitue $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # string # The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment. # Will substitue $(filename) with the current file's name. -cmt_insert_file_footer = "" # string +cmt_insert_file_footer = "" # string # The filename that contains text to insert before a function implementation if the function isn't preceeded with a C/C++ comment. # Will substitue $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # string # The filename that contains text to insert before a class if the class isn't preceeded with a C/C++ comment. # Will substitue $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # string # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true +cmt_insert_before_preproc = false # false/true # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = remove # ignore/add/remove/force +pp_indent = remove # ignore/add/remove/force # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # false/true # If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. -pp_indent_count = 1 # number +pp_indent_count = 1 # number # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # ignore/add/remove/force # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # number # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # number # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # false/true # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # number # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true +pp_if_indent_code = false # false/true # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # false/true # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/mod_case_brace_rm.cfg b/tests/config/mod_case_brace_rm.cfg index 190a7fa536..15d59c07bd 100644 --- a/tests/config/mod_case_brace_rm.cfg +++ b/tests/config/mod_case_brace_rm.cfg @@ -1,25 +1,25 @@ # Uncrustify 0.52+svn -mod_case_brace = remove +mod_case_brace = remove # # General options # # The type of line endings -newlines = lf # auto/lf/crlf/cr +newlines = lf # auto/lf/crlf/cr # The original size of tabs in the input -input_tab_size = 8 # number +input_tab_size = 8 # number # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 3 # number +output_tab_size = 3 # number # The ascii value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # number # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # number # # Indenting @@ -27,1142 +27,1142 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 3 # number +indent_columns = 3 # number # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # number # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # false/true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # number # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # number # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # false/true # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # false/true # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # false/true # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # false/true # Whether the 'extern "C"' body is indented -indent_extern = false # false/true +indent_extern = false # false/true # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # false/true # Whether to indent the stuff after a leading class colon -indent_class_colon = true # false/true +indent_class_colon = true # false/true # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level -indent_else_if = false # false/true +indent_else_if = false # false/true # Amount to indent variable declarations after a open brace. neg=relative, pos=absolute -indent_var_def_blk = 0 # number +indent_var_def_blk = 0 # number # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = false # false/true +indent_func_call_param = false # false/true # Same as indent_func_call_param, but for function defs -indent_func_def_param = false # false/true +indent_func_def_param = false # false/true # Same as indent_func_call_param, but for function protos -indent_func_proto_param = false # false/true +indent_func_proto_param = false # false/true # Same as indent_func_call_param, but for class declarations -indent_func_class_param = false # false/true +indent_func_class_param = false # false/true # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = false # false/true +indent_func_ctor_var_param = false # false/true # Same as indent_func_call_param, but for templates -indent_template_param = false # false/true +indent_template_param = false # false/true # Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true +indent_func_param_double = false # false/true # Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 0 # number +indent_func_const = 0 # number # Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 0 # number +indent_func_throw = 0 # number # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 3 # number +indent_member = 3 # number # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # number # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = false # false/true +indent_relative_single_line_comments = false # false/true # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 0 # number +indent_switch_case = 0 # number # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # number # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 3 # number +indent_case_brace = 3 # number # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # false/true # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # number # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # number # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # false/true # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # false/true # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 0 # number +indent_paren_close = 0 # number # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # false/true # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # false/true # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # false/true # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # false/true # Align continued statements at the '='. Default=True # If FALSE or the '=' is followed by a newline, the next line is indent one tab. -indent_align_assign = true # false/true +indent_align_assign = true # false/true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # ignore/add/remove/force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # ignore/add/remove/force # Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. -sp_before_assign = ignore # ignore/add/remove/force +sp_before_assign = ignore # ignore/add/remove/force # Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. -sp_after_assign = ignore # ignore/add/remove/force +sp_after_assign = ignore # ignore/add/remove/force # Add or remove space around assignment '=' in enum -sp_enum_assign = ignore # ignore/add/remove/force +sp_enum_assign = ignore # ignore/add/remove/force # Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_before_assign = ignore # ignore/add/remove/force +sp_enum_before_assign = ignore # ignore/add/remove/force # Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_after_assign = ignore # ignore/add/remove/force +sp_enum_after_assign = ignore # ignore/add/remove/force # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # ignore/add/remove/force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # ignore/add/remove/force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # ignore/add/remove/force # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # ignore/add/remove/force # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # false/true # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # ignore/add/remove/force # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # ignore/add/remove/force # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force +sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # ignore/add/remove/force # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # ignore/add/remove/force # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = ignore # ignore/add/remove/force +sp_after_ptr_star_func = ignore # ignore/add/remove/force # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = ignore # ignore/add/remove/force +sp_before_ptr_star_func = ignore # ignore/add/remove/force # Add or remove space before a reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # ignore/add/remove/force # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force +sp_before_unnamed_byref = ignore # ignore/add/remove/force # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = force # ignore/add/remove/force +sp_after_byref = force # ignore/add/remove/force # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = ignore # ignore/add/remove/force +sp_after_byref_func = ignore # ignore/add/remove/force # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = ignore # ignore/add/remove/force +sp_before_byref_func = ignore # ignore/add/remove/force # Add or remove space between type and word -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # ignore/add/remove/force # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. -sp_template_angle = ignore # ignore/add/remove/force +sp_template_angle = ignore # ignore/add/remove/force # Add or remove space before '<>' -sp_before_angle = remove # ignore/add/remove/force +sp_before_angle = remove # ignore/add/remove/force # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # ignore/add/remove/force # Add or remove space after '<>' -sp_after_angle = force # ignore/add/remove/force +sp_after_angle = force # ignore/add/remove/force # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = ignore # ignore/add/remove/force +sp_angle_paren = ignore # ignore/add/remove/force # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = ignore # ignore/add/remove/force +sp_angle_word = ignore # ignore/add/remove/force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # ignore/add/remove/force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # ignore/add/remove/force # Add or remove space before if-condition ')'. Overrides sp_inside_sparen. -sp_inside_sparen_close = ignore # ignore/add/remove/force +sp_inside_sparen_close = ignore # ignore/add/remove/force # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # ignore/add/remove/force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = add # ignore/add/remove/force +sp_sparen_brace = add # ignore/add/remove/force # Add or remove space between 'invariant' and '(' in the D language. -sp_invariant_paren = ignore # ignore/add/remove/force +sp_invariant_paren = ignore # ignore/add/remove/force # Add or remove space after the ')' in 'invariant (C) c' in the D language. -sp_after_invariant_paren = ignore # ignore/add/remove/force +sp_after_invariant_paren = ignore # ignore/add/remove/force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # ignore/add/remove/force # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # ignore/add/remove/force # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = ignore # ignore/add/remove/force +sp_before_semi_for = ignore # ignore/add/remove/force # Add or remove space before a semicolon of an empty part of a for statment. -sp_before_semi_for_empty = force # ignore/add/remove/force +sp_before_semi_for_empty = force # ignore/add/remove/force # Add or remove space after the final semicolon of an empty part of a for statment: for ( ; ; ). -sp_after_semi_for_empty = ignore # ignore/add/remove/force +sp_after_semi_for_empty = ignore # ignore/add/remove/force # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # ignore/add/remove/force # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # ignore/add/remove/force # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # ignore/add/remove/force # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # ignore/add/remove/force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # ignore/add/remove/force # Add or remove space after class ':' -sp_after_class_colon = ignore # ignore/add/remove/force +sp_after_class_colon = ignore # ignore/add/remove/force # Add or remove space before class ':' -sp_before_class_colon = ignore # ignore/add/remove/force +sp_before_class_colon = ignore # ignore/add/remove/force # Add or remove space before case ':' -sp_before_case_colon = remove # ignore/add/remove/force +sp_before_case_colon = remove # ignore/add/remove/force # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # ignore/add/remove/force # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = ignore # ignore/add/remove/force +sp_after_operator_sym = ignore # ignore/add/remove/force # Add or remove space after C/D cast, ie 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # ignore/add/remove/force # Add or remove spaces inside cast parens -sp_inside_paren_cast = ignore # ignore/add/remove/force +sp_inside_paren_cast = ignore # ignore/add/remove/force # Add or remove space between the type and open paren in a C++ cast, ie 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = ignore # ignore/add/remove/force +sp_cpp_cast_paren = ignore # ignore/add/remove/force # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # ignore/add/remove/force # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # ignore/add/remove/force # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = force # ignore/add/remove/force +sp_inside_braces_enum = force # ignore/add/remove/force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = force # ignore/add/remove/force +sp_inside_braces_struct = force # ignore/add/remove/force # Add or remove space inside '{' and '}' -sp_inside_braces = force # ignore/add/remove/force +sp_inside_braces = force # ignore/add/remove/force # Add or remove space inside '{}' -sp_inside_braces_empty = ignore # ignore/add/remove/force +sp_inside_braces_empty = ignore # ignore/add/remove/force # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = force # ignore/add/remove/force +sp_type_func = force # ignore/add/remove/force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # ignore/add/remove/force # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # ignore/add/remove/force # Add or remove space inside empty function '()' -sp_inside_fparens = ignore # ignore/add/remove/force +sp_inside_fparens = ignore # ignore/add/remove/force # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # ignore/add/remove/force # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # ignore/add/remove/force # Add or remove space between ')' and '{' of function -sp_fparen_brace = add # ignore/add/remove/force +sp_fparen_brace = add # ignore/add/remove/force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # ignore/add/remove/force # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = ignore # ignore/add/remove/force +sp_func_call_user_paren = ignore # ignore/add/remove/force # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # ignore/add/remove/force # Add or remove space between 'return' and '(' -sp_return_paren = remove # ignore/add/remove/force +sp_return_paren = remove # ignore/add/remove/force # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # ignore/add/remove/force # Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = ignore # ignore/add/remove/force +sp_defined_paren = ignore # ignore/add/remove/force # Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = ignore # ignore/add/remove/force +sp_throw_paren = ignore # ignore/add/remove/force # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # ignore/add/remove/force # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # ignore/add/remove/force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = ignore # ignore/add/remove/force +sp_else_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # ignore/add/remove/force # Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = force # ignore/add/remove/force +sp_brace_typedef = force # ignore/add/remove/force # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # ignore/add/remove/force # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # ignore/add/remove/force # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # ignore/add/remove/force # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # ignore/add/remove/force # Add or remove space before the '::' operator -sp_before_dc = remove # ignore/add/remove/force +sp_before_dc = remove # ignore/add/remove/force # Add or remove space after the '::' operator -sp_after_dc = remove # ignore/add/remove/force +sp_after_dc = remove # ignore/add/remove/force # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # ignore/add/remove/force # Add or remove space after the '!' (not) operator. -sp_not = remove # ignore/add/remove/force +sp_not = remove # ignore/add/remove/force # Add or remove space after the '~' (invert) operator. -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # ignore/add/remove/force # Add or remove space after the '&' (address-of) operator. # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # ignore/add/remove/force # Add or remove space around the '.' or '->' operators -sp_member = remove # ignore/add/remove/force +sp_member = remove # ignore/add/remove/force # Add or remove space after the '*' (dereference) operator. # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # ignore/add/remove/force # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7' -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # ignore/add/remove/force # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;' -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # ignore/add/remove/force # Add or remove space before a backslash-newline at the end of a line -sp_before_nl_cont = add # ignore/add/remove/force +sp_before_nl_cont = add # ignore/add/remove/force # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force +sp_after_oc_scope = ignore # ignore/add/remove/force # Add or remove space after the colon in message specs # '-(int) f:(int) x;' vs '-(int) f: (int) x;' -sp_after_oc_colon = ignore # ignore/add/remove/force +sp_after_oc_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in message specs # '-(int) f: (int) x;' vs '-(int) f : (int) x;' -sp_before_oc_colon = ignore # ignore/add/remove/force +sp_before_oc_colon = ignore # ignore/add/remove/force # Add or remove space after the colon in message specs # '[object setValue:1];' vs '[object setValue: 1];' -sp_after_send_oc_colon = ignore # ignore/add/remove/force +sp_after_send_oc_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in message specs # '[object setValue:1];' vs '[object setValue :1];' -sp_before_send_oc_colon = ignore # ignore/add/remove/force +sp_before_send_oc_colon = ignore # ignore/add/remove/force # Add or remove space after the (type) in message specs # '-(int) f: (int) x;' vs '-(int) f: (int)x;' -sp_after_oc_type = ignore # ignore/add/remove/force +sp_after_oc_type = ignore # ignore/add/remove/force # Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = ignore # ignore/add/remove/force +sp_cond_colon = ignore # ignore/add/remove/force # Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = ignore # ignore/add/remove/force +sp_cond_question = ignore # ignore/add/remove/force # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = remove # ignore/add/remove/force +sp_case_label = remove # ignore/add/remove/force # Control the space around the D '..' operator. -sp_range = ignore # ignore/add/remove/force +sp_range = ignore # ignore/add/remove/force # Control the space after the opening of a C++ comment '// A' vs '//A' -sp_cmt_cpp_start = ignore # ignore/add/remove/force +sp_cmt_cpp_start = ignore # ignore/add/remove/force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # false/true # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # false/true # Whether to right-align numbers -align_number_right = true # false/true +align_number_right = true # false/true # Align variable definitions in prototypes and functions -align_func_params = true # false/true +align_func_params = true # false/true # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = false # false/true +align_same_func_call_params = false # false/true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 1 # number +align_var_def_span = 1 # number # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 1 # number +align_var_def_star_style = 1 # number # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # number # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 16 # number +align_var_def_thresh = 16 # number # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # number # Whether to align the colon in struct bit fields -align_var_def_colon = true # false/true +align_var_def_colon = true # false/true # Whether to align any attribute after the variable name -align_var_def_attribute = false # false/true +align_var_def_attribute = false # false/true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = true # false/true +align_var_def_inline = true # false/true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 1 # number +align_assign_span = 1 # number # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 12 # number +align_assign_thresh = 12 # number # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 16 # number +align_enum_equ_span = 16 # number # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # number # The span for aligning struct/union (0=don't align) -align_var_struct_span = 99 # number +align_var_struct_span = 99 # number # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # number # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # number # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 3 # number +align_struct_init_span = 3 # number # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 3 # number +align_typedef_gap = 3 # number # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 5 # number +align_typedef_span = 5 # number # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # number # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # number # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typdef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # number # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 3 # number +align_right_cmt_span = 3 # number # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # false/true # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. -align_right_cmt_gap = 0 # number +align_right_cmt_gap = 0 # number # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # number # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # number # Align function protos on the 'operator' keyword instead of what follows -align_on_operator = false # false/true +align_on_operator = false # false/true # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # false/true # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true +align_single_line_func = false # false/true # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # false/true # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # number # The span for aligning ObjC msg spec (0=don't align) -align_oc_msg_spec_span = 0 # number +align_oc_msg_spec_span = 0 # number # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = true # false/true +align_nl_cont = true # false/true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 4 # number +align_pp_define_gap = 4 # number # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 3 # number +align_pp_define_span = 3 # number # Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = true # false/true +align_left_shift = true # false/true # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # false/true # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = true # false/true +nl_assign_leave_one_liners = true # false/true # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = true # false/true +nl_class_leave_one_liners = true # false/true # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = false # false/true +nl_enum_leave_one_liners = false # false/true # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # false/true # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # false/true # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # false/true # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # ignore/add/remove/force # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # number # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # ignore/add/remove/force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # number # Add or remove newline between '=' and '{' -nl_assign_brace = add # ignore/add/remove/force +nl_assign_brace = add # ignore/add/remove/force # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # ignore/add/remove/force # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # ignore/add/remove/force # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # number # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = add # ignore/add/remove/force +nl_fcall_brace = add # ignore/add/remove/force # Add or remove newline between 'enum' and '{' -nl_enum_brace = force # ignore/add/remove/force +nl_enum_brace = force # ignore/add/remove/force # Add or remove newline between 'struct and '{' -nl_struct_brace = force # ignore/add/remove/force +nl_struct_brace = force # ignore/add/remove/force # Add or remove newline between 'union' and '{' -nl_union_brace = force # ignore/add/remove/force +nl_union_brace = force # ignore/add/remove/force # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # ignore/add/remove/force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = ignore # ignore/add/remove/force +nl_elseif_brace = ignore # ignore/add/remove/force # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # ignore/add/remove/force # Add or remove newline between 'else' and 'if' -nl_else_if = ignore # ignore/add/remove/force +nl_else_if = ignore # ignore/add/remove/force # Add or remove newline between '}' and 'finally' -nl_brace_finally = ignore # ignore/add/remove/force +nl_brace_finally = ignore # ignore/add/remove/force # Add or remove newline between 'finally' and '{' -nl_finally_brace = ignore # ignore/add/remove/force +nl_finally_brace = ignore # ignore/add/remove/force # Add or remove newline between 'try' and '{' -nl_try_brace = ignore # ignore/add/remove/force +nl_try_brace = ignore # ignore/add/remove/force # Add or remove newline between get/set and '{' -nl_getset_brace = force # ignore/add/remove/force +nl_getset_brace = force # ignore/add/remove/force # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # ignore/add/remove/force # Add or remove newline between 'catch' and '{' -nl_catch_brace = ignore # ignore/add/remove/force +nl_catch_brace = ignore # ignore/add/remove/force # Add or remove newline between '}' and 'catch' -nl_brace_catch = ignore # ignore/add/remove/force +nl_brace_catch = ignore # ignore/add/remove/force # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # ignore/add/remove/force # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # ignore/add/remove/force # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # ignore/add/remove/force # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # false/true # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = true # false/true +nl_multi_line_define = true # false/true # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # false/true # Add or remove newline between ')' and 'throw' -nl_before_throw = ignore # ignore/add/remove/force +nl_before_throw = ignore # ignore/add/remove/force # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # false/true # Newline between namespace and { -nl_namespace_brace = ignore # ignore/add/remove/force +nl_namespace_brace = ignore # ignore/add/remove/force # Add or remove newline between 'template<>' and whatever follows. -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # ignore/add/remove/force # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # ignore/add/remove/force # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # ignore/add/remove/force # Add or remove newline between function scope and name in a definition # Controls the newline after '::' in 'void A::f() { }' -nl_func_scope_name = ignore # ignore/add/remove/force +nl_func_scope_name = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = ignore # ignore/add/remove/force +nl_func_proto_type_name = ignore # ignore/add/remove/force # Add or remove newline between a function name and the opening '(' -nl_func_paren = remove # ignore/add/remove/force +nl_func_paren = remove # ignore/add/remove/force # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # ignore/add/remove/force # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # ignore/add/remove/force # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # ignore/add/remove/force # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # ignore/add/remove/force # Whether to put a newline after 'return' statement -nl_after_return = true # false/true +nl_after_return = true # false/true # Add or remove a newline between the return keyword and return expression. -nl_return_expr = ignore # ignore/add/remove/force +nl_return_expr = ignore # ignore/add/remove/force # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # false/true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = true # false/true +nl_after_brace_open = true # false/true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true +nl_after_brace_open_cmt = false # false/true # Whether to put a newline after a virtual brace open. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = false # false/true +nl_after_vbrace_open = false # false/true # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. -nl_after_brace_close = true # false/true +nl_after_brace_close = true # false/true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # false/true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = true # false/true +nl_squeeze_ifdef = true # false/true # Add or remove newline before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # ignore/add/remove/force # Add or remove newline after 'if' -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # ignore/add/remove/force # Add or remove newline before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # ignore/add/remove/force # Add or remove newline after 'for' -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # ignore/add/remove/force # Add or remove newline before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # ignore/add/remove/force # Add or remove newline after 'while' -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # ignore/add/remove/force # Add or remove newline before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # ignore/add/remove/force # Add or remove newline after 'switch' -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # ignore/add/remove/force # Add or remove newline before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # ignore/add/remove/force # Add or remove newline after 'do' -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # ignore/add/remove/force # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # false/true # Whether to double-space before the close brace of a struct/union/enum -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # false/true # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # ignore/add/remove/force # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # false/true # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # false/true # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # false/true # # Positioning options # # The position of arithmetic operators in wrapped expressions -pos_arith = ignore # ignore/lead/trail +pos_arith = ignore # ignore/lead/trail # The position of assignment in wrapped expressions -pos_assign = ignore # ignore/lead/trail +pos_assign = ignore # ignore/lead/trail # The position of boolean operators in wrapped expressions -pos_bool = trail # ignore/lead/trail +pos_bool = trail # ignore/lead/trail # The position of the comma in wrapped expressions -pos_comma = ignore # ignore/lead/trail +pos_comma = ignore # ignore/lead/trail # The position of the comma in the constructor initialization list -pos_class_comma = ignore # ignore/lead/trail +pos_class_comma = ignore # ignore/lead/trail # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # ignore/lead/trail # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # number # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true +ls_for_split_full = false # false/true # Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true +ls_func_split_full = false # false/true # # Blank line options # # The maximum consecutive newlines -nl_max = 4 # number +nl_max = 4 # number # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # number # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # number # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 3 # number +nl_after_func_body = 3 # number # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 0 # number +nl_after_func_body_one_liner = 0 # number # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # number # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # number # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # number # Whether to force a newline after a mulit-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # false/true # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 0 # number +nl_before_access_spec = 0 # number # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # number # The number of newlines between a function def and the function comment. # 0 = No change. -nl_comment_func_def = 1 # number +nl_comment_func_def = 1 # number # The number of newlines after a try-catch-finally block that isn't followed by a brace close. # 0 = No change. -nl_after_try_catch_finally = 0 # number +nl_after_try_catch_finally = 0 # number # The number of newlines before and after a property, indexer or event decl. # 0 = No change. -nl_around_cs_property = 0 # number +nl_around_cs_property = 0 # number # The number of newlines between the get/set/add/remove handlers in C#. # 0 = No change. -nl_between_get_set = 0 # number +nl_between_get_set = 0 # number # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # false/true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # false/true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # ignore/add/remove/force # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # ignore/add/remove/force # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # ignore/add/remove/force # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # ignore/add/remove/force # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # number # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # ignore/add/remove/force # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = add # ignore/add/remove/force +mod_paren_on_return = add # ignore/add/remove/force # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # false/true # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = true # false/true +mod_full_paren_if_bool = true # false/true # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = true # false/true +mod_remove_extra_semicolon = true # false/true # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 0 # number +mod_add_long_function_closebrace_comment = 0 # number # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number +mod_add_long_switch_closebrace_comment = 0 # number # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # false/true # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # false/true # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # false/true # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = false # false/true +mod_move_case_break = false # false/true # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = true # false/true +mod_remove_empty_return = true # false/true # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # number # If false, disable all multi-line comment changes, including cmt_width and leading chars. # Default is true. -cmt_indent_multi = true # false/true +cmt_indent_multi = true # false/true # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # false/true # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # false/true # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # false/true # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # false/true # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # false/true # Whether to put a star on subsequent comment lines -cmt_star_cont = true # false/true +cmt_star_cont = true # false/true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # number # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # number # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true # false/true # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitue $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # string # The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment. # Will substitue $(filename) with the current file's name. -cmt_insert_file_footer = "" # string +cmt_insert_file_footer = "" # string # The filename that contains text to insert before a function implementation if the function isn't preceeded with a C/C++ comment. # Will substitue $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # string # The filename that contains text to insert before a class if the class isn't preceeded with a C/C++ comment. # Will substitue $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # string # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true +cmt_insert_before_preproc = false # false/true # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = remove # ignore/add/remove/force +pp_indent = remove # ignore/add/remove/force # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # false/true # If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. -pp_indent_count = 1 # number +pp_indent_count = 1 # number # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # ignore/add/remove/force # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # number # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # number # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # false/true # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # number # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true +pp_if_indent_code = false # false/true # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # false/true # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/mod_full_brace_nl_block_rem_mlcond-0.cfg b/tests/config/mod_full_brace_nl_block_rem_mlcond-0.cfg index c6494d7ad0..781e1714f5 100644 --- a/tests/config/mod_full_brace_nl_block_rem_mlcond-0.cfg +++ b/tests/config/mod_full_brace_nl_block_rem_mlcond-0.cfg @@ -1,6 +1,6 @@ mod_full_brace_nl_block_rem_mlcond = True -mod_full_brace_for = remove -mod_full_brace_if = remove -mod_full_brace_while = remove -mod_full_brace_using = remove \ No newline at end of file +mod_full_brace_for = remove +mod_full_brace_if = remove +mod_full_brace_while = remove +mod_full_brace_using = remove diff --git a/tests/config/mod_full_brace_nl_block_rem_mlcond-1.cfg b/tests/config/mod_full_brace_nl_block_rem_mlcond-1.cfg index d76f25035d..67c3fa12f5 100644 --- a/tests/config/mod_full_brace_nl_block_rem_mlcond-1.cfg +++ b/tests/config/mod_full_brace_nl_block_rem_mlcond-1.cfg @@ -1,3 +1,3 @@ mod_full_brace_nl_block_rem_mlcond = True -mod_full_brace_if_chain = True \ No newline at end of file +mod_full_brace_if_chain = True diff --git a/tests/config/mod_move_case_brace.cfg b/tests/config/mod_move_case_brace.cfg index 46d52604b1..da0f88cdba 100644 --- a/tests/config/mod_move_case_brace.cfg +++ b/tests/config/mod_move_case_brace.cfg @@ -1,25 +1,25 @@ # Uncrustify 0.52+svn -mod_case_brace = add +mod_case_brace = add # # General options # # The type of line endings -newlines = lf # auto/lf/crlf/cr +newlines = lf # auto/lf/crlf/cr # The original size of tabs in the input -input_tab_size = 8 # number +input_tab_size = 8 # number # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 3 # number +output_tab_size = 3 # number # The ascii value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # number # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # number # # Indenting @@ -27,1142 +27,1142 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 3 # number +indent_columns = 3 # number # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # number # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # false/true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # number # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # number # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # false/true # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # false/true # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # false/true # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # false/true # Whether the 'extern "C"' body is indented -indent_extern = false # false/true +indent_extern = false # false/true # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # false/true # Whether to indent the stuff after a leading class colon -indent_class_colon = true # false/true +indent_class_colon = true # false/true # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level -indent_else_if = false # false/true +indent_else_if = false # false/true # Amount to indent variable declarations after a open brace. neg=relative, pos=absolute -indent_var_def_blk = 0 # number +indent_var_def_blk = 0 # number # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = false # false/true +indent_func_call_param = false # false/true # Same as indent_func_call_param, but for function defs -indent_func_def_param = false # false/true +indent_func_def_param = false # false/true # Same as indent_func_call_param, but for function protos -indent_func_proto_param = false # false/true +indent_func_proto_param = false # false/true # Same as indent_func_call_param, but for class declarations -indent_func_class_param = false # false/true +indent_func_class_param = false # false/true # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = false # false/true +indent_func_ctor_var_param = false # false/true # Same as indent_func_call_param, but for templates -indent_template_param = false # false/true +indent_template_param = false # false/true # Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true +indent_func_param_double = false # false/true # Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 0 # number +indent_func_const = 0 # number # Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 0 # number +indent_func_throw = 0 # number # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 3 # number +indent_member = 3 # number # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # number # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = false # false/true +indent_relative_single_line_comments = false # false/true # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 0 # number +indent_switch_case = 0 # number # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # number # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 3 # number +indent_case_brace = 3 # number # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # false/true # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # number # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # number # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # false/true # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # false/true # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 0 # number +indent_paren_close = 0 # number # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # false/true # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # false/true # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # false/true # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # false/true # Align continued statements at the '='. Default=True # If FALSE or the '=' is followed by a newline, the next line is indent one tab. -indent_align_assign = true # false/true +indent_align_assign = true # false/true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # ignore/add/remove/force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # ignore/add/remove/force # Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. -sp_before_assign = ignore # ignore/add/remove/force +sp_before_assign = ignore # ignore/add/remove/force # Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. -sp_after_assign = ignore # ignore/add/remove/force +sp_after_assign = ignore # ignore/add/remove/force # Add or remove space around assignment '=' in enum -sp_enum_assign = ignore # ignore/add/remove/force +sp_enum_assign = ignore # ignore/add/remove/force # Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_before_assign = ignore # ignore/add/remove/force +sp_enum_before_assign = ignore # ignore/add/remove/force # Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_after_assign = ignore # ignore/add/remove/force +sp_enum_after_assign = ignore # ignore/add/remove/force # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # ignore/add/remove/force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # ignore/add/remove/force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # ignore/add/remove/force # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # ignore/add/remove/force # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # false/true # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # ignore/add/remove/force # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # ignore/add/remove/force # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force +sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # ignore/add/remove/force # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # ignore/add/remove/force # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = ignore # ignore/add/remove/force +sp_after_ptr_star_func = ignore # ignore/add/remove/force # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = ignore # ignore/add/remove/force +sp_before_ptr_star_func = ignore # ignore/add/remove/force # Add or remove space before a reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # ignore/add/remove/force # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force +sp_before_unnamed_byref = ignore # ignore/add/remove/force # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = force # ignore/add/remove/force +sp_after_byref = force # ignore/add/remove/force # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = ignore # ignore/add/remove/force +sp_after_byref_func = ignore # ignore/add/remove/force # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = ignore # ignore/add/remove/force +sp_before_byref_func = ignore # ignore/add/remove/force # Add or remove space between type and word -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # ignore/add/remove/force # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. -sp_template_angle = ignore # ignore/add/remove/force +sp_template_angle = ignore # ignore/add/remove/force # Add or remove space before '<>' -sp_before_angle = remove # ignore/add/remove/force +sp_before_angle = remove # ignore/add/remove/force # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # ignore/add/remove/force # Add or remove space after '<>' -sp_after_angle = force # ignore/add/remove/force +sp_after_angle = force # ignore/add/remove/force # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = ignore # ignore/add/remove/force +sp_angle_paren = ignore # ignore/add/remove/force # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = ignore # ignore/add/remove/force +sp_angle_word = ignore # ignore/add/remove/force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # ignore/add/remove/force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # ignore/add/remove/force # Add or remove space before if-condition ')'. Overrides sp_inside_sparen. -sp_inside_sparen_close = ignore # ignore/add/remove/force +sp_inside_sparen_close = ignore # ignore/add/remove/force # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # ignore/add/remove/force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = add # ignore/add/remove/force +sp_sparen_brace = add # ignore/add/remove/force # Add or remove space between 'invariant' and '(' in the D language. -sp_invariant_paren = ignore # ignore/add/remove/force +sp_invariant_paren = ignore # ignore/add/remove/force # Add or remove space after the ')' in 'invariant (C) c' in the D language. -sp_after_invariant_paren = ignore # ignore/add/remove/force +sp_after_invariant_paren = ignore # ignore/add/remove/force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # ignore/add/remove/force # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # ignore/add/remove/force # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = ignore # ignore/add/remove/force +sp_before_semi_for = ignore # ignore/add/remove/force # Add or remove space before a semicolon of an empty part of a for statment. -sp_before_semi_for_empty = force # ignore/add/remove/force +sp_before_semi_for_empty = force # ignore/add/remove/force # Add or remove space after the final semicolon of an empty part of a for statment: for ( ; ; ). -sp_after_semi_for_empty = ignore # ignore/add/remove/force +sp_after_semi_for_empty = ignore # ignore/add/remove/force # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # ignore/add/remove/force # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # ignore/add/remove/force # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # ignore/add/remove/force # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # ignore/add/remove/force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # ignore/add/remove/force # Add or remove space after class ':' -sp_after_class_colon = ignore # ignore/add/remove/force +sp_after_class_colon = ignore # ignore/add/remove/force # Add or remove space before class ':' -sp_before_class_colon = ignore # ignore/add/remove/force +sp_before_class_colon = ignore # ignore/add/remove/force # Add or remove space before case ':' -sp_before_case_colon = remove # ignore/add/remove/force +sp_before_case_colon = remove # ignore/add/remove/force # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # ignore/add/remove/force # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = ignore # ignore/add/remove/force +sp_after_operator_sym = ignore # ignore/add/remove/force # Add or remove space after C/D cast, ie 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # ignore/add/remove/force # Add or remove spaces inside cast parens -sp_inside_paren_cast = ignore # ignore/add/remove/force +sp_inside_paren_cast = ignore # ignore/add/remove/force # Add or remove space between the type and open paren in a C++ cast, ie 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = ignore # ignore/add/remove/force +sp_cpp_cast_paren = ignore # ignore/add/remove/force # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # ignore/add/remove/force # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # ignore/add/remove/force # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = force # ignore/add/remove/force +sp_inside_braces_enum = force # ignore/add/remove/force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = force # ignore/add/remove/force +sp_inside_braces_struct = force # ignore/add/remove/force # Add or remove space inside '{' and '}' -sp_inside_braces = force # ignore/add/remove/force +sp_inside_braces = force # ignore/add/remove/force # Add or remove space inside '{}' -sp_inside_braces_empty = ignore # ignore/add/remove/force +sp_inside_braces_empty = ignore # ignore/add/remove/force # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = force # ignore/add/remove/force +sp_type_func = force # ignore/add/remove/force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # ignore/add/remove/force # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # ignore/add/remove/force # Add or remove space inside empty function '()' -sp_inside_fparens = ignore # ignore/add/remove/force +sp_inside_fparens = ignore # ignore/add/remove/force # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # ignore/add/remove/force # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # ignore/add/remove/force # Add or remove space between ')' and '{' of function -sp_fparen_brace = add # ignore/add/remove/force +sp_fparen_brace = add # ignore/add/remove/force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # ignore/add/remove/force # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = ignore # ignore/add/remove/force +sp_func_call_user_paren = ignore # ignore/add/remove/force # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # ignore/add/remove/force # Add or remove space between 'return' and '(' -sp_return_paren = remove # ignore/add/remove/force +sp_return_paren = remove # ignore/add/remove/force # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # ignore/add/remove/force # Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = ignore # ignore/add/remove/force +sp_defined_paren = ignore # ignore/add/remove/force # Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = ignore # ignore/add/remove/force +sp_throw_paren = ignore # ignore/add/remove/force # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # ignore/add/remove/force # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # ignore/add/remove/force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = ignore # ignore/add/remove/force +sp_else_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # ignore/add/remove/force # Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = force # ignore/add/remove/force +sp_brace_typedef = force # ignore/add/remove/force # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # ignore/add/remove/force # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # ignore/add/remove/force # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # ignore/add/remove/force # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # ignore/add/remove/force # Add or remove space before the '::' operator -sp_before_dc = remove # ignore/add/remove/force +sp_before_dc = remove # ignore/add/remove/force # Add or remove space after the '::' operator -sp_after_dc = remove # ignore/add/remove/force +sp_after_dc = remove # ignore/add/remove/force # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # ignore/add/remove/force # Add or remove space after the '!' (not) operator. -sp_not = remove # ignore/add/remove/force +sp_not = remove # ignore/add/remove/force # Add or remove space after the '~' (invert) operator. -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # ignore/add/remove/force # Add or remove space after the '&' (address-of) operator. # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # ignore/add/remove/force # Add or remove space around the '.' or '->' operators -sp_member = remove # ignore/add/remove/force +sp_member = remove # ignore/add/remove/force # Add or remove space after the '*' (dereference) operator. # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # ignore/add/remove/force # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7' -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # ignore/add/remove/force # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;' -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # ignore/add/remove/force # Add or remove space before a backslash-newline at the end of a line -sp_before_nl_cont = add # ignore/add/remove/force +sp_before_nl_cont = add # ignore/add/remove/force # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force +sp_after_oc_scope = ignore # ignore/add/remove/force # Add or remove space after the colon in message specs # '-(int) f:(int) x;' vs '-(int) f: (int) x;' -sp_after_oc_colon = ignore # ignore/add/remove/force +sp_after_oc_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in message specs # '-(int) f: (int) x;' vs '-(int) f : (int) x;' -sp_before_oc_colon = ignore # ignore/add/remove/force +sp_before_oc_colon = ignore # ignore/add/remove/force # Add or remove space after the colon in message specs # '[object setValue:1];' vs '[object setValue: 1];' -sp_after_send_oc_colon = ignore # ignore/add/remove/force +sp_after_send_oc_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in message specs # '[object setValue:1];' vs '[object setValue :1];' -sp_before_send_oc_colon = ignore # ignore/add/remove/force +sp_before_send_oc_colon = ignore # ignore/add/remove/force # Add or remove space after the (type) in message specs # '-(int) f: (int) x;' vs '-(int) f: (int)x;' -sp_after_oc_type = ignore # ignore/add/remove/force +sp_after_oc_type = ignore # ignore/add/remove/force # Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = ignore # ignore/add/remove/force +sp_cond_colon = ignore # ignore/add/remove/force # Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = ignore # ignore/add/remove/force +sp_cond_question = ignore # ignore/add/remove/force # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = remove # ignore/add/remove/force +sp_case_label = remove # ignore/add/remove/force # Control the space around the D '..' operator. -sp_range = ignore # ignore/add/remove/force +sp_range = ignore # ignore/add/remove/force # Control the space after the opening of a C++ comment '// A' vs '//A' -sp_cmt_cpp_start = ignore # ignore/add/remove/force +sp_cmt_cpp_start = ignore # ignore/add/remove/force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # false/true # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # false/true # Whether to right-align numbers -align_number_right = true # false/true +align_number_right = true # false/true # Align variable definitions in prototypes and functions -align_func_params = true # false/true +align_func_params = true # false/true # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = false # false/true +align_same_func_call_params = false # false/true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 1 # number +align_var_def_span = 1 # number # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 1 # number +align_var_def_star_style = 1 # number # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # number # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 16 # number +align_var_def_thresh = 16 # number # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # number # Whether to align the colon in struct bit fields -align_var_def_colon = true # false/true +align_var_def_colon = true # false/true # Whether to align any attribute after the variable name -align_var_def_attribute = false # false/true +align_var_def_attribute = false # false/true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = true # false/true +align_var_def_inline = true # false/true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 1 # number +align_assign_span = 1 # number # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 12 # number +align_assign_thresh = 12 # number # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 16 # number +align_enum_equ_span = 16 # number # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # number # The span for aligning struct/union (0=don't align) -align_var_struct_span = 99 # number +align_var_struct_span = 99 # number # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # number # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # number # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 3 # number +align_struct_init_span = 3 # number # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 3 # number +align_typedef_gap = 3 # number # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 5 # number +align_typedef_span = 5 # number # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # number # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # number # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typdef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # number # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 3 # number +align_right_cmt_span = 3 # number # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # false/true # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. -align_right_cmt_gap = 0 # number +align_right_cmt_gap = 0 # number # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # number # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # number # Align function protos on the 'operator' keyword instead of what follows -align_on_operator = false # false/true +align_on_operator = false # false/true # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # false/true # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true +align_single_line_func = false # false/true # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # false/true # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # number # The span for aligning ObjC msg spec (0=don't align) -align_oc_msg_spec_span = 0 # number +align_oc_msg_spec_span = 0 # number # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = true # false/true +align_nl_cont = true # false/true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 4 # number +align_pp_define_gap = 4 # number # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 3 # number +align_pp_define_span = 3 # number # Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = true # false/true +align_left_shift = true # false/true # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # false/true # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = true # false/true +nl_assign_leave_one_liners = true # false/true # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = true # false/true +nl_class_leave_one_liners = true # false/true # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = false # false/true +nl_enum_leave_one_liners = false # false/true # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # false/true # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # false/true # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # false/true # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # ignore/add/remove/force # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # number # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # ignore/add/remove/force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # number # Add or remove newline between '=' and '{' -nl_assign_brace = add # ignore/add/remove/force +nl_assign_brace = add # ignore/add/remove/force # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # ignore/add/remove/force # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # ignore/add/remove/force # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # number # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = add # ignore/add/remove/force +nl_fcall_brace = add # ignore/add/remove/force # Add or remove newline between 'enum' and '{' -nl_enum_brace = force # ignore/add/remove/force +nl_enum_brace = force # ignore/add/remove/force # Add or remove newline between 'struct and '{' -nl_struct_brace = force # ignore/add/remove/force +nl_struct_brace = force # ignore/add/remove/force # Add or remove newline between 'union' and '{' -nl_union_brace = force # ignore/add/remove/force +nl_union_brace = force # ignore/add/remove/force # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # ignore/add/remove/force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = ignore # ignore/add/remove/force +nl_elseif_brace = ignore # ignore/add/remove/force # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # ignore/add/remove/force # Add or remove newline between 'else' and 'if' -nl_else_if = ignore # ignore/add/remove/force +nl_else_if = ignore # ignore/add/remove/force # Add or remove newline between '}' and 'finally' -nl_brace_finally = ignore # ignore/add/remove/force +nl_brace_finally = ignore # ignore/add/remove/force # Add or remove newline between 'finally' and '{' -nl_finally_brace = ignore # ignore/add/remove/force +nl_finally_brace = ignore # ignore/add/remove/force # Add or remove newline between 'try' and '{' -nl_try_brace = ignore # ignore/add/remove/force +nl_try_brace = ignore # ignore/add/remove/force # Add or remove newline between get/set and '{' -nl_getset_brace = force # ignore/add/remove/force +nl_getset_brace = force # ignore/add/remove/force # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # ignore/add/remove/force # Add or remove newline between 'catch' and '{' -nl_catch_brace = ignore # ignore/add/remove/force +nl_catch_brace = ignore # ignore/add/remove/force # Add or remove newline between '}' and 'catch' -nl_brace_catch = ignore # ignore/add/remove/force +nl_brace_catch = ignore # ignore/add/remove/force # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # ignore/add/remove/force # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # ignore/add/remove/force # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # ignore/add/remove/force # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # false/true # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = true # false/true +nl_multi_line_define = true # false/true # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # false/true # Add or remove newline between ')' and 'throw' -nl_before_throw = ignore # ignore/add/remove/force +nl_before_throw = ignore # ignore/add/remove/force # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # false/true # Newline between namespace and { -nl_namespace_brace = ignore # ignore/add/remove/force +nl_namespace_brace = ignore # ignore/add/remove/force # Add or remove newline between 'template<>' and whatever follows. -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # ignore/add/remove/force # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # ignore/add/remove/force # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # ignore/add/remove/force # Add or remove newline between function scope and name in a definition # Controls the newline after '::' in 'void A::f() { }' -nl_func_scope_name = ignore # ignore/add/remove/force +nl_func_scope_name = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = ignore # ignore/add/remove/force +nl_func_proto_type_name = ignore # ignore/add/remove/force # Add or remove newline between a function name and the opening '(' -nl_func_paren = remove # ignore/add/remove/force +nl_func_paren = remove # ignore/add/remove/force # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # ignore/add/remove/force # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # ignore/add/remove/force # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # ignore/add/remove/force # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # ignore/add/remove/force # Whether to put a newline after 'return' statement -nl_after_return = true # false/true +nl_after_return = true # false/true # Add or remove a newline between the return keyword and return expression. -nl_return_expr = ignore # ignore/add/remove/force +nl_return_expr = ignore # ignore/add/remove/force # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # false/true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = true # false/true +nl_after_brace_open = true # false/true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true +nl_after_brace_open_cmt = false # false/true # Whether to put a newline after a virtual brace open. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = false # false/true +nl_after_vbrace_open = false # false/true # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. -nl_after_brace_close = true # false/true +nl_after_brace_close = true # false/true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # false/true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = true # false/true +nl_squeeze_ifdef = true # false/true # Add or remove newline before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # ignore/add/remove/force # Add or remove newline after 'if' -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # ignore/add/remove/force # Add or remove newline before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # ignore/add/remove/force # Add or remove newline after 'for' -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # ignore/add/remove/force # Add or remove newline before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # ignore/add/remove/force # Add or remove newline after 'while' -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # ignore/add/remove/force # Add or remove newline before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # ignore/add/remove/force # Add or remove newline after 'switch' -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # ignore/add/remove/force # Add or remove newline before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # ignore/add/remove/force # Add or remove newline after 'do' -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # ignore/add/remove/force # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # false/true # Whether to double-space before the close brace of a struct/union/enum -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # false/true # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # ignore/add/remove/force # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # false/true # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # false/true # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # false/true # # Positioning options # # The position of arithmetic operators in wrapped expressions -pos_arith = ignore # ignore/lead/trail +pos_arith = ignore # ignore/lead/trail # The position of assignment in wrapped expressions -pos_assign = ignore # ignore/lead/trail +pos_assign = ignore # ignore/lead/trail # The position of boolean operators in wrapped expressions -pos_bool = trail # ignore/lead/trail +pos_bool = trail # ignore/lead/trail # The position of the comma in wrapped expressions -pos_comma = ignore # ignore/lead/trail +pos_comma = ignore # ignore/lead/trail # The position of the comma in the constructor initialization list -pos_class_comma = ignore # ignore/lead/trail +pos_class_comma = ignore # ignore/lead/trail # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # ignore/lead/trail # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # number # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true +ls_for_split_full = false # false/true # Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true +ls_func_split_full = false # false/true # # Blank line options # # The maximum consecutive newlines -nl_max = 4 # number +nl_max = 4 # number # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # number # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # number # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 3 # number +nl_after_func_body = 3 # number # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 0 # number +nl_after_func_body_one_liner = 0 # number # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # number # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # number # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # number # Whether to force a newline after a mulit-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # false/true # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 0 # number +nl_before_access_spec = 0 # number # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # number # The number of newlines between a function def and the function comment. # 0 = No change. -nl_comment_func_def = 1 # number +nl_comment_func_def = 1 # number # The number of newlines after a try-catch-finally block that isn't followed by a brace close. # 0 = No change. -nl_after_try_catch_finally = 0 # number +nl_after_try_catch_finally = 0 # number # The number of newlines before and after a property, indexer or event decl. # 0 = No change. -nl_around_cs_property = 0 # number +nl_around_cs_property = 0 # number # The number of newlines between the get/set/add/remove handlers in C#. # 0 = No change. -nl_between_get_set = 0 # number +nl_between_get_set = 0 # number # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # false/true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # false/true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # ignore/add/remove/force # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # ignore/add/remove/force # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # ignore/add/remove/force # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # ignore/add/remove/force # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # number # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # ignore/add/remove/force # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = add # ignore/add/remove/force +mod_paren_on_return = add # ignore/add/remove/force # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # false/true # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = true # false/true +mod_full_paren_if_bool = true # false/true # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = true # false/true +mod_remove_extra_semicolon = true # false/true # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 0 # number +mod_add_long_function_closebrace_comment = 0 # number # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number +mod_add_long_switch_closebrace_comment = 0 # number # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # false/true # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # false/true # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # false/true # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = true # false/true +mod_move_case_break = true # false/true # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = true # false/true +mod_remove_empty_return = true # false/true # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # number # If false, disable all multi-line comment changes, including cmt_width and leading chars. # Default is true. -cmt_indent_multi = true # false/true +cmt_indent_multi = true # false/true # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # false/true # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # false/true # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # false/true # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # false/true # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # false/true # Whether to put a star on subsequent comment lines -cmt_star_cont = true # false/true +cmt_star_cont = true # false/true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # number # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # number # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true # false/true # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitue $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # string # The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment. # Will substitue $(filename) with the current file's name. -cmt_insert_file_footer = "" # string +cmt_insert_file_footer = "" # string # The filename that contains text to insert before a function implementation if the function isn't preceeded with a C/C++ comment. # Will substitue $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # string # The filename that contains text to insert before a class if the class isn't preceeded with a C/C++ comment. # Will substitue $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # string # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true +cmt_insert_before_preproc = false # false/true # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = remove # ignore/add/remove/force +pp_indent = remove # ignore/add/remove/force # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # false/true # If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. -pp_indent_count = 1 # number +pp_indent_count = 1 # number # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # ignore/add/remove/force # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # number # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # number # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # false/true # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # number # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true +pp_if_indent_code = false # false/true # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # false/true # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/mod_remove_empty_return.cfg b/tests/config/mod_remove_empty_return.cfg index 3e1bcd1f8a..0a3ecb71f7 100644 --- a/tests/config/mod_remove_empty_return.cfg +++ b/tests/config/mod_remove_empty_return.cfg @@ -1 +1 @@ -mod_remove_empty_return = true +mod_remove_empty_return = true diff --git a/tests/config/mod_remove_extra_semicolon-t.cfg b/tests/config/mod_remove_extra_semicolon-t.cfg index 0f2d524699..0b71bc60ee 100644 --- a/tests/config/mod_remove_extra_semicolon-t.cfg +++ b/tests/config/mod_remove_extra_semicolon-t.cfg @@ -1 +1 @@ -mod_remove_extra_semicolon = true \ No newline at end of file +mod_remove_extra_semicolon = true diff --git a/tests/config/mono.cfg b/tests/config/mono.cfg index c7f13b3777..ae04c514a4 100644 --- a/tests/config/mono.cfg +++ b/tests/config/mono.cfg @@ -2,33 +2,33 @@ # Mono library format # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 8 # new tab size -indent_columns = output_tab_size -indent_label = 1 # pos: absolute col, neg: relative column +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 8 # new tab size +indent_columns = output_tab_size +indent_label = 1 # pos: absolute col, neg: relative column # indent_align_string = False # align broken strings # brace_indent = 0 -indent_func_call_param = true # use indent tabstop -indent_class = true +indent_func_call_param = true # use indent tabstop +indent_class = true -nl_enum_brace = remove # "enum {" vs "enum \n {" -nl_union_brace = remove # "union {" vs "union \n {" -nl_struct_brace = remove # "struct {" vs "struct \n {" -nl_do_brace = remove # "do {" vs "do \n {" -nl_if_brace = remove # "if () {" vs "if () \n {" -nl_for_brace = remove # "for () {" vs "for () \n {" -nl_else_brace = remove # "else {" vs "else \n {" -nl_while_brace = remove # "while () {" vs "while () \n {" -nl_switch_brace = remove # "switch () {" vs "switch () \n {" -nl_func_var_def_blk = 1 -nl_before_case = 1 -nl_fcall_brace = remove # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_enum_brace = remove # "enum {" vs "enum \n {" +nl_union_brace = remove # "union {" vs "union \n {" +nl_struct_brace = remove # "struct {" vs "struct \n {" +nl_do_brace = remove # "do {" vs "do \n {" +nl_if_brace = remove # "if () {" vs "if () \n {" +nl_for_brace = remove # "for () {" vs "for () \n {" +nl_else_brace = remove # "else {" vs "else \n {" +nl_while_brace = remove # "while () {" vs "while () \n {" +nl_switch_brace = remove # "switch () {" vs "switch () \n {" +nl_func_var_def_blk = 1 +nl_before_case = 1 +nl_fcall_brace = remove # "foo() {" vs "foo()\n{" +nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" # nl_after_return = TRUE -nl_brace_while = remove -nl_brace_else = add -nl_squeeze_ifdef = TRUE +nl_brace_while = remove +nl_brace_else = add +nl_squeeze_ifdef = TRUE # mod_paren_on_return = add # "return 1;" vs "return (1);" # mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" @@ -36,31 +36,31 @@ nl_squeeze_ifdef = TRUE # mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" # mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" -sp_before_semi = remove -sp_paren_paren = remove # space between (( and )) -sp_return_paren = remove # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" -sp_inside_paren = remove -sp_inside_fparen = remove -sp_inside_sparen = remove -sp_inside_square = remove -sp_before_square = add +sp_before_semi = remove +sp_paren_paren = remove # space between (( and )) +sp_return_paren = remove # "return (1);" vs "return(1);" +sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" +sp_before_sparen = force # "if (" vs "if(" +sp_after_sparen = force # "if () {" vs "if (){" +sp_after_cast = remove # "(int) a" vs "(int)a" +sp_inside_braces = force # "{ 1 }" vs "{1}" +sp_inside_braces_struct = force # "{ 1 }" vs "{1}" +sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_inside_paren = remove +sp_inside_fparen = remove +sp_inside_sparen = remove +sp_inside_square = remove +sp_before_square = add #sp_type_func = ignore -sp_assign = force -sp_arith = force -sp_bool = force -sp_compare = force -sp_assign = force -sp_after_comma = force -sp_func_def_paren = force # "int foo (){" vs "int foo(){" -sp_func_call_paren = force # "foo (" vs "foo(" -sp_func_proto_paren = force # "int foo ();" vs "int foo();" +sp_assign = force +sp_arith = force +sp_bool = force +sp_compare = force +sp_assign = force +sp_after_comma = force +sp_func_def_paren = force # "int foo (){" vs "int foo(){" +sp_func_call_paren = force # "foo (" vs "foo(" +sp_func_proto_paren = force # "int foo ();" vs "int foo();" # align_with_tabs = FALSE # use tabs to align # align_on_tabstop = FALSE # align on tabstops @@ -68,7 +68,7 @@ sp_func_proto_paren = force # "int foo ();" vs "int foo();" # align_nl_cont = TRUE # align_var_def_span = 2 # align_var_def_inline = TRUE -align_var_def_star_style = 1 +align_var_def_star_style = 1 # align_var_def_colon = TRUE # align_assign_span = 1 # align_struct_init_span = 3 @@ -80,8 +80,8 @@ align_var_def_star_style = 1 # align_typedef_span = 5 # align_typedef_gap = 3 -cmt_star_cont = TRUE +cmt_star_cont = TRUE -eat_blanks_before_close_brace = TRUE -eat_blanks_after_open_brace = TRUE +eat_blanks_before_close_brace = TRUE +eat_blanks_after_open_brace = TRUE diff --git a/tests/config/ms-style-ref.cfg b/tests/config/ms-style-ref.cfg index c42c64c16d..29727227a4 100644 --- a/tests/config/ms-style-ref.cfg +++ b/tests/config/ms-style-ref.cfg @@ -1 +1 @@ -sp_arith=add +sp_arith = add diff --git a/tests/config/multi.cfg b/tests/config/multi.cfg index a356cfa138..08adb8781b 100644 --- a/tests/config/multi.cfg +++ b/tests/config/multi.cfg @@ -1,3 +1,3 @@ -cmt_indent_multi = false +cmt_indent_multi = false diff --git a/tests/config/multi_line_0.cfg b/tests/config/multi_line_0.cfg index 31fba08888..560f3f2cb0 100644 --- a/tests/config/multi_line_0.cfg +++ b/tests/config/multi_line_0.cfg @@ -1,2 +1,2 @@ -code_width = 70 +code_width = 70 diff --git a/tests/config/multi_line_1.cfg b/tests/config/multi_line_1.cfg index 36588904f5..3ea84de498 100644 --- a/tests/config/multi_line_1.cfg +++ b/tests/config/multi_line_1.cfg @@ -1,4 +1,4 @@ -code_width = 70 +code_width = 70 -nl_func_decl_start_multi_line = true +nl_func_decl_start_multi_line = true diff --git a/tests/config/multi_line_10.cfg b/tests/config/multi_line_10.cfg index 70dfa57e87..bc5d6fbc0a 100644 --- a/tests/config/multi_line_10.cfg +++ b/tests/config/multi_line_10.cfg @@ -1,3 +1,3 @@ -code_width = 70 -nl_func_call_end_multi_line = true +code_width = 70 +nl_func_call_end_multi_line = true diff --git a/tests/config/multi_line_2.cfg b/tests/config/multi_line_2.cfg index 8515a3cc24..977755da02 100644 --- a/tests/config/multi_line_2.cfg +++ b/tests/config/multi_line_2.cfg @@ -1,4 +1,4 @@ -code_width = 70 +code_width = 70 -nl_func_def_start_multi_line = true +nl_func_def_start_multi_line = true diff --git a/tests/config/multi_line_3.cfg b/tests/config/multi_line_3.cfg index b281ec2579..d7fb8dc19a 100644 --- a/tests/config/multi_line_3.cfg +++ b/tests/config/multi_line_3.cfg @@ -1,4 +1,4 @@ -code_width = 70 +code_width = 70 -nl_func_decl_end_multi_line = true +nl_func_decl_end_multi_line = true diff --git a/tests/config/multi_line_4.cfg b/tests/config/multi_line_4.cfg index 205740adcd..14f4637807 100644 --- a/tests/config/multi_line_4.cfg +++ b/tests/config/multi_line_4.cfg @@ -1,4 +1,4 @@ -code_width = 70 +code_width = 70 -nl_func_def_end_multi_line = true +nl_func_def_end_multi_line = true diff --git a/tests/config/multi_line_5.cfg b/tests/config/multi_line_5.cfg index b4cc2f2d06..1eab374d97 100644 --- a/tests/config/multi_line_5.cfg +++ b/tests/config/multi_line_5.cfg @@ -1,4 +1,4 @@ -code_width = 70 +code_width = 70 -nl_func_decl_args_multi_line = true +nl_func_decl_args_multi_line = true diff --git a/tests/config/multi_line_6.cfg b/tests/config/multi_line_6.cfg index 73c2c22a7a..99a31e6e28 100644 --- a/tests/config/multi_line_6.cfg +++ b/tests/config/multi_line_6.cfg @@ -1,4 +1,4 @@ -code_width = 70 +code_width = 70 -nl_func_def_args_multi_line = true +nl_func_def_args_multi_line = true diff --git a/tests/config/multi_line_7.cfg b/tests/config/multi_line_7.cfg index 887b2cc376..d22e0830b1 100644 --- a/tests/config/multi_line_7.cfg +++ b/tests/config/multi_line_7.cfg @@ -1,9 +1,9 @@ -code_width = 70 +code_width = 70 -nl_func_decl_start_multi_line = true -nl_func_def_start_multi_line = true -nl_func_decl_args_multi_line = true -nl_func_def_args_multi_line = true -nl_func_decl_end_multi_line = true -nl_func_def_end_multi_line = true +nl_func_decl_start_multi_line = true +nl_func_def_start_multi_line = true +nl_func_decl_args_multi_line = true +nl_func_def_args_multi_line = true +nl_func_decl_end_multi_line = true +nl_func_def_end_multi_line = true diff --git a/tests/config/multi_line_8.cfg b/tests/config/multi_line_8.cfg index a85bb9421c..ce931d83d7 100644 --- a/tests/config/multi_line_8.cfg +++ b/tests/config/multi_line_8.cfg @@ -1,3 +1,3 @@ -code_width = 70 -nl_func_call_start_multi_line = true +code_width = 70 +nl_func_call_start_multi_line = true diff --git a/tests/config/multi_line_9.cfg b/tests/config/multi_line_9.cfg index dc7116a32a..853185abe5 100644 --- a/tests/config/multi_line_9.cfg +++ b/tests/config/multi_line_9.cfg @@ -1,3 +1,3 @@ -code_width = 70 -nl_func_call_args_multi_line = true +code_width = 70 +nl_func_call_args_multi_line = true diff --git a/tests/config/nSolve.cfg b/tests/config/nSolve.cfg index afa170eeb8..a314e477f5 100644 --- a/tests/config/nSolve.cfg +++ b/tests/config/nSolve.cfg @@ -1,1373 +1,1373 @@ -# Uncrustify 0.49 - -# -# General options -# - -# The type of line endings -newlines = auto # auto/lf/crlf/cr - -# The original size of tabs in the input -input_tab_size = 4 # number - -# The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 4 # number - -# The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number - -# Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number - -# -# Indenting -# - -# The number of columns to indent per level. -# Usually 2, 3, 4, or 8. -indent_columns = 4 # number - -# The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents. -# For FreeBSD, this is set to 4. -indent_continue = 0 # number - -# How to use tabs when indenting code -# 0=spaces only -# 1=indent with tabs to brace level, align with spaces -# 2=indent and align with tabs, using spaces when not on a tabstop -indent_with_tabs = 0 # number - -# Comments that are not a brace level are indented with tabs on a tabstop. -# Requires indent_with_tabs=2. If false, will use spaces. -indent_cmt_with_tabs = false # false/true - -# Whether to indent strings broken by '\' so that they line up -indent_align_string = false # false/true - -# The number of spaces to indent multi-line XML strings. -# Requires indent_align_string=True -indent_xml_string = 0 # number - -# Spaces to indent '{' from level -indent_brace = 0 # number - -# Whether braces are indented to the body level -indent_braces = false # false/true - -# Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true - -# Disabled indenting class braces if indent_braces is true -indent_braces_no_class = false # false/true - -# Disabled indenting struct braces if indent_braces is true -indent_braces_no_struct = false # false/true - -# Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true - -# Whether the 'namespace' body is indented -indent_namespace = false # false/true - -# The number of spaces to indent a namespace block -indent_namespace_level = 0 # number - -# If the body of the namespace is longer than this number, it won't be indented. -# Requires indent_namespace=true. Default=0 (no limit) -indent_namespace_limit = 0 # number - -# Whether the 'extern "C"' body is indented -indent_extern = false # false/true - -# Whether the 'class' body is indented -indent_class = false # false/true - -# Whether to indent the stuff after a leading class colon -indent_class_colon = false # false/true - -# False=treat 'else\nif' as 'else if' for indenting purposes -# True=indent the 'if' one level -indent_else_if = false # false/true - -# Amount to indent variable declarations after a open brace. neg=relative, pos=absolute -indent_var_def_blk = 0 # number - -# Indent continued variable declarations instead of aligning. -indent_var_def_cont = false # false/true - -# True: indent continued function call parameters one indent level -# False: align parameters under the open paren -indent_func_call_param = false # false/true - -# Same as indent_func_call_param, but for function defs -indent_func_def_param = false # false/true - -# Same as indent_func_call_param, but for function protos -indent_func_proto_param = false # false/true - -# Same as indent_func_call_param, but for class declarations -indent_func_class_param = false # false/true - -# Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = false # false/true - -# Same as indent_func_call_param, but for templates -indent_template_param = false # false/true - -# Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true - -# Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 0 # number - -# Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 0 # number -# The number of spaces to indent a continued '->' or '.' -# Usually set to 0, 1, or indent_columns. -indent_member = 1 # number - -# Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number - -# If set, will indent trailing single line ('//') comments relative -# to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = false # false/true - -# Spaces to indent 'case' from 'switch' -# Usually 0 or indent_columns. -indent_switch_case = 4 # number - -# Spaces to shift the 'case' line, without affecting any other lines -# Usually 0. -indent_case_shift = 0 # number - -# Spaces to indent '{' from 'case'. -# By default, the brace will appear under the 'c' in case. -# Usually set to 0 or indent_columns. -indent_case_brace = 0 # number - -# Whether to indent comments found in first column -indent_col1_comment = false # false/true - -# How to indent goto labels -# >0 : absolute column where 1 is the leftmost column -# <=0 : subtract from brace indent -indent_label = 1 # number - -# Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number - -# Indent the code after an access specifier by one level. -# If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true - -# If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true - -# Controls the indent of a close paren after a newline. -# 0: Indent to body level -# 1: Align under the open paren -# 2: Indent to the brace level -indent_paren_close = 1 # number - -# Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true - -# Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true - -# If 'indent_bool_paren' is true, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones -indent_first_bool_expr = false # false/true - -# If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true - -# Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true - -# Align continued statements at the '='. Default=True -# If FALSE or the '=' is followed by a newline, the next line is indent one tab. -indent_align_assign = true # false/true - -# -# Spacing options -# - -# Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = ignore # ignore/add/remove/force - -# Add or remove space around assignment operator '=', '+=', etc -sp_assign = ignore # ignore/add/remove/force - -# Add or remove space around assignment operator '=' in a prototype -sp_assign_default = ignore # ignore/add/remove/force - -# Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. -sp_before_assign = ignore # ignore/add/remove/force - -# Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. -sp_after_assign = ignore # ignore/add/remove/force - -# Add or remove space around assignment '=' in enum -sp_enum_assign = ignore # ignore/add/remove/force - -# Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_before_assign = ignore # ignore/add/remove/force - -# Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_after_assign = ignore # ignore/add/remove/force - -# Add or remove space around preprocessor '##' concatenation operator. Default=Add -sp_pp_concat = add # ignore/add/remove/force - -# Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator. Default=Add -sp_pp_stringify = add # ignore/add/remove/force - -# Add or remove space around boolean operators '&&' and '||' -sp_bool = ignore # ignore/add/remove/force - -# Add or remove space around compare operator '<', '>', '==', etc -sp_compare = ignore # ignore/add/remove/force - -# Add or remove space inside '(' and ')' -sp_inside_paren = ignore # ignore/add/remove/force - -# Add or remove space between nested parens -sp_paren_paren = ignore # ignore/add/remove/force - -# Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true - -# Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force - -# Add or remove space before pointer star '*' -sp_before_ptr_star = ignore # ignore/add/remove/force - -# Add or remove space before pointer star '*' that isn't followed by a variable name -# If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force - -# Add or remove space between pointer stars '*' -sp_between_ptr_star = ignore # ignore/add/remove/force - -# Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = ignore # ignore/add/remove/force - -# Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = ignore # ignore/add/remove/force - -# Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = ignore # ignore/add/remove/force - -# Add or remove space before a reference sign '&' -sp_before_byref = ignore # ignore/add/remove/force - -# Add or remove space before a reference sign '&' that isn't followed by a variable name -# If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force - -# Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = ignore # ignore/add/remove/force - -# Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = ignore # ignore/add/remove/force - -# Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = ignore # ignore/add/remove/force - -# Add or remove space between type and word. Default=Force -sp_after_type = force # ignore/add/remove/force - -# Add or remove space in 'template <' vs 'template<'. -# If set to ignore, sp_before_angle is used. -sp_template_angle = force # ignore/add/remove/force - -# Add or remove space before '<>' -sp_before_angle = ignore # ignore/add/remove/force - -# Add or remove space inside '<' and '>' -sp_inside_angle = ignore # ignore/add/remove/force - -# Add or remove space after '<>' -sp_after_angle = ignore # ignore/add/remove/force - -# Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = ignore # ignore/add/remove/force - -# Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = ignore # ignore/add/remove/force - -# Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add -sp_angle_shift = add # ignore/add/remove/force - -# Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = ignore # ignore/add/remove/force - -# Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = ignore # ignore/add/remove/force - -# Add or remove space before if-condition ')'. Overrides sp_inside_sparen. -sp_inside_sparen_close = ignore # ignore/add/remove/force - -# Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = ignore # ignore/add/remove/force - -# Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = ignore # ignore/add/remove/force - -# Add or remove space between 'invariant' and '(' in the D language. -sp_invariant_paren = ignore # ignore/add/remove/force - -# Add or remove space after the ')' in 'invariant (C) c' in the D language. -sp_after_invariant_paren = ignore # ignore/add/remove/force - -# Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force - -# Add or remove space before ';'. Default=Remove -sp_before_semi = remove # ignore/add/remove/force - -# Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = ignore # ignore/add/remove/force - -# Add or remove space before a semicolon of an empty part of a for statement. -sp_before_semi_for_empty = ignore # ignore/add/remove/force - -# Add or remove space after ';', except when followed by a comment. Default=Add -sp_after_semi = add # ignore/add/remove/force - -# Add or remove space after ';' in non-empty 'for' statements. Default=Force -sp_after_semi_for = force # ignore/add/remove/force - -# Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; ). -sp_after_semi_for_empty = ignore # ignore/add/remove/force - -# Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force - -# Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force - -# Add or remove space inside '[' and ']' -sp_inside_square = ignore # ignore/add/remove/force - -# Add or remove space after ',' -sp_after_comma = ignore # ignore/add/remove/force - -# Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force - -# Add or remove space between an open paren and comma: '(,' vs '( ,' -sp_paren_comma = force # ignore/add/remove/force - -# Add or remove space before the variadic '...' when preceded by a non-punctuator -sp_before_ellipsis = ignore # ignore/add/remove/force - -# Add or remove space after class ':' -sp_after_class_colon = ignore # ignore/add/remove/force - -# Add or remove space before class ':' -sp_before_class_colon = ignore # ignore/add/remove/force - -# Add or remove space before case ':'. Default=Remove -sp_before_case_colon = remove # ignore/add/remove/force - -# Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force - -# Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = ignore # ignore/add/remove/force - -# Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = ignore # ignore/add/remove/force - -# Add or remove spaces inside cast parens -sp_inside_paren_cast = ignore # ignore/add/remove/force - -# Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = ignore # ignore/add/remove/force - -# Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = ignore # ignore/add/remove/force - -# Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force - -# Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = ignore # ignore/add/remove/force - -# Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = ignore # ignore/add/remove/force - -# Add or remove space inside '{' and '}' -sp_inside_braces = ignore # ignore/add/remove/force - -# Add or remove space inside '{}' -sp_inside_braces_empty = ignore # ignore/add/remove/force - -# Add or remove space between return type and function name -# A minimum of 1 is forced except for pointer return types. -sp_type_func = ignore # ignore/add/remove/force - -# Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = ignore # ignore/add/remove/force - -# Add or remove space between function name and '(' on function definition -sp_func_def_paren = ignore # ignore/add/remove/force - -# Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force - -# Add or remove space inside function '(' and ')' -sp_inside_fparen = ignore # ignore/add/remove/force - -# Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force - -# Add or remove space between ')' and '{' of function -sp_fparen_brace = ignore # ignore/add/remove/force - -# Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force -# Add or remove space between function name and '()' on function calls without parameters. -# If set to 'ignore' (the default), sp_func_call_paren is used. -sp_func_call_paren_empty = ignore # ignore/add/remove/force - -# Add or remove space between the user function name and '(' on function calls -# You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = ignore # ignore/add/remove/force - -# Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = ignore # ignore/add/remove/force - -# Add or remove space between 'return' and '(' -sp_return_paren = ignore # ignore/add/remove/force - -# Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force - -# Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = ignore # ignore/add/remove/force - -# Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = ignore # ignore/add/remove/force - -# Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force - -# Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force - -# Add or remove space between 'else' and '{' if on the same line -sp_else_brace = ignore # ignore/add/remove/force - -# Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force - -# Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = ignore # ignore/add/remove/force - -# Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force - -# Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force - -# Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force - -# Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force - -# Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force - -# Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force - -# Add or remove space before the '::' operator -sp_before_dc = ignore # ignore/add/remove/force - -# Add or remove space after the '::' operator -sp_after_dc = remove # ignore/add/remove/force - -# Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force - -# Add or remove space after the '!' (not) operator. Default=Remove -sp_not = remove # ignore/add/remove/force - -# Add or remove space after the '~' (invert) operator. Default=Remove -sp_inv = remove # ignore/add/remove/force - -# Add or remove space after the '&' (address-of) operator. Default=Remove -# This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force - -# Add or remove space around the '.' or '->' operators. Default=Remove -sp_member = remove # ignore/add/remove/force - -# Add or remove space after the '*' (dereference) operator. Default=Remove -# This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force - -# Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove -sp_sign = remove # ignore/add/remove/force - -# Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove -sp_incdec = remove # ignore/add/remove/force - -# Add or remove space before a backslash-newline at the end of a line. Default=Add -sp_before_nl_cont = add # ignore/add/remove/force - -# Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force - -# Add or remove space after the colon in message specs -# '-(int) f:(int) x;' vs '-(int) f: (int) x;' -sp_after_oc_colon = ignore # ignore/add/remove/force - -# Add or remove space before the colon in message specs -# '-(int) f: (int) x;' vs '-(int) f : (int) x;' -sp_before_oc_colon = ignore # ignore/add/remove/force - -# Add or remove space after the colon in message specs -# '[object setValue:1];' vs '[object setValue: 1];' -sp_after_send_oc_colon = ignore # ignore/add/remove/force - -# Add or remove space before the colon in message specs -# '[object setValue:1];' vs '[object setValue :1];' -sp_before_send_oc_colon = ignore # ignore/add/remove/force - -# Add or remove space after the (type) in message specs -# '-(int)f: (int) x;' vs '-(int)f: (int)x;' -sp_after_oc_type = ignore # ignore/add/remove/force - -# Add or remove space after the first (type) in message specs -# '-(int) f:(int)x;' vs '-(int)f:(int)x;' -sp_after_oc_return_type = ignore # ignore/add/remove/force - -# Add or remove space between '@selector' and '(' -# '@selector(msgName)' vs '@selector (msgName)' -# Also applies to @protocol() constructs -sp_after_oc_at_sel = ignore # ignore/add/remove/force - -# Add or remove space between '@selector(x)' and the following word -# '@selector(foo) a:' vs '@selector(foo)a:' -sp_after_oc_at_sel_parens = ignore # ignore/add/remove/force - -# Add or remove space inside '@selector' parens -# '@selector(foo)' vs '@selector( foo )' -# Also applies to @protocol() constructs -sp_inside_oc_at_sel_parens = ignore # ignore/add/remove/force - -# Add or remove space before a block pointer caret -# '^int (int arg){...}' vs. ' ^int (int arg){...}' -sp_before_oc_block_caret = ignore # ignore/add/remove/force - -# Add or remove space after a block pointer caret -# '^int (int arg){...}' vs. '^ int (int arg){...}' -sp_after_oc_block_caret = ignore # ignore/add/remove/force - -# Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = force # ignore/add/remove/force - -# Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = force # ignore/add/remove/force - -# Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = ignore # ignore/add/remove/force - -# Control the space around the D '..' operator. -sp_range = ignore # ignore/add/remove/force - -# Control the space after the opening of a C++ comment '// A' vs '//A' -sp_cmt_cpp_start = ignore # ignore/add/remove/force - -# Controls the spaces between #else or #endif and a trailing comment -sp_endif_cmt = ignore # ignore/add/remove/force - -# -# Code alignment (not left column spaces/tabs) -# - -# Whether to keep non-indenting tabs -align_keep_tabs = false # false/true - -# Whether to use tabs for aligning -align_with_tabs = false # false/true - -# Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true - -# Whether to right-align numbers -align_number_right = false # false/true - -# Align variable definitions in prototypes and functions -align_func_params = false # false/true - -# Align parameters in single-line functions that have the same name. -# The function names must already be aligned with each other. -align_same_func_call_params = false # false/true - -# The span for aligning variable definitions (0=don't align) -align_var_def_span = 1 # number - -# How to align the star in variable definitions. -# 0=Part of the type 'void * foo;' -# 1=Part of the variable 'void *foo;' -# 2=Dangling 'void *foo;' -align_var_def_star_style = 0 # number - -# How to align the '&' in variable definitions. -# 0=Part of the type -# 1=Part of the variable -# 2=Dangling -align_var_def_amp_style = 0 # number - -# The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number - -# The gap for aligning variable definitions -align_var_def_gap = 0 # number - -# Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true - -# Whether to align any attribute after the variable name -align_var_def_attribute = false # false/true - -# Whether to align inline struct/enum/union variable definitions -align_var_def_inline = false # false/true - -# The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 1 # number - -# The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number - -# The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 0 # number - -# The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number - -# The span for aligning struct/union (0=don't align) -align_var_struct_span = 0 # number - -# The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number - -# The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number - -# The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 0 # number - -# The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number - -# The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 0 # number - -# How to align typedef'd functions with other typedefs -# 0: Don't mix them at all -# 1: align the open paren with the types -# 2: align the function type name with the other type names -align_typedef_func = 0 # number - -# Controls the positioning of the '*' in typedefs. Just try it. -# 0: Align on typedef type, ignore '*' -# 1: The '*' is part of type name: typedef int *pint; -# 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number - -# Controls the positioning of the '&' in typedefs. Just try it. -# 0: Align on typedef type, ignore '&' -# 1: The '&' is part of type name: typedef int &pint; -# 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number - -# The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 0 # number - -# If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true - -# If a trailing comment is more than this number of columns away from the text it follows, -# it will qualify for being aligned. This has to be > 0 to do anything. -align_right_cmt_gap = 0 # number - -# Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore) -align_right_cmt_at_col = 0 # number - -# The span for aligning function prototypes (0=don't align) -align_func_proto_span = 1 # number - -# Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number - -# Align function protos on the 'operator' keyword instead of what follows -align_on_operator = false # false/true - -# Whether to mix aligning prototype and variable declarations. -# If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true - -# Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = true # false/true - -# Aligning the open brace of single-line functions. -# Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true - -# Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number - -# The span for aligning ObjC msg spec (0=don't align) -align_oc_msg_spec_span = 0 # number - -# Whether to align macros wrapped with a backslash and a newline. -# This will not work right if the macro contains a multi-line comment. -align_nl_cont = false # false/true - -# The minimum space between label and value of a preprocessor define -align_pp_define_gap = 0 # number - -# The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 0 # number - -# Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = true # false/true - -# Span for aligning parameters in an Obj-C message call on the ':' (0=don't align) -align_oc_msg_colon_span = 0 # number - -# Aligning parameters in an Obj-C '+' or '-' declaration on the ':' -align_oc_decl_colon = false # false/true - -# -# Newline adding and removing options -# - -# Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true - -# Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = false # false/true - -# Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = false # false/true - -# Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = true # false/true - -# Don't split one-line get or set functions -nl_getset_leave_one_liners = true # false/true - -# Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = true # false/true - -# Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true - -# Add or remove newlines at the start of the file -nl_start_of_file = ignore # ignore/add/remove/force - -# The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number - -# Add or remove newline at the end of the file -nl_end_of_file = ignore # ignore/add/remove/force - -# The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 0 # number - -# Add or remove newline between '=' and '{' -nl_assign_brace = ignore # ignore/add/remove/force - -# Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force - -# Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force - -# The number of blank lines after a block of variable definitions -nl_func_var_def_blk = 0 # number - -# Add or remove newline between a function call's ')' and '{', as in: -# list_for_each(item, &list) { } -nl_fcall_brace = ignore # ignore/add/remove/force - -# Add or remove newline between 'enum' and '{' -nl_enum_brace = ignore # ignore/add/remove/force - -# Add or remove newline between 'struct and '{' -nl_struct_brace = ignore # ignore/add/remove/force - -# Add or remove newline between 'union' and '{' -nl_union_brace = ignore # ignore/add/remove/force - -# Add or remove newline between 'if' and '{' -nl_if_brace = ignore # ignore/add/remove/force - -# Add or remove newline between '}' and 'else' -nl_brace_else = ignore # ignore/add/remove/force - -# Add or remove newline between 'else if' and '{' -# If set to ignore, nl_if_brace is used instead -nl_elseif_brace = ignore # ignore/add/remove/force - -# Add or remove newline between 'else' and '{' -nl_else_brace = ignore # ignore/add/remove/force - -# Add or remove newline between 'else' and 'if' -nl_else_if = ignore # ignore/add/remove/force - -# Add or remove newline between '}' and 'finally' -nl_brace_finally = ignore # ignore/add/remove/force - -# Add or remove newline between 'finally' and '{' -nl_finally_brace = ignore # ignore/add/remove/force - -# Add or remove newline between 'try' and '{' -nl_try_brace = ignore # ignore/add/remove/force - -# Add or remove newline between get/set and '{' -nl_getset_brace = ignore # ignore/add/remove/force - -# Add or remove newline between 'for' and '{' -nl_for_brace = ignore # ignore/add/remove/force - -# Add or remove newline between 'catch' and '{' -nl_catch_brace = ignore # ignore/add/remove/force - -# Add or remove newline between '}' and 'catch' -nl_brace_catch = ignore # ignore/add/remove/force - -# Add or remove newline between 'while' and '{' -nl_while_brace = ignore # ignore/add/remove/force - -# Add or remove newline between 'using' and '{' -nl_using_brace = ignore # ignore/add/remove/force - -# Add or remove newline between two open or close braces. -# Due to general newline/brace handling, REMOVE may not work. -nl_brace_brace = ignore # ignore/add/remove/force - -# Add or remove newline between 'do' and '{' -nl_do_brace = ignore # ignore/add/remove/force - -# Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = ignore # ignore/add/remove/force - -# Add or remove newline between 'switch' and '{' -nl_switch_brace = ignore # ignore/add/remove/force - -# Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. -# Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = false # false/true - -# Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = false # false/true - -# Whether to put a newline before 'case' statement -nl_before_case = false # false/true - -# Add or remove newline between ')' and 'throw' -nl_before_throw = ignore # ignore/add/remove/force - -# Whether to put a newline after 'case' statement -nl_after_case = false # false/true - -# Newline between namespace and { -nl_namespace_brace = ignore # ignore/add/remove/force - -# Add or remove newline between 'template<>' and whatever follows. -nl_template_class = ignore # ignore/add/remove/force - -# Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force - -# Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force - -# Add or remove newline between return type and function name in a function definition -nl_func_type_name = ignore # ignore/add/remove/force - -# Add or remove newline between return type and function name inside a class {} -# Uses nl_func_type_name or nl_func_proto_type_name if set to ignore. -nl_func_type_name_class = ignore # ignore/add/remove/force - -# Add or remove newline between function scope and name in a definition -# Controls the newline after '::' in 'void A::f() { }' -nl_func_scope_name = ignore # ignore/add/remove/force - -# Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = ignore # ignore/add/remove/force - -# Add or remove newline between a function name and the opening '(' -nl_func_paren = ignore # ignore/add/remove/force - -# Add or remove newline between a function name and the opening '(' in the definition -nl_func_def_paren = ignore # ignore/add/remove/force - -# Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force - -# Add or remove newline after '(' in a function definition -nl_func_def_start = ignore # ignore/add/remove/force - -# Overrides nl_func_decl_start when there is only one parameter. -nl_func_decl_start_single = ignore # ignore/add/remove/force - -# Overrides nl_func_def_start when there is only one parameter. -nl_func_def_start_single = ignore # ignore/add/remove/force - -# Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force - -# Add or remove newline after each ',' in a function definition -nl_func_def_args = ignore # ignore/add/remove/force - -# Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force - -# Add or remove newline before the ')' in a function definition -nl_func_def_end = ignore # ignore/add/remove/force - -# Overrides nl_func_decl_end when there is only one parameter. -nl_func_decl_end_single = ignore # ignore/add/remove/force - -# Overrides nl_func_def_end when there is only one parameter. -nl_func_def_end_single = ignore # ignore/add/remove/force - -# Add or remove newline between '()' in a function declaration. -nl_func_decl_empty = ignore # ignore/add/remove/force - -# Add or remove newline between '()' in a function definition. -nl_func_def_empty = ignore # ignore/add/remove/force - -# Add or remove newline between function signature and '{' -nl_fdef_brace = ignore # ignore/add/remove/force - -# Whether to put a newline after 'return' statement -nl_after_return = false # false/true - -# Add or remove a newline between the return keyword and return expression. -nl_return_expr = ignore # ignore/add/remove/force - -# Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = false # false/true - -# Whether to put a newline after brace open. -# This also adds a newline before the matching brace close. -nl_after_brace_open = false # false/true - -# If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is -# placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true - -# Whether to put a newline after a virtual brace open with a non-empty body. -# These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = false # false/true - -# Whether to put a newline after a virtual brace open with an empty body. -# These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open_empty = false # false/true - -# Whether to put a newline after a brace close. -# Does not apply if followed by a necessary ';'. -nl_after_brace_close = false # false/true - -# Whether to put a newline after a virtual brace close. -# Would add a newline before return in: 'if (foo) a++; return;' -nl_after_vbrace_close = false # false/true - -# Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true - -# Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true - -# Add or remove blank line before 'if' -nl_before_if = ignore # ignore/add/remove/force - -# Add or remove blank line after 'if' statement -nl_after_if = ignore # ignore/add/remove/force - -# Add or remove blank line before 'for' -nl_before_for = ignore # ignore/add/remove/force - -# Add or remove blank line after 'for' statement -nl_after_for = ignore # ignore/add/remove/force - -# Add or remove blank line before 'while' -nl_before_while = ignore # ignore/add/remove/force - -# Add or remove blank line after 'while' statement -nl_after_while = ignore # ignore/add/remove/force - -# Add or remove blank line before 'switch' -nl_before_switch = ignore # ignore/add/remove/force - -# Add or remove blank line after 'switch' statement -nl_after_switch = ignore # ignore/add/remove/force - -# Add or remove blank line before 'do' -nl_before_do = ignore # ignore/add/remove/force - -# Add or remove blank line after 'do/while' statement -nl_after_do = ignore # ignore/add/remove/force - -# Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true - -# Whether to double-space before the close brace of a struct/union/enum -# (lower priority than 'eat_blanks_before_close_brace') -nl_ds_struct_enum_close_brace = false # false/true - -# Add or remove a newline around a class colon. -# Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force - -# Change simple unbraced if statements into a one-liner -# 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true - -# Change simple unbraced for statements into a one-liner -# 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true - -# Change simple unbraced while statements into a one-liner -# 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true - -# -# Positioning options -# - -# The position of arithmetic operators in wrapped expressions -pos_arith = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force - -# The position of assignment in wrapped expressions. -# Do not affect '=' followed by '{' -pos_assign = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force - -# The position of boolean operators in wrapped expressions -pos_bool = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force - -# The position of comparison operators in wrapped expressions -pos_compare = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force - -# The position of conditional (b ? t : f) operators in wrapped expressions -pos_conditional = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force - -# The position of the comma in wrapped expressions -pos_comma = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force - -# The position of the comma in the constructor initialization list -pos_class_comma = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force - -# The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force - -# -# Line Splitting options -# - -# Try to limit code width to N number of columns -code_width = 0 # number - -# Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true - -# Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true - -# -# Blank line options -# - -# The maximum consecutive newlines -nl_max = 0 # number - -# The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number - -# The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 0 # number - -# The number of newlines after '}' of a multi-line function body -nl_after_func_body = 0 # number - -# The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 0 # number - -# The minimum number of newlines before a multi-line comment. -# Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 0 # number - -# The minimum number of newlines before a single-line C comment. -# Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number - -# The minimum number of newlines before a CPP comment. -# Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number - -# Whether to force a newline after a multi-line comment. -nl_after_multiline_comment = false # false/true - -# The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. -# Will not change the newline count if after a brace open. -# 0 = No change. -nl_before_access_spec = 0 # number - -# The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. -# 0 = No change. -nl_after_access_spec = 0 # number - -# The number of newlines between a function def and the function comment. -# 0 = No change. -nl_comment_func_def = 0 # number - -# The number of newlines after a try-catch-finally block that isn't followed by a brace close. -# 0 = No change. -nl_after_try_catch_finally = 0 # number - -# The number of newlines before and after a property, indexer or event decl. -# 0 = No change. -nl_around_cs_property = 0 # number - -# The number of newlines between the get/set/add/remove handlers in C#. -# 0 = No change. -nl_between_get_set = 0 # number -# Whether to remove blank lines after '{' -eat_blanks_after_open_brace = false # false/true - -# Whether to remove blank lines before '}' -eat_blanks_before_close_brace = false # false/true - -# -# Code modifying options (non-whitespace) -# - -# Add or remove braces on single-line 'do' statement -mod_full_brace_do = ignore # ignore/add/remove/force - -# Add or remove braces on single-line 'for' statement -mod_full_brace_for = ignore # ignore/add/remove/force - -# Add or remove braces on single-line function definitions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force - -# Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = ignore # ignore/add/remove/force - -# Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if. -# If any must be braced, they are all braced. If all can be unbraced, then the braces are removed. -mod_full_brace_if_chain = false # false/true - -# Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number - -# Add or remove braces on single-line 'while' statement -mod_full_brace_while = ignore # ignore/add/remove/force - -# Add or remove braces on single-line 'using ()' statement -mod_full_brace_using = ignore # ignore/add/remove/force - -# Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = ignore # ignore/add/remove/force - -# Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true - -# Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = false # false/true - -# Whether to remove superfluous semicolons -mod_remove_extra_semicolon = false # false/true - -# If a function body exceeds the specified number of newlines and doesn't have a comment after -# the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 0 # number - -# If a switch body exceeds the specified number of newlines and doesn't have a comment after -# the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number - -# If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after -# the #else, a comment will be added. -mod_add_long_ifdef_endif_comment = 0 # number - -# If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after -# the #endif, a comment will be added. -mod_add_long_ifdef_else_comment = 0 # number - -# If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true - -# If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true - -# If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] -# This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true - -# If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = false # false/true - -# Will add or remove the braces around a fully braced case statement. -# Will only remove the braces if there are no variable declarations in the block. -mod_case_brace = ignore # ignore/add/remove/force - -# If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = false # false/true - -# -# Comment modifications -# - -# Try to wrap comments at cmt_width columns -cmt_width = 0 # number - -# Set the comment reflow mode (default: 0) -# 0: no reflowing (apart from the line wrapping due to cmt_width) -# 1: no touching at all -# 2: full reflow -cmt_reflow_mode = 0 # number - -# If false, disable all multi-line comment changes, including cmt_width. keyword substitution, and leading chars. -# Default is true. -cmt_indent_multi = true # false/true - -# Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true - -# Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true - -# Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true - -# Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true - -# Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true - -# Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true - -# Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true - -# Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true - -# The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number - -# The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number - -# For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of -# the comment are the same length. Default=True -cmt_multi_check_last = true # false/true - -# The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. -# Will substitute $(filename) with the current file's name. -cmt_insert_file_header = "" # string - -# The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment. -# Will substitute $(filename) with the current file's name. -cmt_insert_file_footer = "" # string - -# The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment. -# Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. -# Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string - -# The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment. -# Will substitute $(class) with the class name. -cmt_insert_class_header = "" # string - -# If a preprocessor is encountered when stepping backwards from a function name, then -# this option decides whether the comment should be inserted. -# Affects cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true - -# -# Preprocessor options -# - -# Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = ignore # ignore/add/remove/force - -# Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true - -# If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. -pp_indent_count = 1 # number - -# Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force - -# Sets the number of spaces added with pp_space -pp_space_count = 0 # number - -# The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number - -# Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true - -# If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number - -# Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true - -# Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true - -# You can force a token to be a type with the 'type' option. -# Example: -# type myfoo1 myfoo2 -# -# You can create custom macro-based indentation using macro-open, -# macro-else and macro-close. -# Example: -# macro-open BEGIN_TEMPLATE_MESSAGE_MAP -# macro-open BEGIN_MESSAGE_MAP -# macro-close END_MESSAGE_MAP -# -# You can assign any keyword to any type with the set option. -# set func_call_user _ N_ -# -# The full syntax description of all custom definition config entries -# is shown below: -# -# define custom tokens as: -# - embed whitespace in token using '' escape character, or -# put token in quotes -# - these: ' " and ` are recognized as quote delimiters -# -# type token1 token2 token3 ... -# ^ optionally specify multiple tokens on a single line -# define def_token output_token -# ^ output_token is optional, then NULL is assumed -# macro-open token -# macro-close token -# macro-else token -# set id token1 token2 ... -# ^ optionally specify multiple tokens on a single line -# ^ id is one of the names in token_enum.h sans the CT_ prefix, -# e.g. PP_PRAGMA -# -# all tokens are separated by any mix of ',' commas, '=' equal signs -# and whitespace (space, tab) -# +# Uncrustify 0.49 + +# +# General options +# + +# The type of line endings +newlines = auto # auto/lf/crlf/cr + +# The original size of tabs in the input +input_tab_size = 4 # number + +# The size of tabs in the output (only used if align_with_tabs=true) +output_tab_size = 4 # number + +# The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn) +string_escape_char = 92 # number + +# Alternate string escape char for Pawn. Only works right before the quote char. +string_escape_char2 = 0 # number + +# +# Indenting +# + +# The number of columns to indent per level. +# Usually 2, 3, 4, or 8. +indent_columns = 4 # number + +# The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents. +# For FreeBSD, this is set to 4. +indent_continue = 0 # number + +# How to use tabs when indenting code +# 0=spaces only +# 1=indent with tabs to brace level, align with spaces +# 2=indent and align with tabs, using spaces when not on a tabstop +indent_with_tabs = 0 # number + +# Comments that are not a brace level are indented with tabs on a tabstop. +# Requires indent_with_tabs=2. If false, will use spaces. +indent_cmt_with_tabs = false # false/true + +# Whether to indent strings broken by '\' so that they line up +indent_align_string = false # false/true + +# The number of spaces to indent multi-line XML strings. +# Requires indent_align_string=True +indent_xml_string = 0 # number + +# Spaces to indent '{' from level +indent_brace = 0 # number + +# Whether braces are indented to the body level +indent_braces = false # false/true + +# Disabled indenting function braces if indent_braces is true +indent_braces_no_func = false # false/true + +# Disabled indenting class braces if indent_braces is true +indent_braces_no_class = false # false/true + +# Disabled indenting struct braces if indent_braces is true +indent_braces_no_struct = false # false/true + +# Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc. +indent_brace_parent = false # false/true + +# Whether the 'namespace' body is indented +indent_namespace = false # false/true + +# The number of spaces to indent a namespace block +indent_namespace_level = 0 # number + +# If the body of the namespace is longer than this number, it won't be indented. +# Requires indent_namespace=true. Default=0 (no limit) +indent_namespace_limit = 0 # number + +# Whether the 'extern "C"' body is indented +indent_extern = false # false/true + +# Whether the 'class' body is indented +indent_class = false # false/true + +# Whether to indent the stuff after a leading class colon +indent_class_colon = false # false/true + +# False=treat 'else\nif' as 'else if' for indenting purposes +# True=indent the 'if' one level +indent_else_if = false # false/true + +# Amount to indent variable declarations after a open brace. neg=relative, pos=absolute +indent_var_def_blk = 0 # number + +# Indent continued variable declarations instead of aligning. +indent_var_def_cont = false # false/true + +# True: indent continued function call parameters one indent level +# False: align parameters under the open paren +indent_func_call_param = false # false/true + +# Same as indent_func_call_param, but for function defs +indent_func_def_param = false # false/true + +# Same as indent_func_call_param, but for function protos +indent_func_proto_param = false # false/true + +# Same as indent_func_call_param, but for class declarations +indent_func_class_param = false # false/true + +# Same as indent_func_call_param, but for class variable constructors +indent_func_ctor_var_param = false # false/true + +# Same as indent_func_call_param, but for templates +indent_template_param = false # false/true + +# Double the indent for indent_func_xxx_param options +indent_func_param_double = false # false/true + +# Indentation column for standalone 'const' function decl/proto qualifier +indent_func_const = 0 # number + +# Indentation column for standalone 'throw' function decl/proto qualifier +indent_func_throw = 0 # number +# The number of spaces to indent a continued '->' or '.' +# Usually set to 0, 1, or indent_columns. +indent_member = 1 # number + +# Spaces to indent single line ('//') comments on lines before code +indent_sing_line_comments = 0 # number + +# If set, will indent trailing single line ('//') comments relative +# to the code instead of trying to keep the same absolute column +indent_relative_single_line_comments = false # false/true + +# Spaces to indent 'case' from 'switch' +# Usually 0 or indent_columns. +indent_switch_case = 4 # number + +# Spaces to shift the 'case' line, without affecting any other lines +# Usually 0. +indent_case_shift = 0 # number + +# Spaces to indent '{' from 'case'. +# By default, the brace will appear under the 'c' in case. +# Usually set to 0 or indent_columns. +indent_case_brace = 0 # number + +# Whether to indent comments found in first column +indent_col1_comment = false # false/true + +# How to indent goto labels +# >0 : absolute column where 1 is the leftmost column +# <=0 : subtract from brace indent +indent_label = 1 # number + +# Same as indent_label, but for access specifiers that are followed by a colon +indent_access_spec = 1 # number + +# Indent the code after an access specifier by one level. +# If set, this option forces 'indent_access_spec=0' +indent_access_spec_body = false # false/true + +# If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) +indent_paren_nl = false # false/true + +# Controls the indent of a close paren after a newline. +# 0: Indent to body level +# 1: Align under the open paren +# 2: Indent to the brace level +indent_paren_close = 1 # number + +# Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren +indent_comma_paren = false # false/true + +# Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren +indent_bool_paren = false # false/true + +# If 'indent_bool_paren' is true, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones +indent_first_bool_expr = false # false/true + +# If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) +indent_square_nl = false # false/true + +# Don't change the relative indent of ESQL/C 'EXEC SQL' bodies +indent_preserve_sql = false # false/true + +# Align continued statements at the '='. Default=True +# If FALSE or the '=' is followed by a newline, the next line is indent one tab. +indent_align_assign = true # false/true + +# +# Spacing options +# + +# Add or remove space around arithmetic operator '+', '-', '/', '*', etc +sp_arith = ignore # ignore/add/remove/force + +# Add or remove space around assignment operator '=', '+=', etc +sp_assign = ignore # ignore/add/remove/force + +# Add or remove space around assignment operator '=' in a prototype +sp_assign_default = ignore # ignore/add/remove/force + +# Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. +sp_before_assign = ignore # ignore/add/remove/force + +# Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. +sp_after_assign = ignore # ignore/add/remove/force + +# Add or remove space around assignment '=' in enum +sp_enum_assign = ignore # ignore/add/remove/force + +# Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. +sp_enum_before_assign = ignore # ignore/add/remove/force + +# Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. +sp_enum_after_assign = ignore # ignore/add/remove/force + +# Add or remove space around preprocessor '##' concatenation operator. Default=Add +sp_pp_concat = add # ignore/add/remove/force + +# Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator. Default=Add +sp_pp_stringify = add # ignore/add/remove/force + +# Add or remove space around boolean operators '&&' and '||' +sp_bool = ignore # ignore/add/remove/force + +# Add or remove space around compare operator '<', '>', '==', etc +sp_compare = ignore # ignore/add/remove/force + +# Add or remove space inside '(' and ')' +sp_inside_paren = ignore # ignore/add/remove/force + +# Add or remove space between nested parens +sp_paren_paren = ignore # ignore/add/remove/force + +# Whether to balance spaces inside nested parens +sp_balance_nested_parens = false # false/true + +# Add or remove space between ')' and '{' +sp_paren_brace = ignore # ignore/add/remove/force + +# Add or remove space before pointer star '*' +sp_before_ptr_star = ignore # ignore/add/remove/force + +# Add or remove space before pointer star '*' that isn't followed by a variable name +# If set to 'ignore', sp_before_ptr_star is used instead. +sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force + +# Add or remove space between pointer stars '*' +sp_between_ptr_star = ignore # ignore/add/remove/force + +# Add or remove space after pointer star '*', if followed by a word. +sp_after_ptr_star = ignore # ignore/add/remove/force + +# Add or remove space after a pointer star '*', if followed by a func proto/def. +sp_after_ptr_star_func = ignore # ignore/add/remove/force + +# Add or remove space before a pointer star '*', if followed by a func proto/def. +sp_before_ptr_star_func = ignore # ignore/add/remove/force + +# Add or remove space before a reference sign '&' +sp_before_byref = ignore # ignore/add/remove/force + +# Add or remove space before a reference sign '&' that isn't followed by a variable name +# If set to 'ignore', sp_before_byref is used instead. +sp_before_unnamed_byref = ignore # ignore/add/remove/force + +# Add or remove space after reference sign '&', if followed by a word. +sp_after_byref = ignore # ignore/add/remove/force + +# Add or remove space after a reference sign '&', if followed by a func proto/def. +sp_after_byref_func = ignore # ignore/add/remove/force + +# Add or remove space before a reference sign '&', if followed by a func proto/def. +sp_before_byref_func = ignore # ignore/add/remove/force + +# Add or remove space between type and word. Default=Force +sp_after_type = force # ignore/add/remove/force + +# Add or remove space in 'template <' vs 'template<'. +# If set to ignore, sp_before_angle is used. +sp_template_angle = force # ignore/add/remove/force + +# Add or remove space before '<>' +sp_before_angle = ignore # ignore/add/remove/force + +# Add or remove space inside '<' and '>' +sp_inside_angle = ignore # ignore/add/remove/force + +# Add or remove space after '<>' +sp_after_angle = ignore # ignore/add/remove/force + +# Add or remove space between '<>' and '(' as found in 'new List();' +sp_angle_paren = ignore # ignore/add/remove/force + +# Add or remove space between '<>' and a word as in 'List m;' +sp_angle_word = ignore # ignore/add/remove/force + +# Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add +sp_angle_shift = add # ignore/add/remove/force + +# Add or remove space before '(' of 'if', 'for', 'switch', and 'while' +sp_before_sparen = ignore # ignore/add/remove/force + +# Add or remove space inside if-condition '(' and ')' +sp_inside_sparen = ignore # ignore/add/remove/force + +# Add or remove space before if-condition ')'. Overrides sp_inside_sparen. +sp_inside_sparen_close = ignore # ignore/add/remove/force + +# Add or remove space after ')' of 'if', 'for', 'switch', and 'while' +sp_after_sparen = ignore # ignore/add/remove/force + +# Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' +sp_sparen_brace = ignore # ignore/add/remove/force + +# Add or remove space between 'invariant' and '(' in the D language. +sp_invariant_paren = ignore # ignore/add/remove/force + +# Add or remove space after the ')' in 'invariant (C) c' in the D language. +sp_after_invariant_paren = ignore # ignore/add/remove/force + +# Add or remove space before empty statement ';' on 'if', 'for' and 'while' +sp_special_semi = ignore # ignore/add/remove/force + +# Add or remove space before ';'. Default=Remove +sp_before_semi = remove # ignore/add/remove/force + +# Add or remove space before ';' in non-empty 'for' statements +sp_before_semi_for = ignore # ignore/add/remove/force + +# Add or remove space before a semicolon of an empty part of a for statement. +sp_before_semi_for_empty = ignore # ignore/add/remove/force + +# Add or remove space after ';', except when followed by a comment. Default=Add +sp_after_semi = add # ignore/add/remove/force + +# Add or remove space after ';' in non-empty 'for' statements. Default=Force +sp_after_semi_for = force # ignore/add/remove/force + +# Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; ). +sp_after_semi_for_empty = ignore # ignore/add/remove/force + +# Add or remove space before '[' (except '[]') +sp_before_square = ignore # ignore/add/remove/force + +# Add or remove space before '[]' +sp_before_squares = ignore # ignore/add/remove/force + +# Add or remove space inside '[' and ']' +sp_inside_square = ignore # ignore/add/remove/force + +# Add or remove space after ',' +sp_after_comma = ignore # ignore/add/remove/force + +# Add or remove space before ',' +sp_before_comma = remove # ignore/add/remove/force + +# Add or remove space between an open paren and comma: '(,' vs '( ,' +sp_paren_comma = force # ignore/add/remove/force + +# Add or remove space before the variadic '...' when preceded by a non-punctuator +sp_before_ellipsis = ignore # ignore/add/remove/force + +# Add or remove space after class ':' +sp_after_class_colon = ignore # ignore/add/remove/force + +# Add or remove space before class ':' +sp_before_class_colon = ignore # ignore/add/remove/force + +# Add or remove space before case ':'. Default=Remove +sp_before_case_colon = remove # ignore/add/remove/force + +# Add or remove space between 'operator' and operator sign +sp_after_operator = ignore # ignore/add/remove/force + +# Add or remove space between the operator symbol and the open paren, as in 'operator ++(' +sp_after_operator_sym = ignore # ignore/add/remove/force + +# Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' +sp_after_cast = ignore # ignore/add/remove/force + +# Add or remove spaces inside cast parens +sp_inside_paren_cast = ignore # ignore/add/remove/force + +# Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)' +sp_cpp_cast_paren = ignore # ignore/add/remove/force + +# Add or remove space between 'sizeof' and '(' +sp_sizeof_paren = ignore # ignore/add/remove/force + +# Add or remove space after the tag keyword (Pawn) +sp_after_tag = ignore # ignore/add/remove/force + +# Add or remove space inside enum '{' and '}' +sp_inside_braces_enum = ignore # ignore/add/remove/force + +# Add or remove space inside struct/union '{' and '}' +sp_inside_braces_struct = ignore # ignore/add/remove/force + +# Add or remove space inside '{' and '}' +sp_inside_braces = ignore # ignore/add/remove/force + +# Add or remove space inside '{}' +sp_inside_braces_empty = ignore # ignore/add/remove/force + +# Add or remove space between return type and function name +# A minimum of 1 is forced except for pointer return types. +sp_type_func = ignore # ignore/add/remove/force + +# Add or remove space between function name and '(' on function declaration +sp_func_proto_paren = ignore # ignore/add/remove/force + +# Add or remove space between function name and '(' on function definition +sp_func_def_paren = ignore # ignore/add/remove/force + +# Add or remove space inside empty function '()' +sp_inside_fparens = remove # ignore/add/remove/force + +# Add or remove space inside function '(' and ')' +sp_inside_fparen = ignore # ignore/add/remove/force + +# Add or remove space between ']' and '(' when part of a function call. +sp_square_fparen = ignore # ignore/add/remove/force + +# Add or remove space between ')' and '{' of function +sp_fparen_brace = ignore # ignore/add/remove/force + +# Add or remove space between function name and '(' on function calls +sp_func_call_paren = remove # ignore/add/remove/force +# Add or remove space between function name and '()' on function calls without parameters. +# If set to 'ignore' (the default), sp_func_call_paren is used. +sp_func_call_paren_empty = ignore # ignore/add/remove/force + +# Add or remove space between the user function name and '(' on function calls +# You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. +sp_func_call_user_paren = ignore # ignore/add/remove/force + +# Add or remove space between a constructor/destructor and the open paren +sp_func_class_paren = ignore # ignore/add/remove/force + +# Add or remove space between 'return' and '(' +sp_return_paren = ignore # ignore/add/remove/force + +# Add or remove space between '__attribute__' and '(' +sp_attribute_paren = ignore # ignore/add/remove/force + +# Add or remove space between 'defined' and '(' in '#if defined (FOO)' +sp_defined_paren = ignore # ignore/add/remove/force + +# Add or remove space between 'throw' and '(' in 'throw (something)' +sp_throw_paren = ignore # ignore/add/remove/force + +# Add or remove space between macro and value +sp_macro = ignore # ignore/add/remove/force + +# Add or remove space between macro function ')' and value +sp_macro_func = ignore # ignore/add/remove/force + +# Add or remove space between 'else' and '{' if on the same line +sp_else_brace = ignore # ignore/add/remove/force + +# Add or remove space between '}' and 'else' if on the same line +sp_brace_else = ignore # ignore/add/remove/force + +# Add or remove space between '}' and the name of a typedef on the same line +sp_brace_typedef = ignore # ignore/add/remove/force + +# Add or remove space between 'catch' and '{' if on the same line +sp_catch_brace = ignore # ignore/add/remove/force + +# Add or remove space between '}' and 'catch' if on the same line +sp_brace_catch = ignore # ignore/add/remove/force + +# Add or remove space between 'finally' and '{' if on the same line +sp_finally_brace = ignore # ignore/add/remove/force + +# Add or remove space between '}' and 'finally' if on the same line +sp_brace_finally = ignore # ignore/add/remove/force + +# Add or remove space between 'try' and '{' if on the same line +sp_try_brace = ignore # ignore/add/remove/force + +# Add or remove space between get/set and '{' if on the same line +sp_getset_brace = ignore # ignore/add/remove/force + +# Add or remove space before the '::' operator +sp_before_dc = ignore # ignore/add/remove/force + +# Add or remove space after the '::' operator +sp_after_dc = remove # ignore/add/remove/force + +# Add or remove around the D named array initializer ':' operator +sp_d_array_colon = ignore # ignore/add/remove/force + +# Add or remove space after the '!' (not) operator. Default=Remove +sp_not = remove # ignore/add/remove/force + +# Add or remove space after the '~' (invert) operator. Default=Remove +sp_inv = remove # ignore/add/remove/force + +# Add or remove space after the '&' (address-of) operator. Default=Remove +# This does not affect the spacing after a '&' that is part of a type. +sp_addr = remove # ignore/add/remove/force + +# Add or remove space around the '.' or '->' operators. Default=Remove +sp_member = remove # ignore/add/remove/force + +# Add or remove space after the '*' (dereference) operator. Default=Remove +# This does not affect the spacing after a '*' that is part of a type. +sp_deref = remove # ignore/add/remove/force + +# Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove +sp_sign = remove # ignore/add/remove/force + +# Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove +sp_incdec = remove # ignore/add/remove/force + +# Add or remove space before a backslash-newline at the end of a line. Default=Add +sp_before_nl_cont = add # ignore/add/remove/force + +# Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' +sp_after_oc_scope = ignore # ignore/add/remove/force + +# Add or remove space after the colon in message specs +# '-(int) f:(int) x;' vs '-(int) f: (int) x;' +sp_after_oc_colon = ignore # ignore/add/remove/force + +# Add or remove space before the colon in message specs +# '-(int) f: (int) x;' vs '-(int) f : (int) x;' +sp_before_oc_colon = ignore # ignore/add/remove/force + +# Add or remove space after the colon in message specs +# '[object setValue:1];' vs '[object setValue: 1];' +sp_after_send_oc_colon = ignore # ignore/add/remove/force + +# Add or remove space before the colon in message specs +# '[object setValue:1];' vs '[object setValue :1];' +sp_before_send_oc_colon = ignore # ignore/add/remove/force + +# Add or remove space after the (type) in message specs +# '-(int)f: (int) x;' vs '-(int)f: (int)x;' +sp_after_oc_type = ignore # ignore/add/remove/force + +# Add or remove space after the first (type) in message specs +# '-(int) f:(int)x;' vs '-(int)f:(int)x;' +sp_after_oc_return_type = ignore # ignore/add/remove/force + +# Add or remove space between '@selector' and '(' +# '@selector(msgName)' vs '@selector (msgName)' +# Also applies to @protocol() constructs +sp_after_oc_at_sel = ignore # ignore/add/remove/force + +# Add or remove space between '@selector(x)' and the following word +# '@selector(foo) a:' vs '@selector(foo)a:' +sp_after_oc_at_sel_parens = ignore # ignore/add/remove/force + +# Add or remove space inside '@selector' parens +# '@selector(foo)' vs '@selector( foo )' +# Also applies to @protocol() constructs +sp_inside_oc_at_sel_parens = ignore # ignore/add/remove/force + +# Add or remove space before a block pointer caret +# '^int (int arg){...}' vs. ' ^int (int arg){...}' +sp_before_oc_block_caret = ignore # ignore/add/remove/force + +# Add or remove space after a block pointer caret +# '^int (int arg){...}' vs. '^ int (int arg){...}' +sp_after_oc_block_caret = ignore # ignore/add/remove/force + +# Add or remove space around the ':' in 'b ? t : f' +sp_cond_colon = force # ignore/add/remove/force + +# Add or remove space around the '?' in 'b ? t : f' +sp_cond_question = force # ignore/add/remove/force + +# Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. +sp_case_label = ignore # ignore/add/remove/force + +# Control the space around the D '..' operator. +sp_range = ignore # ignore/add/remove/force + +# Control the space after the opening of a C++ comment '// A' vs '//A' +sp_cmt_cpp_start = ignore # ignore/add/remove/force + +# Controls the spaces between #else or #endif and a trailing comment +sp_endif_cmt = ignore # ignore/add/remove/force + +# +# Code alignment (not left column spaces/tabs) +# + +# Whether to keep non-indenting tabs +align_keep_tabs = false # false/true + +# Whether to use tabs for aligning +align_with_tabs = false # false/true + +# Whether to bump out to the next tab when aligning +align_on_tabstop = false # false/true + +# Whether to right-align numbers +align_number_right = false # false/true + +# Align variable definitions in prototypes and functions +align_func_params = false # false/true + +# Align parameters in single-line functions that have the same name. +# The function names must already be aligned with each other. +align_same_func_call_params = false # false/true + +# The span for aligning variable definitions (0=don't align) +align_var_def_span = 1 # number + +# How to align the star in variable definitions. +# 0=Part of the type 'void * foo;' +# 1=Part of the variable 'void *foo;' +# 2=Dangling 'void *foo;' +align_var_def_star_style = 0 # number + +# How to align the '&' in variable definitions. +# 0=Part of the type +# 1=Part of the variable +# 2=Dangling +align_var_def_amp_style = 0 # number + +# The threshold for aligning variable definitions (0=no limit) +align_var_def_thresh = 0 # number + +# The gap for aligning variable definitions +align_var_def_gap = 0 # number + +# Whether to align the colon in struct bit fields +align_var_def_colon = false # false/true + +# Whether to align any attribute after the variable name +align_var_def_attribute = false # false/true + +# Whether to align inline struct/enum/union variable definitions +align_var_def_inline = false # false/true + +# The span for aligning on '=' in assignments (0=don't align) +align_assign_span = 1 # number + +# The threshold for aligning on '=' in assignments (0=no limit) +align_assign_thresh = 0 # number + +# The span for aligning on '=' in enums (0=don't align) +align_enum_equ_span = 0 # number + +# The threshold for aligning on '=' in enums (0=no limit) +align_enum_equ_thresh = 0 # number + +# The span for aligning struct/union (0=don't align) +align_var_struct_span = 0 # number + +# The threshold for aligning struct/union member definitions (0=no limit) +align_var_struct_thresh = 0 # number + +# The gap for aligning struct/union member definitions +align_var_struct_gap = 0 # number + +# The span for aligning struct initializer values (0=don't align) +align_struct_init_span = 0 # number + +# The minimum space between the type and the synonym of a typedef +align_typedef_gap = 0 # number + +# The span for aligning single-line typedefs (0=don't align) +align_typedef_span = 0 # number + +# How to align typedef'd functions with other typedefs +# 0: Don't mix them at all +# 1: align the open paren with the types +# 2: align the function type name with the other type names +align_typedef_func = 0 # number + +# Controls the positioning of the '*' in typedefs. Just try it. +# 0: Align on typedef type, ignore '*' +# 1: The '*' is part of type name: typedef int *pint; +# 2: The '*' is part of the type, but dangling: typedef int *pint; +align_typedef_star_style = 0 # number + +# Controls the positioning of the '&' in typedefs. Just try it. +# 0: Align on typedef type, ignore '&' +# 1: The '&' is part of type name: typedef int &pint; +# 2: The '&' is part of the type, but dangling: typedef int &pint; +align_typedef_amp_style = 0 # number + +# The span for aligning comments that end lines (0=don't align) +align_right_cmt_span = 0 # number + +# If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment +align_right_cmt_mix = false # false/true + +# If a trailing comment is more than this number of columns away from the text it follows, +# it will qualify for being aligned. This has to be > 0 to do anything. +align_right_cmt_gap = 0 # number + +# Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore) +align_right_cmt_at_col = 0 # number + +# The span for aligning function prototypes (0=don't align) +align_func_proto_span = 1 # number + +# Minimum gap between the return type and the function name. +align_func_proto_gap = 0 # number + +# Align function protos on the 'operator' keyword instead of what follows +align_on_operator = false # false/true + +# Whether to mix aligning prototype and variable declarations. +# If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. +align_mix_var_proto = false # false/true + +# Align single-line functions with function prototypes, uses align_func_proto_span +align_single_line_func = true # false/true + +# Aligning the open brace of single-line functions. +# Requires align_single_line_func=true, uses align_func_proto_span +align_single_line_brace = false # false/true + +# Gap for align_single_line_brace. +align_single_line_brace_gap = 0 # number + +# The span for aligning ObjC msg spec (0=don't align) +align_oc_msg_spec_span = 0 # number + +# Whether to align macros wrapped with a backslash and a newline. +# This will not work right if the macro contains a multi-line comment. +align_nl_cont = false # false/true + +# The minimum space between label and value of a preprocessor define +align_pp_define_gap = 0 # number + +# The span for aligning on '#define' bodies (0=don't align) +align_pp_define_span = 0 # number + +# Align lines that start with '<<' with previous '<<'. Default=true +align_left_shift = true # false/true + +# Span for aligning parameters in an Obj-C message call on the ':' (0=don't align) +align_oc_msg_colon_span = 0 # number + +# Aligning parameters in an Obj-C '+' or '-' declaration on the ':' +align_oc_decl_colon = false # false/true + +# +# Newline adding and removing options +# + +# Whether to collapse empty blocks between '{' and '}' +nl_collapse_empty_body = false # false/true + +# Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' +nl_assign_leave_one_liners = false # false/true + +# Don't split one-line braced statements inside a class xx { } body +nl_class_leave_one_liners = false # false/true + +# Don't split one-line enums: 'enum foo { BAR = 15 };' +nl_enum_leave_one_liners = true # false/true + +# Don't split one-line get or set functions +nl_getset_leave_one_liners = true # false/true + +# Don't split one-line function definitions - 'int foo() { return 0; }' +nl_func_leave_one_liners = true # false/true + +# Don't split one-line if/else statements - 'if(a) b++;' +nl_if_leave_one_liners = false # false/true + +# Add or remove newlines at the start of the file +nl_start_of_file = ignore # ignore/add/remove/force + +# The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' +nl_start_of_file_min = 0 # number + +# Add or remove newline at the end of the file +nl_end_of_file = ignore # ignore/add/remove/force + +# The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') +nl_end_of_file_min = 0 # number + +# Add or remove newline between '=' and '{' +nl_assign_brace = ignore # ignore/add/remove/force + +# Add or remove newline between '=' and '[' (D only) +nl_assign_square = ignore # ignore/add/remove/force + +# Add or remove newline after '= [' (D only). Will also affect the newline before the ']' +nl_after_square_assign = ignore # ignore/add/remove/force + +# The number of blank lines after a block of variable definitions +nl_func_var_def_blk = 0 # number + +# Add or remove newline between a function call's ')' and '{', as in: +# list_for_each(item, &list) { } +nl_fcall_brace = ignore # ignore/add/remove/force + +# Add or remove newline between 'enum' and '{' +nl_enum_brace = ignore # ignore/add/remove/force + +# Add or remove newline between 'struct and '{' +nl_struct_brace = ignore # ignore/add/remove/force + +# Add or remove newline between 'union' and '{' +nl_union_brace = ignore # ignore/add/remove/force + +# Add or remove newline between 'if' and '{' +nl_if_brace = ignore # ignore/add/remove/force + +# Add or remove newline between '}' and 'else' +nl_brace_else = ignore # ignore/add/remove/force + +# Add or remove newline between 'else if' and '{' +# If set to ignore, nl_if_brace is used instead +nl_elseif_brace = ignore # ignore/add/remove/force + +# Add or remove newline between 'else' and '{' +nl_else_brace = ignore # ignore/add/remove/force + +# Add or remove newline between 'else' and 'if' +nl_else_if = ignore # ignore/add/remove/force + +# Add or remove newline between '}' and 'finally' +nl_brace_finally = ignore # ignore/add/remove/force + +# Add or remove newline between 'finally' and '{' +nl_finally_brace = ignore # ignore/add/remove/force + +# Add or remove newline between 'try' and '{' +nl_try_brace = ignore # ignore/add/remove/force + +# Add or remove newline between get/set and '{' +nl_getset_brace = ignore # ignore/add/remove/force + +# Add or remove newline between 'for' and '{' +nl_for_brace = ignore # ignore/add/remove/force + +# Add or remove newline between 'catch' and '{' +nl_catch_brace = ignore # ignore/add/remove/force + +# Add or remove newline between '}' and 'catch' +nl_brace_catch = ignore # ignore/add/remove/force + +# Add or remove newline between 'while' and '{' +nl_while_brace = ignore # ignore/add/remove/force + +# Add or remove newline between 'using' and '{' +nl_using_brace = ignore # ignore/add/remove/force + +# Add or remove newline between two open or close braces. +# Due to general newline/brace handling, REMOVE may not work. +nl_brace_brace = ignore # ignore/add/remove/force + +# Add or remove newline between 'do' and '{' +nl_do_brace = ignore # ignore/add/remove/force + +# Add or remove newline between '}' and 'while' of 'do' statement +nl_brace_while = ignore # ignore/add/remove/force + +# Add or remove newline between 'switch' and '{' +nl_switch_brace = ignore # ignore/add/remove/force + +# Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. +# Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. +nl_multi_line_cond = false # false/true + +# Force a newline in a define after the macro name for multi-line defines. +nl_multi_line_define = false # false/true + +# Whether to put a newline before 'case' statement +nl_before_case = false # false/true + +# Add or remove newline between ')' and 'throw' +nl_before_throw = ignore # ignore/add/remove/force + +# Whether to put a newline after 'case' statement +nl_after_case = false # false/true + +# Newline between namespace and { +nl_namespace_brace = ignore # ignore/add/remove/force + +# Add or remove newline between 'template<>' and whatever follows. +nl_template_class = ignore # ignore/add/remove/force + +# Add or remove newline between 'class' and '{' +nl_class_brace = ignore # ignore/add/remove/force + +# Add or remove newline after each ',' in the constructor member initialization +nl_class_init_args = ignore # ignore/add/remove/force + +# Add or remove newline between return type and function name in a function definition +nl_func_type_name = ignore # ignore/add/remove/force + +# Add or remove newline between return type and function name inside a class {} +# Uses nl_func_type_name or nl_func_proto_type_name if set to ignore. +nl_func_type_name_class = ignore # ignore/add/remove/force + +# Add or remove newline between function scope and name in a definition +# Controls the newline after '::' in 'void A::f() { }' +nl_func_scope_name = ignore # ignore/add/remove/force + +# Add or remove newline between return type and function name in a prototype +nl_func_proto_type_name = ignore # ignore/add/remove/force + +# Add or remove newline between a function name and the opening '(' +nl_func_paren = ignore # ignore/add/remove/force + +# Add or remove newline between a function name and the opening '(' in the definition +nl_func_def_paren = ignore # ignore/add/remove/force + +# Add or remove newline after '(' in a function declaration +nl_func_decl_start = ignore # ignore/add/remove/force + +# Add or remove newline after '(' in a function definition +nl_func_def_start = ignore # ignore/add/remove/force + +# Overrides nl_func_decl_start when there is only one parameter. +nl_func_decl_start_single = ignore # ignore/add/remove/force + +# Overrides nl_func_def_start when there is only one parameter. +nl_func_def_start_single = ignore # ignore/add/remove/force + +# Add or remove newline after each ',' in a function declaration +nl_func_decl_args = ignore # ignore/add/remove/force + +# Add or remove newline after each ',' in a function definition +nl_func_def_args = ignore # ignore/add/remove/force + +# Add or remove newline before the ')' in a function declaration +nl_func_decl_end = ignore # ignore/add/remove/force + +# Add or remove newline before the ')' in a function definition +nl_func_def_end = ignore # ignore/add/remove/force + +# Overrides nl_func_decl_end when there is only one parameter. +nl_func_decl_end_single = ignore # ignore/add/remove/force + +# Overrides nl_func_def_end when there is only one parameter. +nl_func_def_end_single = ignore # ignore/add/remove/force + +# Add or remove newline between '()' in a function declaration. +nl_func_decl_empty = ignore # ignore/add/remove/force + +# Add or remove newline between '()' in a function definition. +nl_func_def_empty = ignore # ignore/add/remove/force + +# Add or remove newline between function signature and '{' +nl_fdef_brace = ignore # ignore/add/remove/force + +# Whether to put a newline after 'return' statement +nl_after_return = false # false/true + +# Add or remove a newline between the return keyword and return expression. +nl_return_expr = ignore # ignore/add/remove/force + +# Whether to put a newline after semicolons, except in 'for' statements +nl_after_semicolon = false # false/true + +# Whether to put a newline after brace open. +# This also adds a newline before the matching brace close. +nl_after_brace_open = false # false/true + +# If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is +# placed between the open brace and a trailing single-line comment. +nl_after_brace_open_cmt = false # false/true + +# Whether to put a newline after a virtual brace open with a non-empty body. +# These occur in un-braced if/while/do/for statement bodies. +nl_after_vbrace_open = false # false/true + +# Whether to put a newline after a virtual brace open with an empty body. +# These occur in un-braced if/while/do/for statement bodies. +nl_after_vbrace_open_empty = false # false/true + +# Whether to put a newline after a brace close. +# Does not apply if followed by a necessary ';'. +nl_after_brace_close = false # false/true + +# Whether to put a newline after a virtual brace close. +# Would add a newline before return in: 'if (foo) a++; return;' +nl_after_vbrace_close = false # false/true + +# Whether to alter newlines in '#define' macros +nl_define_macro = false # false/true + +# Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' +nl_squeeze_ifdef = false # false/true + +# Add or remove blank line before 'if' +nl_before_if = ignore # ignore/add/remove/force + +# Add or remove blank line after 'if' statement +nl_after_if = ignore # ignore/add/remove/force + +# Add or remove blank line before 'for' +nl_before_for = ignore # ignore/add/remove/force + +# Add or remove blank line after 'for' statement +nl_after_for = ignore # ignore/add/remove/force + +# Add or remove blank line before 'while' +nl_before_while = ignore # ignore/add/remove/force + +# Add or remove blank line after 'while' statement +nl_after_while = ignore # ignore/add/remove/force + +# Add or remove blank line before 'switch' +nl_before_switch = ignore # ignore/add/remove/force + +# Add or remove blank line after 'switch' statement +nl_after_switch = ignore # ignore/add/remove/force + +# Add or remove blank line before 'do' +nl_before_do = ignore # ignore/add/remove/force + +# Add or remove blank line after 'do/while' statement +nl_after_do = ignore # ignore/add/remove/force + +# Whether to double-space commented-entries in struct/enum +nl_ds_struct_enum_cmt = false # false/true + +# Whether to double-space before the close brace of a struct/union/enum +# (lower priority than 'eat_blanks_before_close_brace') +nl_ds_struct_enum_close_brace = false # false/true + +# Add or remove a newline around a class colon. +# Related to pos_class_colon, nl_class_init_args, and pos_comma. +nl_class_colon = ignore # ignore/add/remove/force + +# Change simple unbraced if statements into a one-liner +# 'if(b)\n i++;' => 'if(b) i++;' +nl_create_if_one_liner = false # false/true + +# Change simple unbraced for statements into a one-liner +# 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' +nl_create_for_one_liner = false # false/true + +# Change simple unbraced while statements into a one-liner +# 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' +nl_create_while_one_liner = false # false/true + +# +# Positioning options +# + +# The position of arithmetic operators in wrapped expressions +pos_arith = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force + +# The position of assignment in wrapped expressions. +# Do not affect '=' followed by '{' +pos_assign = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force + +# The position of boolean operators in wrapped expressions +pos_bool = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force + +# The position of comparison operators in wrapped expressions +pos_compare = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force + +# The position of conditional (b ? t : f) operators in wrapped expressions +pos_conditional = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force + +# The position of the comma in wrapped expressions +pos_comma = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force + +# The position of the comma in the constructor initialization list +pos_class_comma = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force + +# The position of colons between constructor and member initialization +pos_class_colon = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force + +# +# Line Splitting options +# + +# Try to limit code width to N number of columns +code_width = 0 # number + +# Whether to fully split long 'for' statements at semi-colons +ls_for_split_full = false # false/true + +# Whether to fully split long function protos/calls at commas +ls_func_split_full = false # false/true + +# +# Blank line options +# + +# The maximum consecutive newlines +nl_max = 0 # number + +# The number of newlines after a function prototype, if followed by another function prototype +nl_after_func_proto = 0 # number + +# The number of newlines after a function prototype, if not followed by another function prototype +nl_after_func_proto_group = 0 # number + +# The number of newlines after '}' of a multi-line function body +nl_after_func_body = 0 # number + +# The number of newlines after '}' of a single line function body +nl_after_func_body_one_liner = 0 # number + +# The minimum number of newlines before a multi-line comment. +# Doesn't apply if after a brace open or another multi-line comment. +nl_before_block_comment = 0 # number + +# The minimum number of newlines before a single-line C comment. +# Doesn't apply if after a brace open or other single-line C comments. +nl_before_c_comment = 0 # number + +# The minimum number of newlines before a CPP comment. +# Doesn't apply if after a brace open or other CPP comments. +nl_before_cpp_comment = 0 # number + +# Whether to force a newline after a multi-line comment. +nl_after_multiline_comment = false # false/true + +# The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. +# Will not change the newline count if after a brace open. +# 0 = No change. +nl_before_access_spec = 0 # number + +# The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. +# 0 = No change. +nl_after_access_spec = 0 # number + +# The number of newlines between a function def and the function comment. +# 0 = No change. +nl_comment_func_def = 0 # number + +# The number of newlines after a try-catch-finally block that isn't followed by a brace close. +# 0 = No change. +nl_after_try_catch_finally = 0 # number + +# The number of newlines before and after a property, indexer or event decl. +# 0 = No change. +nl_around_cs_property = 0 # number + +# The number of newlines between the get/set/add/remove handlers in C#. +# 0 = No change. +nl_between_get_set = 0 # number +# Whether to remove blank lines after '{' +eat_blanks_after_open_brace = false # false/true + +# Whether to remove blank lines before '}' +eat_blanks_before_close_brace = false # false/true + +# +# Code modifying options (non-whitespace) +# + +# Add or remove braces on single-line 'do' statement +mod_full_brace_do = ignore # ignore/add/remove/force + +# Add or remove braces on single-line 'for' statement +mod_full_brace_for = ignore # ignore/add/remove/force + +# Add or remove braces on single-line function definitions. (Pawn) +mod_full_brace_function = ignore # ignore/add/remove/force + +# Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. +mod_full_brace_if = ignore # ignore/add/remove/force + +# Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if. +# If any must be braced, they are all braced. If all can be unbraced, then the braces are removed. +mod_full_brace_if_chain = false # false/true + +# Don't remove braces around statements that span N newlines +mod_full_brace_nl = 0 # number + +# Add or remove braces on single-line 'while' statement +mod_full_brace_while = ignore # ignore/add/remove/force + +# Add or remove braces on single-line 'using ()' statement +mod_full_brace_using = ignore # ignore/add/remove/force + +# Add or remove unnecessary paren on 'return' statement +mod_paren_on_return = ignore # ignore/add/remove/force + +# Whether to change optional semicolons to real semicolons +mod_pawn_semicolon = false # false/true + +# Add parens on 'while' and 'if' statement around bools +mod_full_paren_if_bool = false # false/true + +# Whether to remove superfluous semicolons +mod_remove_extra_semicolon = false # false/true + +# If a function body exceeds the specified number of newlines and doesn't have a comment after +# the close brace, a comment will be added. +mod_add_long_function_closebrace_comment = 0 # number + +# If a switch body exceeds the specified number of newlines and doesn't have a comment after +# the close brace, a comment will be added. +mod_add_long_switch_closebrace_comment = 0 # number + +# If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after +# the #else, a comment will be added. +mod_add_long_ifdef_endif_comment = 0 # number + +# If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after +# the #endif, a comment will be added. +mod_add_long_ifdef_else_comment = 0 # number + +# If TRUE, will sort consecutive single-line 'import' statements [Java, D] +mod_sort_import = false # false/true + +# If TRUE, will sort consecutive single-line 'using' statements [C#] +mod_sort_using = false # false/true + +# If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] +# This is generally a bad idea, as it may break your code. +mod_sort_include = false # false/true + +# If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. +mod_move_case_break = false # false/true + +# Will add or remove the braces around a fully braced case statement. +# Will only remove the braces if there are no variable declarations in the block. +mod_case_brace = ignore # ignore/add/remove/force + +# If TRUE, it will remove a void 'return;' that appears as the last statement in a function. +mod_remove_empty_return = false # false/true + +# +# Comment modifications +# + +# Try to wrap comments at cmt_width columns +cmt_width = 0 # number + +# Set the comment reflow mode (default: 0) +# 0: no reflowing (apart from the line wrapping due to cmt_width) +# 1: no touching at all +# 2: full reflow +cmt_reflow_mode = 0 # number + +# If false, disable all multi-line comment changes, including cmt_width. keyword substitution, and leading chars. +# Default is true. +cmt_indent_multi = true # false/true + +# Whether to group c-comments that look like they are in a block +cmt_c_group = false # false/true + +# Whether to put an empty '/*' on the first line of the combined c-comment +cmt_c_nl_start = false # false/true + +# Whether to put a newline before the closing '*/' of the combined c-comment +cmt_c_nl_end = false # false/true + +# Whether to group cpp-comments that look like they are in a block +cmt_cpp_group = false # false/true + +# Whether to put an empty '/*' on the first line of the combined cpp-comment +cmt_cpp_nl_start = false # false/true + +# Whether to put a newline before the closing '*/' of the combined cpp-comment +cmt_cpp_nl_end = false # false/true + +# Whether to change cpp-comments into c-comments +cmt_cpp_to_c = false # false/true + +# Whether to put a star on subsequent comment lines +cmt_star_cont = false # false/true + +# The number of spaces to insert at the start of subsequent comment lines +cmt_sp_before_star_cont = 0 # number + +# The number of spaces to insert after the star on subsequent comment lines +cmt_sp_after_star_cont = 0 # number + +# For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of +# the comment are the same length. Default=True +cmt_multi_check_last = true # false/true + +# The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. +# Will substitute $(filename) with the current file's name. +cmt_insert_file_header = "" # string + +# The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment. +# Will substitute $(filename) with the current file's name. +cmt_insert_file_footer = "" # string + +# The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment. +# Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. +# Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } +cmt_insert_func_header = "" # string + +# The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment. +# Will substitute $(class) with the class name. +cmt_insert_class_header = "" # string + +# If a preprocessor is encountered when stepping backwards from a function name, then +# this option decides whether the comment should be inserted. +# Affects cmt_insert_func_header and cmt_insert_class_header. +cmt_insert_before_preproc = false # false/true + +# +# Preprocessor options +# + +# Control indent of preprocessors inside #if blocks at brace level 0 +pp_indent = ignore # ignore/add/remove/force + +# Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) +pp_indent_at_level = false # false/true + +# If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. +pp_indent_count = 1 # number + +# Add or remove space after # based on pp_level of #if blocks +pp_space = ignore # ignore/add/remove/force + +# Sets the number of spaces added with pp_space +pp_space_count = 0 # number + +# The indent for #region and #endregion in C# and '#pragma region' in C/C++ +pp_indent_region = 0 # number + +# Whether to indent the code between #region and #endregion +pp_region_indent_code = false # false/true + +# If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level +pp_indent_if = 0 # number + +# Control whether to indent the code between #if, #else and #endif when not at file-level +pp_if_indent_code = false # false/true + +# Whether to indent '#define' at the brace level (true) or from column 1 (false) +pp_define_at_level = false # false/true + +# You can force a token to be a type with the 'type' option. +# Example: +# type myfoo1 myfoo2 +# +# You can create custom macro-based indentation using macro-open, +# macro-else and macro-close. +# Example: +# macro-open BEGIN_TEMPLATE_MESSAGE_MAP +# macro-open BEGIN_MESSAGE_MAP +# macro-close END_MESSAGE_MAP +# +# You can assign any keyword to any type with the set option. +# set func_call_user _ N_ +# +# The full syntax description of all custom definition config entries +# is shown below: +# +# define custom tokens as: +# - embed whitespace in token using '' escape character, or +# put token in quotes +# - these: ' " and ` are recognized as quote delimiters +# +# type token1 token2 token3 ... +# ^ optionally specify multiple tokens on a single line +# define def_token output_token +# ^ output_token is optional, then NULL is assumed +# macro-open token +# macro-close token +# macro-else token +# set id token1 token2 ... +# ^ optionally specify multiple tokens on a single line +# ^ id is one of the names in token_enum.h sans the CT_ prefix, +# e.g. PP_PRAGMA +# +# all tokens are separated by any mix of ',' commas, '=' equal signs +# and whitespace (space, tab) +# diff --git a/tests/config/namespace_namespace.cfg b/tests/config/namespace_namespace.cfg index 5b9c20afb1..cd8aa0892f 100644 --- a/tests/config/namespace_namespace.cfg +++ b/tests/config/namespace_namespace.cfg @@ -1 +1 @@ -indent_token_after_brace = false +indent_token_after_brace = false diff --git a/tests/config/negative_indent.cfg b/tests/config/negative_indent.cfg index cab17fec2f..2f7f6a04d6 100644 --- a/tests/config/negative_indent.cfg +++ b/tests/config/negative_indent.cfg @@ -1,30 +1,30 @@ -output_tab_size = 8 -indent_with_tabs = 0 -indent_columns = 4 -indent_continue = 4 - -nl_after_class = 1 -nl_before_access_spec = 2 -nl_after_access_spec = 1 -nl_class_colon = remove -nl_class_init_args = force -nl_constr_colon = force - -indent_class = true -indent_class_colon = true -indent_class_on_colon = false -indent_constr_colon = true - -indent_ctor_init = -2 -indent_access_spec = -2 - -sp_after_class_colon = force -sp_before_class_colon = force -sp_after_constr_colon = force -sp_before_constr_colon = force - -pos_comma = trail -pos_class_comma = trail -pos_constr_comma = trail -pos_class_colon = lead -pos_constr_colon = lead +output_tab_size = 8 +indent_with_tabs = 0 +indent_columns = 4 +indent_continue = 4 + +nl_after_class = 1 +nl_before_access_spec = 2 +nl_after_access_spec = 1 +nl_class_colon = remove +nl_class_init_args = force +nl_constr_colon = force + +indent_class = true +indent_class_colon = true +indent_class_on_colon = false +indent_constr_colon = true + +indent_ctor_init = -2 +indent_access_spec = -2 + +sp_after_class_colon = force +sp_before_class_colon = force +sp_after_constr_colon = force +sp_before_constr_colon = force + +pos_comma = trail +pos_class_comma = trail +pos_constr_comma = trail +pos_class_colon = lead +pos_constr_colon = lead diff --git a/tests/config/nepenthes.cfg b/tests/config/nepenthes.cfg index 4376fa548a..951f4ee9d3 100644 --- a/tests/config/nepenthes.cfg +++ b/tests/config/nepenthes.cfg @@ -5,19 +5,19 @@ # # The type of line endings -newlines = auto # auto/lf/crlf/cr +newlines = auto # auto/lf/crlf/cr # The original size of tabs in the input -input_tab_size = 4 # number +input_tab_size = 4 # number # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 4 # number +output_tab_size = 4 # number # The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # number # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # number # # Indenting @@ -25,1214 +25,1214 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 4 # number +indent_columns = 4 # number # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 2 # number +indent_with_tabs = 2 # number # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # false/true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # number # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # number # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # false/true # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # false/true # Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # false/true # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # false/true # The number of spaces to indent a namespace block -indent_namespace_level = 0 # number +indent_namespace_level = 0 # number # If the body of the namespace is longer than this number, it won't be indented. # Requires indent_namespace=true. Default=0 (no limit) -indent_namespace_limit = 0 # number +indent_namespace_limit = 0 # number # Whether the 'extern "C"' body is indented -indent_extern = false # false/true +indent_extern = false # false/true # Whether the 'class' body is indented -indent_class = false # false/true +indent_class = false # false/true # Whether to indent the stuff after a leading class colon -indent_class_colon = false # false/true +indent_class_colon = false # false/true # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level -indent_else_if = false # false/true +indent_else_if = false # false/true # Amount to indent variable declarations after a open brace. neg=relative, pos=absolute -indent_var_def_blk = 0 # number +indent_var_def_blk = 0 # number # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = false # false/true +indent_func_call_param = false # false/true # Same as indent_func_call_param, but for function defs -indent_func_def_param = false # false/true +indent_func_def_param = false # false/true # Same as indent_func_call_param, but for function protos -indent_func_proto_param = false # false/true +indent_func_proto_param = false # false/true # Same as indent_func_call_param, but for class declarations -indent_func_class_param = false # false/true +indent_func_class_param = false # false/true # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = false # false/true +indent_func_ctor_var_param = false # false/true # Same as indent_func_call_param, but for templates -indent_template_param = false # false/true +indent_template_param = false # false/true # Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true +indent_func_param_double = false # false/true # Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 0 # number +indent_func_const = 0 # number # Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 0 # number +indent_func_throw = 0 # number # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 0 # number +indent_member = 0 # number # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # number # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = false # false/true +indent_relative_single_line_comments = false # false/true # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 0 # number +indent_switch_case = 0 # number # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # number # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 0 # number +indent_case_brace = 0 # number # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # false/true # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # number # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # number # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # false/true # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # false/true # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 0 # number +indent_paren_close = 0 # number # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # false/true # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # false/true # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # false/true # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # false/true # Align continued statements at the '='. Default=True # If FALSE or the '=' is followed by a newline, the next line is indent one tab. -indent_align_assign = true # false/true +indent_align_assign = true # false/true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = ignore # ignore/add/remove/force +sp_arith = ignore # ignore/add/remove/force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = ignore # ignore/add/remove/force +sp_assign = ignore # ignore/add/remove/force # Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. -sp_before_assign = ignore # ignore/add/remove/force +sp_before_assign = ignore # ignore/add/remove/force # Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. -sp_after_assign = ignore # ignore/add/remove/force +sp_after_assign = ignore # ignore/add/remove/force # Add or remove space around assignment '=' in enum -sp_enum_assign = ignore # ignore/add/remove/force +sp_enum_assign = ignore # ignore/add/remove/force # Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_before_assign = ignore # ignore/add/remove/force +sp_enum_before_assign = ignore # ignore/add/remove/force # Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_after_assign = ignore # ignore/add/remove/force +sp_enum_after_assign = ignore # ignore/add/remove/force # Add or remove space around preprocessor '##' concatenation operator. Default=Add -sp_pp_concat = add # ignore/add/remove/force +sp_pp_concat = add # ignore/add/remove/force # Add or remove space after preprocessor '#' stringify operator. Default=Add -sp_pp_stringify = add # ignore/add/remove/force +sp_pp_stringify = add # ignore/add/remove/force # Add or remove space around boolean operators '&&' and '||' -sp_bool = ignore # ignore/add/remove/force +sp_bool = ignore # ignore/add/remove/force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = ignore # ignore/add/remove/force +sp_compare = ignore # ignore/add/remove/force # Add or remove space inside '(' and ')' -sp_inside_paren = ignore # ignore/add/remove/force +sp_inside_paren = ignore # ignore/add/remove/force # Add or remove space between nested parens -sp_paren_paren = ignore # ignore/add/remove/force +sp_paren_paren = ignore # ignore/add/remove/force # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # false/true # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # ignore/add/remove/force # Add or remove space before pointer star '*' -sp_before_ptr_star = ignore # ignore/add/remove/force +sp_before_ptr_star = ignore # ignore/add/remove/force # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force +sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force # Add or remove space between pointer stars '*' -sp_between_ptr_star = ignore # ignore/add/remove/force +sp_between_ptr_star = ignore # ignore/add/remove/force # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = ignore # ignore/add/remove/force +sp_after_ptr_star = ignore # ignore/add/remove/force # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = ignore # ignore/add/remove/force +sp_after_ptr_star_func = ignore # ignore/add/remove/force # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = ignore # ignore/add/remove/force +sp_before_ptr_star_func = ignore # ignore/add/remove/force # Add or remove space before a reference sign '&' -sp_before_byref = ignore # ignore/add/remove/force +sp_before_byref = ignore # ignore/add/remove/force # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force +sp_before_unnamed_byref = ignore # ignore/add/remove/force # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = ignore # ignore/add/remove/force +sp_after_byref = ignore # ignore/add/remove/force # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = ignore # ignore/add/remove/force +sp_after_byref_func = ignore # ignore/add/remove/force # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = ignore # ignore/add/remove/force +sp_before_byref_func = ignore # ignore/add/remove/force # Add or remove space between type and word. Default=Force -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # ignore/add/remove/force # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. -sp_template_angle = ignore # ignore/add/remove/force +sp_template_angle = ignore # ignore/add/remove/force # Add or remove space before '<>' -sp_before_angle = ignore # ignore/add/remove/force +sp_before_angle = ignore # ignore/add/remove/force # Add or remove space inside '<' and '>' -sp_inside_angle = ignore # ignore/add/remove/force +sp_inside_angle = ignore # ignore/add/remove/force # Add or remove space after '<>' -sp_after_angle = ignore # ignore/add/remove/force +sp_after_angle = ignore # ignore/add/remove/force # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = ignore # ignore/add/remove/force +sp_angle_paren = ignore # ignore/add/remove/force # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = ignore # ignore/add/remove/force +sp_angle_word = ignore # ignore/add/remove/force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = ignore # ignore/add/remove/force +sp_before_sparen = ignore # ignore/add/remove/force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = ignore # ignore/add/remove/force +sp_inside_sparen = ignore # ignore/add/remove/force # Add or remove space before if-condition ')'. Overrides sp_inside_sparen. -sp_inside_sparen_close = ignore # ignore/add/remove/force +sp_inside_sparen_close = ignore # ignore/add/remove/force # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = ignore # ignore/add/remove/force +sp_after_sparen = ignore # ignore/add/remove/force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = remove # ignore/add/remove/force +sp_sparen_brace = remove # ignore/add/remove/force # Add or remove space between 'invariant' and '(' in the D language. -sp_invariant_paren = ignore # ignore/add/remove/force +sp_invariant_paren = ignore # ignore/add/remove/force # Add or remove space after the ')' in 'invariant (C) c' in the D language. -sp_after_invariant_paren = ignore # ignore/add/remove/force +sp_after_invariant_paren = ignore # ignore/add/remove/force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # ignore/add/remove/force # Add or remove space before ';'. Default=Remove -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # ignore/add/remove/force # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = remove # ignore/add/remove/force +sp_before_semi_for = remove # ignore/add/remove/force # Add or remove space before a semicolon of an empty part of a for statement. -sp_before_semi_for_empty = ignore # ignore/add/remove/force +sp_before_semi_for_empty = ignore # ignore/add/remove/force # Add or remove space after ';', except when followed by a comment. Default=Add -sp_after_semi = add # ignore/add/remove/force +sp_after_semi = add # ignore/add/remove/force # Add or remove space after ';' in non-empty 'for' statements. Default=Force -sp_after_semi_for = force # ignore/add/remove/force +sp_after_semi_for = force # ignore/add/remove/force # Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; ). -sp_after_semi_for_empty = ignore # ignore/add/remove/force +sp_after_semi_for_empty = ignore # ignore/add/remove/force # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # ignore/add/remove/force # Add or remove space before '[]' -sp_before_squares = remove # ignore/add/remove/force +sp_before_squares = remove # ignore/add/remove/force # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # ignore/add/remove/force # Add or remove space after ',' -sp_after_comma = add # ignore/add/remove/force +sp_after_comma = add # ignore/add/remove/force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # ignore/add/remove/force # Add or remove space before the variadic '...' -sp_before_ellipsis = add # ignore/add/remove/force +sp_before_ellipsis = add # ignore/add/remove/force # Add or remove space after class ':' -sp_after_class_colon = ignore # ignore/add/remove/force +sp_after_class_colon = ignore # ignore/add/remove/force # Add or remove space before class ':' -sp_before_class_colon = ignore # ignore/add/remove/force +sp_before_class_colon = ignore # ignore/add/remove/force # Add or remove space before case ':'. Default=Remove -sp_before_case_colon = remove # ignore/add/remove/force +sp_before_case_colon = remove # ignore/add/remove/force # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # ignore/add/remove/force # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = ignore # ignore/add/remove/force +sp_after_operator_sym = ignore # ignore/add/remove/force # Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = ignore # ignore/add/remove/force +sp_after_cast = ignore # ignore/add/remove/force # Add or remove spaces inside cast parens -sp_inside_paren_cast = ignore # ignore/add/remove/force +sp_inside_paren_cast = ignore # ignore/add/remove/force # Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = remove # ignore/add/remove/force +sp_cpp_cast_paren = remove # ignore/add/remove/force # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # ignore/add/remove/force # Add or remove space after the tag keyword (Pawn) -sp_after_tag = remove # ignore/add/remove/force +sp_after_tag = remove # ignore/add/remove/force # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = remove # ignore/add/remove/force +sp_inside_braces_enum = remove # ignore/add/remove/force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = remove # ignore/add/remove/force +sp_inside_braces_struct = remove # ignore/add/remove/force # Add or remove space inside '{' and '}' -sp_inside_braces = remove # ignore/add/remove/force +sp_inside_braces = remove # ignore/add/remove/force # Add or remove space inside '{}' -sp_inside_braces_empty = remove # ignore/add/remove/force +sp_inside_braces_empty = remove # ignore/add/remove/force # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = ignore # ignore/add/remove/force +sp_type_func = ignore # ignore/add/remove/force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = ignore # ignore/add/remove/force +sp_func_proto_paren = ignore # ignore/add/remove/force # Add or remove space between function name and '(' on function definition -sp_func_def_paren = ignore # ignore/add/remove/force +sp_func_def_paren = ignore # ignore/add/remove/force # Add or remove space inside empty function '()' -sp_inside_fparens = ignore # ignore/add/remove/force +sp_inside_fparens = ignore # ignore/add/remove/force # Add or remove space inside function '(' and ')' -sp_inside_fparen = ignore # ignore/add/remove/force +sp_inside_fparen = ignore # ignore/add/remove/force # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # ignore/add/remove/force # Add or remove space between ')' and '{' of function -sp_fparen_brace = ignore # ignore/add/remove/force +sp_fparen_brace = ignore # ignore/add/remove/force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # ignore/add/remove/force # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = ignore # ignore/add/remove/force +sp_func_call_user_paren = ignore # ignore/add/remove/force # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = ignore # ignore/add/remove/force +sp_func_class_paren = ignore # ignore/add/remove/force # Add or remove space between 'return' and '(' -sp_return_paren = ignore # ignore/add/remove/force +sp_return_paren = ignore # ignore/add/remove/force # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # ignore/add/remove/force # Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = remove # ignore/add/remove/force +sp_defined_paren = remove # ignore/add/remove/force # Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = remove # ignore/add/remove/force +sp_throw_paren = remove # ignore/add/remove/force # Add or remove space between macro and value -sp_macro = add # ignore/add/remove/force +sp_macro = add # ignore/add/remove/force # Add or remove space between macro function ')' and value -sp_macro_func = add # ignore/add/remove/force +sp_macro_func = add # ignore/add/remove/force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = remove # ignore/add/remove/force +sp_else_brace = remove # ignore/add/remove/force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # ignore/add/remove/force # Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = ignore # ignore/add/remove/force +sp_brace_typedef = ignore # ignore/add/remove/force # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # ignore/add/remove/force # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # ignore/add/remove/force # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # ignore/add/remove/force # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # ignore/add/remove/force # Add or remove space before the '::' operator -sp_before_dc = ignore # ignore/add/remove/force +sp_before_dc = ignore # ignore/add/remove/force # Add or remove space after the '::' operator -sp_after_dc = ignore # ignore/add/remove/force +sp_after_dc = ignore # ignore/add/remove/force # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # ignore/add/remove/force # Add or remove space after the '!' (not) operator. Default=Remove -sp_not = remove # ignore/add/remove/force +sp_not = remove # ignore/add/remove/force # Add or remove space after the '~' (invert) operator. Default=Remove -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # ignore/add/remove/force # Add or remove space after the '&' (address-of) operator. Default=Remove # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # ignore/add/remove/force # Add or remove space around the '.' or '->' operators. Default=Remove -sp_member = remove # ignore/add/remove/force +sp_member = remove # ignore/add/remove/force # Add or remove space after the '*' (dereference) operator. Default=Remove # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # ignore/add/remove/force # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # ignore/add/remove/force # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # ignore/add/remove/force # Add or remove space before a backslash-newline at the end of a line. Default=Add -sp_before_nl_cont = add # ignore/add/remove/force +sp_before_nl_cont = add # ignore/add/remove/force # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force +sp_after_oc_scope = ignore # ignore/add/remove/force # Add or remove space after the colon in message specs # '-(int) f:(int) x;' vs '-(int) f: (int) x;' -sp_after_oc_colon = ignore # ignore/add/remove/force +sp_after_oc_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in message specs # '-(int) f: (int) x;' vs '-(int) f : (int) x;' -sp_before_oc_colon = ignore # ignore/add/remove/force +sp_before_oc_colon = ignore # ignore/add/remove/force # Add or remove space after the colon in message specs # '[object setValue:1];' vs '[object setValue: 1];' -sp_after_send_oc_colon = ignore # ignore/add/remove/force +sp_after_send_oc_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in message specs # '[object setValue:1];' vs '[object setValue :1];' -sp_before_send_oc_colon = ignore # ignore/add/remove/force +sp_before_send_oc_colon = ignore # ignore/add/remove/force # Add or remove space after the (type) in message specs # '-(int)f: (int) x;' vs '-(int)f: (int)x;' -sp_after_oc_type = ignore # ignore/add/remove/force +sp_after_oc_type = ignore # ignore/add/remove/force # Add or remove space after the first (type) in message specs # '-(int) f:(int)x;' vs '-(int)f:(int)x;' -sp_after_oc_return_type = ignore # ignore/add/remove/force +sp_after_oc_return_type = ignore # ignore/add/remove/force # Add or remove space between '@selector' and '(' # '@selector(msgName).' vs '@selector (msgName)' -sp_after_oc_at_sel = ignore # ignore/add/remove/force +sp_after_oc_at_sel = ignore # ignore/add/remove/force # Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = ignore # ignore/add/remove/force +sp_cond_colon = ignore # ignore/add/remove/force # Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = ignore # ignore/add/remove/force +sp_cond_question = ignore # ignore/add/remove/force # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = ignore # ignore/add/remove/force +sp_case_label = ignore # ignore/add/remove/force # Control the space around the D '..' operator. -sp_range = ignore # ignore/add/remove/force +sp_range = ignore # ignore/add/remove/force # Control the space after the opening of a C++ comment '// A' vs '//A' -sp_cmt_cpp_start = ignore # ignore/add/remove/force +sp_cmt_cpp_start = ignore # ignore/add/remove/force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = true # false/true +align_keep_tabs = true # false/true # Whether to use tabs for aligning -align_with_tabs = true # false/true +align_with_tabs = true # false/true # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # false/true # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # false/true # Align variable definitions in prototypes and functions -align_func_params = false # false/true +align_func_params = false # false/true # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = false # false/true +align_same_func_call_params = false # false/true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 0 # number +align_var_def_span = 0 # number # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 0 # number +align_var_def_star_style = 0 # number # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # number # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # number # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # number # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # false/true # Whether to align any attribute after the variable name -align_var_def_attribute = false # false/true +align_var_def_attribute = false # false/true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = false # false/true +align_var_def_inline = false # false/true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 0 # number +align_assign_span = 0 # number # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 # number # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 0 # number +align_enum_equ_span = 0 # number # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # number # The span for aligning struct/union (0=don't align) -align_var_struct_span = 0 # number +align_var_struct_span = 0 # number # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # number # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # number # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 0 # number +align_struct_init_span = 0 # number # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number +align_typedef_gap = 0 # number # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 0 # number +align_typedef_span = 0 # number # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # number # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typedef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # number # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typedef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # number # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 0 # number +align_right_cmt_span = 0 # number # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # false/true # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. -align_right_cmt_gap = 0 # number +align_right_cmt_gap = 0 # number # Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore) -align_right_cmt_at_col = 0 # number +align_right_cmt_at_col = 0 # number # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # number # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # number # Align function protos on the 'operator' keyword instead of what follows -align_on_operator = false # false/true +align_on_operator = false # false/true # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # false/true # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true +align_single_line_func = false # false/true # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # false/true # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # number # The span for aligning ObjC msg spec (0=don't align) -align_oc_msg_spec_span = 0 # number +align_oc_msg_spec_span = 0 # number # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = false # false/true +align_nl_cont = false # false/true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 0 # number +align_pp_define_gap = 0 # number # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 0 # number +align_pp_define_span = 0 # number # Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = true # false/true +align_left_shift = true # false/true # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # false/true # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = false # false/true +nl_assign_leave_one_liners = false # false/true # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = false # false/true +nl_class_leave_one_liners = false # false/true # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = false # false/true +nl_enum_leave_one_liners = false # false/true # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # false/true # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # false/true # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # false/true # Add or remove newlines at the start of the file -nl_start_of_file = ignore # ignore/add/remove/force +nl_start_of_file = ignore # ignore/add/remove/force # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # number # Add or remove newline at the end of the file -nl_end_of_file = add # ignore/add/remove/force +nl_end_of_file = add # ignore/add/remove/force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 0 # number +nl_end_of_file_min = 0 # number # Add or remove newline between '=' and '{' -nl_assign_brace = ignore # ignore/add/remove/force +nl_assign_brace = ignore # ignore/add/remove/force # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # ignore/add/remove/force # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # ignore/add/remove/force # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 0 # number +nl_func_var_def_blk = 0 # number # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = add # ignore/add/remove/force +nl_fcall_brace = add # ignore/add/remove/force # Add or remove newline between 'enum' and '{' -nl_enum_brace = remove # ignore/add/remove/force +nl_enum_brace = remove # ignore/add/remove/force # Add or remove newline between 'struct and '{' -nl_struct_brace = remove # ignore/add/remove/force +nl_struct_brace = remove # ignore/add/remove/force # Add or remove newline between 'union' and '{' -nl_union_brace = remove # ignore/add/remove/force +nl_union_brace = remove # ignore/add/remove/force # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = remove # ignore/add/remove/force +nl_brace_else = remove # ignore/add/remove/force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = add # ignore/add/remove/force +nl_elseif_brace = add # ignore/add/remove/force # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # ignore/add/remove/force # Add or remove newline between 'else' and 'if' -nl_else_if = add # ignore/add/remove/force +nl_else_if = add # ignore/add/remove/force # Add or remove newline between '}' and 'finally' -nl_brace_finally = add # ignore/add/remove/force +nl_brace_finally = add # ignore/add/remove/force # Add or remove newline between 'finally' and '{' -nl_finally_brace = add # ignore/add/remove/force +nl_finally_brace = add # ignore/add/remove/force # Add or remove newline between 'try' and '{' -nl_try_brace = add # ignore/add/remove/force +nl_try_brace = add # ignore/add/remove/force # Add or remove newline between get/set and '{' -nl_getset_brace = ignore # ignore/add/remove/force +nl_getset_brace = ignore # ignore/add/remove/force # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # ignore/add/remove/force # Add or remove newline between 'catch' and '{' -nl_catch_brace = add # ignore/add/remove/force +nl_catch_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'catch' -nl_brace_catch = add # ignore/add/remove/force +nl_brace_catch = add # ignore/add/remove/force # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # ignore/add/remove/force # Add or remove newline between two open or close braces. # Due to general newline/brace handling, REMOVE may not work. -nl_brace_brace = ignore # ignore/add/remove/force +nl_brace_brace = ignore # ignore/add/remove/force # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # ignore/add/remove/force # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # ignore/add/remove/force # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # false/true # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = false # false/true +nl_multi_line_define = false # false/true # Whether to put a newline before 'case' statement -nl_before_case = false # false/true +nl_before_case = false # false/true # Add or remove newline between ')' and 'throw' -nl_before_throw = ignore # ignore/add/remove/force +nl_before_throw = ignore # ignore/add/remove/force # Whether to put a newline after 'case' statement -nl_after_case = false # false/true +nl_after_case = false # false/true # Newline between namespace and { -nl_namespace_brace = ignore # ignore/add/remove/force +nl_namespace_brace = ignore # ignore/add/remove/force # Add or remove newline between 'template<>' and whatever follows. -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # ignore/add/remove/force # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # ignore/add/remove/force # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in a function definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # ignore/add/remove/force # Add or remove newline between return type and function name inside a class {} # Uses nl_func_type_name or nl_func_proto_type_name if set to ignore. -nl_func_type_name_class = ignore # ignore/add/remove/force +nl_func_type_name_class = ignore # ignore/add/remove/force # Add or remove newline between function scope and name in a definition # Controls the newline after '::' in 'void A::f() { }' -nl_func_scope_name = ignore # ignore/add/remove/force +nl_func_scope_name = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = ignore # ignore/add/remove/force +nl_func_proto_type_name = ignore # ignore/add/remove/force # Add or remove newline between a function name and the opening '(' -nl_func_paren = remove # ignore/add/remove/force +nl_func_paren = remove # ignore/add/remove/force # Add or remove newline after '(' in a function declaration -nl_func_decl_start = remove # ignore/add/remove/force +nl_func_decl_start = remove # ignore/add/remove/force # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = remove # ignore/add/remove/force +nl_func_decl_args = remove # ignore/add/remove/force # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = remove # ignore/add/remove/force +nl_func_decl_end = remove # ignore/add/remove/force # Add or remove newline between '()' in a function declaration. -nl_func_decl_empty = remove # ignore/add/remove/force +nl_func_decl_empty = remove # ignore/add/remove/force # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # ignore/add/remove/force # Whether to put a newline after 'return' statement -nl_after_return = false # false/true +nl_after_return = false # false/true # Add or remove a newline between the return keyword and return expression. -nl_return_expr = ignore # ignore/add/remove/force +nl_return_expr = ignore # ignore/add/remove/force # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = false # false/true +nl_after_semicolon = false # false/true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = false # false/true +nl_after_brace_open = false # false/true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true +nl_after_brace_open_cmt = false # false/true # Whether to put a newline after a virtual brace open. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = false # false/true +nl_after_vbrace_open = false # false/true # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. -nl_after_brace_close = false # false/true +nl_after_brace_close = false # false/true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # false/true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true +nl_squeeze_ifdef = false # false/true # Add or remove newline before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # ignore/add/remove/force # Add or remove newline after 'if' -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # ignore/add/remove/force # Add or remove newline before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # ignore/add/remove/force # Add or remove newline after 'for' -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # ignore/add/remove/force # Add or remove newline before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # ignore/add/remove/force # Add or remove newline after 'while' -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # ignore/add/remove/force # Add or remove newline before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # ignore/add/remove/force # Add or remove newline after 'switch' -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # ignore/add/remove/force # Add or remove newline before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # ignore/add/remove/force # Add or remove newline after 'do' -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # ignore/add/remove/force # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # false/true # Whether to double-space before the close brace of a struct/union/enum -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # false/true # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # ignore/add/remove/force # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # false/true # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # false/true # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # false/true # # Positioning options # # The position of arithmetic operators in wrapped expressions -pos_arith = ignore # ignore/lead/trail +pos_arith = ignore # ignore/lead/trail # The position of assignment in wrapped expressions -pos_assign = ignore # ignore/lead/trail +pos_assign = ignore # ignore/lead/trail # The position of boolean operators in wrapped expressions -pos_bool = ignore # ignore/lead/trail +pos_bool = ignore # ignore/lead/trail # The position of comparison operators in wrapped expressions -pos_compare = ignore # ignore/lead/trail +pos_compare = ignore # ignore/lead/trail # The position of conditional (b ? t : f) operators in wrapped expressions -pos_conditional = ignore # ignore/lead/trail +pos_conditional = ignore # ignore/lead/trail # The position of the comma in wrapped expressions -pos_comma = ignore # ignore/lead/trail +pos_comma = ignore # ignore/lead/trail # The position of the comma in the constructor initialization list -pos_class_comma = ignore # ignore/lead/trail +pos_class_comma = ignore # ignore/lead/trail # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # ignore/lead/trail # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # number # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true +ls_for_split_full = false # false/true # Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true +ls_func_split_full = false # false/true # # Blank line options # # The maximum consecutive newlines -nl_max = 0 # number +nl_max = 0 # number # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # number # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 0 # number +nl_after_func_proto_group = 0 # number # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 0 # number +nl_after_func_body = 0 # number # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 0 # number +nl_after_func_body_one_liner = 0 # number # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 0 # number +nl_before_block_comment = 0 # number # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # number # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # number # Whether to force a newline after a mulit-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # false/true # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 0 # number +nl_before_access_spec = 0 # number # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # number # The number of newlines between a function def and the function comment. # 0 = No change. -nl_comment_func_def = 0 # number +nl_comment_func_def = 0 # number # The number of newlines after a try-catch-finally block that isn't followed by a brace close. # 0 = No change. -nl_after_try_catch_finally = 0 # number +nl_after_try_catch_finally = 0 # number # The number of newlines before and after a property, indexer or event decl. # 0 = No change. -nl_around_cs_property = 0 # number +nl_around_cs_property = 0 # number # The number of newlines between the get/set/add/remove handlers in C#. # 0 = No change. -nl_between_get_set = 0 # number +nl_between_get_set = 0 # number # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = false # false/true +eat_blanks_after_open_brace = false # false/true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = false # false/true +eat_blanks_before_close_brace = false # false/true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = ignore # ignore/add/remove/force +mod_full_brace_do = ignore # ignore/add/remove/force # Add or remove braces on single-line 'for' statement -mod_full_brace_for = ignore # ignore/add/remove/force +mod_full_brace_for = ignore # ignore/add/remove/force # Add or remove braces on single-line function definitions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # ignore/add/remove/force # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = ignore # ignore/add/remove/force +mod_full_brace_if = ignore # ignore/add/remove/force # Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if. # If any must be braced, they are all braced. If all can be unbraced, then the braces are removed. -mod_full_brace_if_chain = false # false/true +mod_full_brace_if_chain = false # false/true # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # number # Add or remove braces on single-line 'while' statement -mod_full_brace_while = ignore # ignore/add/remove/force +mod_full_brace_while = ignore # ignore/add/remove/force # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = ignore # ignore/add/remove/force +mod_paren_on_return = ignore # ignore/add/remove/force # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # false/true # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = false # false/true +mod_full_paren_if_bool = false # false/true # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = false # false/true +mod_remove_extra_semicolon = false # false/true # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 0 # number +mod_add_long_function_closebrace_comment = 0 # number # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number +mod_add_long_switch_closebrace_comment = 0 # number # If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after # the #else, a comment will be added. -mod_add_long_ifdef_endif_comment = 0 # number +mod_add_long_ifdef_endif_comment = 0 # number # If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after # the #endif, a comment will be added. -mod_add_long_ifdef_else_comment = 0 # number +mod_add_long_ifdef_else_comment = 0 # number # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # false/true # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # false/true # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # false/true # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = false # false/true +mod_move_case_break = false # false/true # Will add or remove the braces around a fully braced case statement. # Will only remove the braces if there are no variable declarations in the block. -mod_case_brace = ignore # ignore/add/remove/force +mod_case_brace = ignore # ignore/add/remove/force # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = false # false/true +mod_remove_empty_return = false # false/true # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # number # Set the comment reflow mode (default: 0) # 0: no reflowing (apart from the line wrapping due to cmt_width) # 1: no touching at all # 2: full reflow -cmt_reflow_mode = 0 # number +cmt_reflow_mode = 0 # number # If false, disable all multi-line comment changes, including cmt_width and leading chars. # Default is true. -cmt_indent_multi = true # false/true +cmt_indent_multi = true # false/true # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # false/true # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # false/true # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # false/true # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # false/true # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # false/true # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # false/true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # number # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # number # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true # false/true # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # string # The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_footer = "" # string +cmt_insert_file_footer = "" # string # The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment. # Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # string # The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment. # Will substitute $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # string # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true +cmt_insert_before_preproc = false # false/true # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # ignore/add/remove/force # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # false/true # If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. -pp_indent_count = 1 # number +pp_indent_count = 1 # number # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # ignore/add/remove/force # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # number # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # number # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # false/true # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # number # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true +pp_if_indent_code = false # false/true # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # false/true # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/new_op_a.cfg b/tests/config/new_op_a.cfg index 6f3634d1bc..212c50482e 100644 --- a/tests/config/new_op_a.cfg +++ b/tests/config/new_op_a.cfg @@ -1,4 +1,4 @@ -sp_between_new_paren = add -sp_after_newop_paren = add -sp_inside_newop_paren = add -sp_paren_paren = remove +sp_between_new_paren = add +sp_after_newop_paren = add +sp_inside_newop_paren = add +sp_paren_paren = remove diff --git a/tests/config/new_op_f.cfg b/tests/config/new_op_f.cfg index 00a6930a5f..4f9f2611d7 100644 --- a/tests/config/new_op_f.cfg +++ b/tests/config/new_op_f.cfg @@ -1,4 +1,4 @@ -sp_between_new_paren = force -sp_after_newop_paren = force -sp_inside_newop_paren = force -sp_paren_paren = force +sp_between_new_paren = force +sp_after_newop_paren = force +sp_inside_newop_paren = force +sp_paren_paren = force diff --git a/tests/config/new_op_paren_open_close.cfg b/tests/config/new_op_paren_open_close.cfg index c23100d980..8a77dce901 100644 --- a/tests/config/new_op_paren_open_close.cfg +++ b/tests/config/new_op_paren_open_close.cfg @@ -1,3 +1,3 @@ -sp_inside_newop_paren_close = remove -sp_inside_newop_paren_open = force -sp_paren_paren = force +sp_inside_newop_paren_close = remove +sp_inside_newop_paren_open = force +sp_paren_paren = force diff --git a/tests/config/new_op_r.cfg b/tests/config/new_op_r.cfg index 84b374fc2f..a9802c6407 100644 --- a/tests/config/new_op_r.cfg +++ b/tests/config/new_op_r.cfg @@ -1,4 +1,4 @@ -sp_between_new_paren = remove -sp_after_newop_paren = remove -sp_inside_newop_paren = remove -sp_paren_paren = force +sp_between_new_paren = remove +sp_after_newop_paren = remove +sp_inside_newop_paren = remove +sp_paren_paren = force diff --git a/tests/config/newline_after_endif.cfg b/tests/config/newline_after_endif.cfg index e9bb5faa52..503b37c486 100644 --- a/tests/config/newline_after_endif.cfg +++ b/tests/config/newline_after_endif.cfg @@ -1,160 +1,160 @@ -align_func_params=true -align_keep_tabs=false -align_nl_cont=false -align_number_right=false -align_on_tabstop=false -align_right_cmt_mix=false -align_var_def_colon=false -align_var_def_inline=false -align_with_tabs=false -cmt_c_group=false -cmt_c_nl_end=false -cmt_c_nl_start=false -cmt_cpp_group=false -cmt_cpp_nl_end=false -cmt_cpp_nl_start=false -cmt_cpp_to_c=false -cmt_star_cont=false -eat_blanks_after_open_brace=false -eat_blanks_before_close_brace=false -indent_align_string=false -indent_bool_paren=false -indent_brace_parent=false -indent_braces=false -indent_braces_no_func=false -indent_class=false -indent_class_colon=false -indent_col1_comment=false -indent_comma_paren=false -indent_func_call_param=false -indent_func_class_param=false -indent_func_ctor_var_param=false -indent_func_def_param=true -indent_func_param_double=false -indent_func_proto_param=false -indent_namespace=false -indent_paren_nl=true -indent_preserve_sql=false -indent_square_nl=false -ls_for_split_full=false -ls_func_split_full=false -mod_full_paren_if_bool=false -mod_pawn_semicolon=false -mod_remove_extra_semicolon=true -mod_sort_import=false -mod_sort_include=false -mod_sort_using=false -nl_after_brace_open=true -nl_after_brace_open_cmt=false -nl_after_case=false -nl_after_multiline_comment=false -nl_after_return=true -nl_after_semicolon=true -nl_after_vbrace_open=true -nl_assign_leave_one_liners=true -nl_before_case=true -nl_class_leave_one_liners=false -nl_collapse_empty_body=true -nl_create_for_one_liner=false -nl_create_if_one_liner=false -nl_create_while_one_liner=false -nl_define_macro=false -nl_ds_struct_enum_close_brace=false -nl_ds_struct_enum_cmt=false -nl_enum_leave_one_liners=false -nl_func_leave_one_liners=false -nl_getset_leave_one_liners=false -nl_if_leave_one_liners=false -nl_multi_line_cond=false -nl_squeeze_ifdef=true -pp_define_at_level=true -pp_if_indent_code=true -pp_indent_at_level=true -pp_region_indent_code=true -sp_balance_nested_parens=false -align_assign_span=0 -align_right_cmt_span=3 -align_var_def_span=1 -align_var_def_star_style=0 -cmt_width=108 -code_width=108 -indent_case_brace=0 -indent_case_shift=0 -indent_columns=3 -indent_switch_case=3 -indent_with_tabs=0 -input_tab_size=3 -mod_add_long_function_closebrace_comment=1 -mod_add_long_switch_closebrace_comment=16 -nl_end_of_file_min=2 -nl_func_var_def_blk=1 -pp_indent_region=3 -pp_space_count=3 -mod_paren_on_return=force -nl_after_do=force -nl_after_for=force -nl_after_if=force -nl_after_switch=force -nl_after_while=force -nl_before_do=force -nl_before_for=force -nl_before_if=force -nl_before_switch=force -nl_before_while=force -nl_brace_else=force -nl_brace_while=force -nl_class_brace=force -nl_else_brace=force -nl_elseif_brace=force -nl_end_of_file=force -nl_fcall_brace=force -nl_fdef_brace=force -nl_for_brace=force -nl_func_decl_args=force -nl_func_decl_end=add -nl_func_decl_start=force -nl_func_paren=force -nl_func_proto_type_name=remove -nl_func_type_name=remove -nl_if_brace=force -nl_while_brace=add -pos_class_comma=trail -pos_comma=trail -pp_indent=force -sp_after_cast=remove -sp_after_comma=force -sp_after_oc_type=remove -sp_after_ptr_star=add -sp_after_sparen=force -sp_arith=force -sp_assign=force -sp_before_comma=remove -sp_before_ptr_star=remove -sp_before_semi=remove -sp_before_semi_for=remove -sp_before_semi_for_empty=remove -sp_before_sparen=remove -sp_before_square=remove -sp_before_squares=remove -sp_bool=force -sp_brace_else=force -sp_compare=force -sp_deref=remove -sp_fparen_brace=force -sp_func_call_paren=remove -sp_func_def_paren=remove -sp_func_proto_paren=remove -sp_incdec=remove -sp_inside_braces=force -sp_inside_fparen=remove -sp_inside_fparens=remove -sp_inside_paren=remove -sp_inside_paren_cast=remove -sp_inside_sparen=remove -sp_macro=force -sp_macro_func=force -sp_member=remove -sp_not=remove -sp_paren_paren=remove -sp_return_paren=force -sp_type_func=force +align_func_params = true +align_keep_tabs = false +align_nl_cont = false +align_number_right = false +align_on_tabstop = false +align_right_cmt_mix = false +align_var_def_colon = false +align_var_def_inline = false +align_with_tabs = false +cmt_c_group = false +cmt_c_nl_end = false +cmt_c_nl_start = false +cmt_cpp_group = false +cmt_cpp_nl_end = false +cmt_cpp_nl_start = false +cmt_cpp_to_c = false +cmt_star_cont = false +eat_blanks_after_open_brace = false +eat_blanks_before_close_brace = false +indent_align_string = false +indent_bool_paren = false +indent_brace_parent = false +indent_braces = false +indent_braces_no_func = false +indent_class = false +indent_class_colon = false +indent_col1_comment = false +indent_comma_paren = false +indent_func_call_param = false +indent_func_class_param = false +indent_func_ctor_var_param = false +indent_func_def_param = true +indent_func_param_double = false +indent_func_proto_param = false +indent_namespace = false +indent_paren_nl = true +indent_preserve_sql = false +indent_square_nl = false +ls_for_split_full = false +ls_func_split_full = false +mod_full_paren_if_bool = false +mod_pawn_semicolon = false +mod_remove_extra_semicolon = true +mod_sort_import = false +mod_sort_include = false +mod_sort_using = false +nl_after_brace_open = true +nl_after_brace_open_cmt = false +nl_after_case = false +nl_after_multiline_comment = false +nl_after_return = true +nl_after_semicolon = true +nl_after_vbrace_open = true +nl_assign_leave_one_liners = true +nl_before_case = true +nl_class_leave_one_liners = false +nl_collapse_empty_body = true +nl_create_for_one_liner = false +nl_create_if_one_liner = false +nl_create_while_one_liner = false +nl_define_macro = false +nl_ds_struct_enum_close_brace = false +nl_ds_struct_enum_cmt = false +nl_enum_leave_one_liners = false +nl_func_leave_one_liners = false +nl_getset_leave_one_liners = false +nl_if_leave_one_liners = false +nl_multi_line_cond = false +nl_squeeze_ifdef = true +pp_define_at_level = true +pp_if_indent_code = true +pp_indent_at_level = true +pp_region_indent_code = true +sp_balance_nested_parens = false +align_assign_span = 0 +align_right_cmt_span = 3 +align_var_def_span = 1 +align_var_def_star_style = 0 +cmt_width = 108 +code_width = 108 +indent_case_brace = 0 +indent_case_shift = 0 +indent_columns = 3 +indent_switch_case = 3 +indent_with_tabs = 0 +input_tab_size = 3 +mod_add_long_function_closebrace_comment = 1 +mod_add_long_switch_closebrace_comment = 16 +nl_end_of_file_min = 2 +nl_func_var_def_blk = 1 +pp_indent_region = 3 +pp_space_count = 3 +mod_paren_on_return = force +nl_after_do = force +nl_after_for = force +nl_after_if = force +nl_after_switch = force +nl_after_while = force +nl_before_do = force +nl_before_for = force +nl_before_if = force +nl_before_switch = force +nl_before_while = force +nl_brace_else = force +nl_brace_while = force +nl_class_brace = force +nl_else_brace = force +nl_elseif_brace = force +nl_end_of_file = force +nl_fcall_brace = force +nl_fdef_brace = force +nl_for_brace = force +nl_func_decl_args = force +nl_func_decl_end = add +nl_func_decl_start = force +nl_func_paren = force +nl_func_proto_type_name = remove +nl_func_type_name = remove +nl_if_brace = force +nl_while_brace = add +pos_class_comma = trail +pos_comma = trail +pp_indent = force +sp_after_cast = remove +sp_after_comma = force +sp_after_oc_type = remove +sp_after_ptr_star = add +sp_after_sparen = force +sp_arith = force +sp_assign = force +sp_before_comma = remove +sp_before_ptr_star = remove +sp_before_semi = remove +sp_before_semi_for = remove +sp_before_semi_for_empty = remove +sp_before_sparen = remove +sp_before_square = remove +sp_before_squares = remove +sp_bool = force +sp_brace_else = force +sp_compare = force +sp_deref = remove +sp_fparen_brace = force +sp_func_call_paren = remove +sp_func_def_paren = remove +sp_func_proto_paren = remove +sp_incdec = remove +sp_inside_braces = force +sp_inside_fparen = remove +sp_inside_fparens = remove +sp_inside_paren = remove +sp_inside_paren_cast = remove +sp_inside_sparen = remove +sp_macro = force +sp_macro_func = force +sp_member = remove +sp_not = remove +sp_paren_paren = remove +sp_return_paren = force +sp_type_func = force diff --git a/tests/config/nl-comment.cfg b/tests/config/nl-comment.cfg index c8366a0361..d41198fab3 100644 --- a/tests/config/nl-comment.cfg +++ b/tests/config/nl-comment.cfg @@ -2,102 +2,102 @@ # My favorite format # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size -indent_columns = output_tab_size -indent_label = 2 # pos: absolute col, neg: relative column -indent_access_spec = 2 -indent_align_string = False # align broken strings -indent_brace = 0 -indent_member = indent_columns +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 3 # new tab size +indent_columns = output_tab_size +indent_label = 2 # pos: absolute col, neg: relative column +indent_access_spec = 2 +indent_align_string = False # align broken strings +indent_brace = 0 +indent_member = indent_columns -nl_assign_brace = add # "= {" vs "= \n {" -nl_enum_brace = add # "enum {" vs "enum \n {" -nl_union_brace = add # "union {" vs "union \n {" -nl_struct_brace = add # "struct {" vs "struct \n {" -nl_do_brace = add # "do {" vs "do \n {" -nl_if_brace = add # "if () {" vs "if () \n {" -nl_for_brace = add # "for () {" vs "for () \n {" -nl_try_brace = add # "for () {" vs "for () \n {" -nl_catch_brace = add # "for () {" vs "for () \n {" -nl_finally_brace = add # "for () {" vs "for () \n {" -nl_else_brace = add # "else {" vs "else \n {" -nl_while_brace = add # "while () {" vs "while () \n {" -nl_switch_brace = add # "switch () {" vs "switch () \n {" -nl_func_var_def_blk = 1 -nl_before_case = 1 -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" -nl_after_return = TRUE -nl_brace_while = remove -nl_brace_else = add -nl_squeeze_ifdef = TRUE +nl_assign_brace = add # "= {" vs "= \n {" +nl_enum_brace = add # "enum {" vs "enum \n {" +nl_union_brace = add # "union {" vs "union \n {" +nl_struct_brace = add # "struct {" vs "struct \n {" +nl_do_brace = add # "do {" vs "do \n {" +nl_if_brace = add # "if () {" vs "if () \n {" +nl_for_brace = add # "for () {" vs "for () \n {" +nl_try_brace = add # "for () {" vs "for () \n {" +nl_catch_brace = add # "for () {" vs "for () \n {" +nl_finally_brace = add # "for () {" vs "for () \n {" +nl_else_brace = add # "else {" vs "else \n {" +nl_while_brace = add # "while () {" vs "while () \n {" +nl_switch_brace = add # "switch () {" vs "switch () \n {" +nl_func_var_def_blk = 1 +nl_before_case = 1 +nl_fcall_brace = add # "foo() {" vs "foo()\n{" +nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_after_return = TRUE +nl_brace_while = remove +nl_brace_else = add +nl_squeeze_ifdef = TRUE -mod_paren_on_return = add # "return 1;" vs "return (1);" -mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" -mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" +mod_paren_on_return = add # "return 1;" vs "return (1);" +mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" +mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" +mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" +mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" -sp_before_byref = remove -sp_before_semi = remove -sp_paren_paren = remove # space between (( and )) -sp_return_paren = remove # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" -sp_inside_paren = remove -sp_inside_fparen = remove -sp_inside_sparen = remove -sp_inside_square = remove +sp_before_byref = remove +sp_before_semi = remove +sp_paren_paren = remove # space between (( and )) +sp_return_paren = remove # "return (1);" vs "return(1);" +sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" +sp_before_sparen = force # "if (" vs "if(" +sp_after_sparen = force # "if () {" vs "if (){" +sp_after_cast = remove # "(int) a" vs "(int)a" +sp_inside_braces = force # "{ 1 }" vs "{1}" +sp_inside_braces_struct = force # "{ 1 }" vs "{1}" +sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_inside_paren = remove +sp_inside_fparen = remove +sp_inside_sparen = remove +sp_inside_square = remove #sp_type_func = ignore -sp_assign = force -sp_arith = force -sp_bool = force -sp_compare = force -sp_assign = force -sp_after_comma = force -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" -sp_after_ptr_star = remove -sp_before_ptr_star = force -sp_between_ptr_star = remove +sp_assign = force +sp_arith = force +sp_bool = force +sp_compare = force +sp_assign = force +sp_after_comma = force +sp_func_def_paren = remove # "int foo (){" vs "int foo(){" +sp_func_call_paren = remove # "foo (" vs "foo(" +sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_after_ptr_star = remove +sp_before_ptr_star = force +sp_between_ptr_star = remove -align_with_tabs = FALSE # use tabs to align -align_on_tabstop = FALSE # align on tabstops -align_enum_equ_span = 4 -align_nl_cont = TRUE -align_func_params = TRUE -align_var_def_span = 2 -align_var_def_inline = TRUE -align_var_def_star_style = 1 -align_var_def_colon = TRUE -align_assign_span = 1 +align_with_tabs = FALSE # use tabs to align +align_on_tabstop = FALSE # align on tabstops +align_enum_equ_span = 4 +align_nl_cont = TRUE +align_func_params = TRUE +align_var_def_span = 2 +align_var_def_inline = TRUE +align_var_def_star_style = 1 +align_var_def_colon = TRUE +align_assign_span = 1 # align_assign_thresh = 8 -align_struct_init_span = 3 -align_var_struct_span = 3 -align_right_cmt_span = 3 -align_pp_define_span = 3 -align_pp_define_gap = 4 -align_number_right = TRUE -align_typedef_span = 5 -align_typedef_gap = 3 +align_struct_init_span = 3 +align_var_struct_span = 3 +align_right_cmt_span = 3 +align_pp_define_span = 3 +align_pp_define_gap = 4 +align_number_right = TRUE +align_typedef_span = 5 +align_typedef_gap = 3 -cmt_star_cont = TRUE +cmt_star_cont = TRUE -eat_blanks_before_close_brace = TRUE -eat_blanks_after_open_brace = TRUE +eat_blanks_before_close_brace = TRUE +eat_blanks_after_open_brace = TRUE # indent_namespace = FALSE -indent_class = TRUE +indent_class = TRUE -nl_before_c_comment = 3 -nl_before_block_comment = 3 -nl_before_cpp_comment = 4 +nl_before_c_comment = 3 +nl_before_block_comment = 3 +nl_before_cpp_comment = 4 diff --git a/tests/config/nl_access_spec.cfg b/tests/config/nl_access_spec.cfg index 7be9257a80..fb936febaa 100644 --- a/tests/config/nl_access_spec.cfg +++ b/tests/config/nl_access_spec.cfg @@ -1,8 +1,8 @@ -nl_before_access_spec = 3 -nl_after_access_spec = 2 -indent_access_spec = 2 -indent_class = true -nl_after_brace_open = true -nl_after_semicolon = true -nl_class_brace = force +nl_before_access_spec = 3 +nl_after_access_spec = 2 +indent_access_spec = 2 +indent_class = true +nl_after_brace_open = true +nl_after_semicolon = true +nl_class_brace = force diff --git a/tests/config/nl_after_func_body-2.cfg b/tests/config/nl_after_func_body-2.cfg index f3348ea522..9cfaa425b8 100644 --- a/tests/config/nl_after_func_body-2.cfg +++ b/tests/config/nl_after_func_body-2.cfg @@ -1,16 +1,16 @@ # -indent_class = true +indent_class = true -nl_fdef_brace = remove +nl_fdef_brace = remove -nl_class_leave_one_liners = true +nl_class_leave_one_liners = true -nl_after_func_body = 4 -nl_after_func_body_one_liner = 2 +nl_after_func_body = 4 +nl_after_func_body_one_liner = 2 -eat_blanks_after_open_brace = true -eat_blanks_before_close_brace = true +eat_blanks_after_open_brace = true +eat_blanks_before_close_brace = true -sp_fparen_brace = force +sp_fparen_brace = force diff --git a/tests/config/nl_after_func_body-3.cfg b/tests/config/nl_after_func_body-3.cfg index 7df3baac9a..80146d8161 100644 --- a/tests/config/nl_after_func_body-3.cfg +++ b/tests/config/nl_after_func_body-3.cfg @@ -1,3 +1,3 @@ -output_tab_size = 4 # new tab size -indent_columns = output_tab_size -nl_after_func_body = 3 \ No newline at end of file +output_tab_size = 4 # new tab size +indent_columns = output_tab_size +nl_after_func_body = 3 diff --git a/tests/config/nl_after_func_body.cfg b/tests/config/nl_after_func_body.cfg index 024c21519a..9e64598d21 100644 --- a/tests/config/nl_after_func_body.cfg +++ b/tests/config/nl_after_func_body.cfg @@ -1,13 +1,13 @@ # -indent_class = true +indent_class = true -nl_fdef_brace = remove +nl_fdef_brace = remove -nl_after_func_body = 4 +nl_after_func_body = 4 -eat_blanks_after_open_brace = true -eat_blanks_before_close_brace = true +eat_blanks_after_open_brace = true +eat_blanks_before_close_brace = true -sp_fparen_brace = force +sp_fparen_brace = force diff --git a/tests/config/nl_assign1.cfg b/tests/config/nl_assign1.cfg index de716d1d75..3328051dbc 100644 --- a/tests/config/nl_assign1.cfg +++ b/tests/config/nl_assign1.cfg @@ -1,9 +1,9 @@ -indent_with_tabs=0 -indent_columns=4 -code_width=60 -pos_assign = lead -pos_arith = lead -sp_arith = force -sp_assign = force +indent_with_tabs = 0 +indent_columns = 4 +code_width = 60 +pos_assign = lead +pos_arith = lead +sp_arith = force +sp_assign = force diff --git a/tests/config/nl_assign2.cfg b/tests/config/nl_assign2.cfg index c6876cdfaf..b50af60255 100644 --- a/tests/config/nl_assign2.cfg +++ b/tests/config/nl_assign2.cfg @@ -1,9 +1,9 @@ -indent_with_tabs=0 -indent_columns=4 -code_width=60 -pos_assign = trail -pos_arith = trail -sp_arith = force -sp_assign = force +indent_with_tabs = 0 +indent_columns = 4 +code_width = 60 +pos_assign = trail +pos_arith = trail +sp_arith = force +sp_assign = force diff --git a/tests/config/nl_before_after.cfg b/tests/config/nl_before_after.cfg index f857836e08..e36c138a4e 100644 --- a/tests/config/nl_before_after.cfg +++ b/tests/config/nl_before_after.cfg @@ -1,5 +1,5 @@ -nl_after_semicolon = true -nl_after_class = 2 -nl_before_class = 2 -indent_columns = 4 -indent_class = true +nl_after_semicolon = true +nl_after_class = 2 +nl_before_class = 2 +indent_columns = 4 +indent_class = true diff --git a/tests/config/nl_brace_brace-a.cfg b/tests/config/nl_brace_brace-a.cfg index 3421bb0413..3d5360a05f 100644 --- a/tests/config/nl_brace_brace-a.cfg +++ b/tests/config/nl_brace_brace-a.cfg @@ -1,3 +1,3 @@ -nl_brace_brace = add +nl_brace_brace = add diff --git a/tests/config/nl_brace_square.cfg b/tests/config/nl_brace_square.cfg index 24f12f66a2..1fc4f676c9 100644 --- a/tests/config/nl_brace_square.cfg +++ b/tests/config/nl_brace_square.cfg @@ -1,9 +1,9 @@ -include "obj-c.cfg" +include "obj-c.cfg" -output_tab_size = 4 # new tab size -indent_columns = output_tab_size +output_tab_size = 4 # new tab size +indent_columns = output_tab_size -nl_brace_square = remove -nl_brace_fparen = remove -nl_after_brace_close = true +nl_brace_square = remove +nl_brace_fparen = remove +nl_after_brace_close = true diff --git a/tests/config/nl_brace_test.cfg b/tests/config/nl_brace_test.cfg index d4daa35059..b272fe53e2 100644 --- a/tests/config/nl_brace_test.cfg +++ b/tests/config/nl_brace_test.cfg @@ -5,19 +5,19 @@ # # The type of line endings -newlines = auto # auto/lf/crlf/cr +newlines = auto # auto/lf/crlf/cr # The original size of tabs in the input -input_tab_size = 8 # number +input_tab_size = 8 # number # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 8 # number +output_tab_size = 8 # number # The ascii value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # number # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # number # # Indenting @@ -25,1103 +25,1103 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 2 # number +indent_columns = 2 # number # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # number # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # false/true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # number # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # number # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # false/true # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # false/true # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # false/true # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # false/true # Whether the 'extern "C"' body is indented -indent_extern = false # false/true +indent_extern = false # false/true # Whether the 'class' body is indented -indent_class = false # false/true +indent_class = false # false/true # Whether to indent the stuff after a leading class colon -indent_class_colon = false # false/true +indent_class_colon = false # false/true # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level -indent_else_if = true # false/true +indent_else_if = true # false/true # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = false # false/true +indent_func_call_param = false # false/true # Same as indent_func_call_param, but for function defs -indent_func_def_param = false # false/true +indent_func_def_param = false # false/true # Same as indent_func_call_param, but for function protos -indent_func_proto_param = false # false/true +indent_func_proto_param = false # false/true # Same as indent_func_call_param, but for class declarations -indent_func_class_param = false # false/true +indent_func_class_param = false # false/true # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = false # false/true +indent_func_ctor_var_param = false # false/true # Same as indent_func_call_param, but for templates -indent_template_param = false # false/true +indent_template_param = false # false/true # Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true +indent_func_param_double = false # false/true # Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 0 # number +indent_func_const = 0 # number # Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 0 # number +indent_func_throw = 0 # number # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 0 # number +indent_member = 0 # number # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # number # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = false # false/true +indent_relative_single_line_comments = false # false/true # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 0 # number +indent_switch_case = 0 # number # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # number # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 0 # number +indent_case_brace = 0 # number # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # false/true # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # number # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # number # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # false/true # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # false/true # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 0 # number +indent_paren_close = 0 # number # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # false/true # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # false/true # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # false/true # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # false/true # Align continued statements at the '='. Default=True # If FALSE or the '=' is followed by a newline, the next line is indent one tab. -indent_align_assign = true # false/true +indent_align_assign = true # false/true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # ignore/add/remove/force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # ignore/add/remove/force # Add or remove space around assignment '=' in enum -sp_enum_assign = force # ignore/add/remove/force +sp_enum_assign = force # ignore/add/remove/force # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # ignore/add/remove/force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # ignore/add/remove/force # Add or remove space inside '(' and ')' -sp_inside_paren = ignore # ignore/add/remove/force +sp_inside_paren = ignore # ignore/add/remove/force # Add or remove space between nested parens -sp_paren_paren = ignore # ignore/add/remove/force +sp_paren_paren = ignore # ignore/add/remove/force # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # false/true # Add or remove space between ')' and '{' -sp_paren_brace = add # ignore/add/remove/force +sp_paren_brace = add # ignore/add/remove/force # Add or remove space before pointer star '*' -sp_before_ptr_star = add # ignore/add/remove/force +sp_before_ptr_star = add # ignore/add/remove/force # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force +sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # ignore/add/remove/force # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # ignore/add/remove/force # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = remove # ignore/add/remove/force +sp_after_ptr_star_func = remove # ignore/add/remove/force # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = add # ignore/add/remove/force +sp_before_ptr_star_func = add # ignore/add/remove/force # Add or remove space before a reference sign '&' -sp_before_byref = add # ignore/add/remove/force +sp_before_byref = add # ignore/add/remove/force # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force +sp_before_unnamed_byref = ignore # ignore/add/remove/force # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = ignore # ignore/add/remove/force +sp_after_byref = ignore # ignore/add/remove/force # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = ignore # ignore/add/remove/force +sp_after_byref_func = ignore # ignore/add/remove/force # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = ignore # ignore/add/remove/force +sp_before_byref_func = ignore # ignore/add/remove/force # Add or remove space between type and word -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # ignore/add/remove/force # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. -sp_template_angle = ignore # ignore/add/remove/force +sp_template_angle = ignore # ignore/add/remove/force # Add or remove space before '<>' -sp_before_angle = add # ignore/add/remove/force +sp_before_angle = add # ignore/add/remove/force # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # ignore/add/remove/force # Add or remove space after '<>' -sp_after_angle = ignore # ignore/add/remove/force +sp_after_angle = ignore # ignore/add/remove/force # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = remove # ignore/add/remove/force -sp_angle_paren_empty = remove +sp_angle_paren = remove # ignore/add/remove/force +sp_angle_paren_empty = remove # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = add # ignore/add/remove/force +sp_angle_word = add # ignore/add/remove/force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = add # ignore/add/remove/force +sp_before_sparen = add # ignore/add/remove/force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = ignore # ignore/add/remove/force +sp_inside_sparen = ignore # ignore/add/remove/force # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = ignore # ignore/add/remove/force +sp_after_sparen = ignore # ignore/add/remove/force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = add # ignore/add/remove/force +sp_sparen_brace = add # ignore/add/remove/force # Add or remove space between 'invariant' and '(' in the D language. -sp_invariant_paren = ignore # ignore/add/remove/force +sp_invariant_paren = ignore # ignore/add/remove/force # Add or remove space after the ')' in 'invariant (C) c' in the D language. -sp_after_invariant_paren = ignore # ignore/add/remove/force +sp_after_invariant_paren = ignore # ignore/add/remove/force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # ignore/add/remove/force # Add or remove space before ';' -sp_before_semi = ignore # ignore/add/remove/force +sp_before_semi = ignore # ignore/add/remove/force # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = ignore # ignore/add/remove/force +sp_before_semi_for = ignore # ignore/add/remove/force # Add or remove space before a semicolon of an empty part of a for statment. -sp_before_semi_for_empty = ignore # ignore/add/remove/force +sp_before_semi_for_empty = ignore # ignore/add/remove/force # Add or remove space after the final semicolon of an empty part of a for statment: for ( ; ; ). -sp_after_semi_for_empty = ignore # ignore/add/remove/force +sp_after_semi_for_empty = ignore # ignore/add/remove/force # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # ignore/add/remove/force # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # ignore/add/remove/force # Add or remove space inside '[' and ']' -sp_inside_square = ignore # ignore/add/remove/force +sp_inside_square = ignore # ignore/add/remove/force # Add or remove space after ',' -sp_after_comma = add # ignore/add/remove/force +sp_after_comma = add # ignore/add/remove/force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # ignore/add/remove/force # Add or remove space after class ':' -sp_after_class_colon = ignore # ignore/add/remove/force +sp_after_class_colon = ignore # ignore/add/remove/force # Add or remove space before class ':' -sp_before_class_colon = ignore # ignore/add/remove/force +sp_before_class_colon = ignore # ignore/add/remove/force # Add or remove space before case ':' -sp_before_case_colon = remove # ignore/add/remove/force +sp_before_case_colon = remove # ignore/add/remove/force # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # ignore/add/remove/force # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = ignore # ignore/add/remove/force +sp_after_operator_sym = ignore # ignore/add/remove/force # Add or remove space after C/D cast, ie 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = ignore # ignore/add/remove/force +sp_after_cast = ignore # ignore/add/remove/force # Add or remove spaces inside cast parens -sp_inside_paren_cast = ignore # ignore/add/remove/force +sp_inside_paren_cast = ignore # ignore/add/remove/force # Add or remove space between the type and open paren in a C++ cast, ie 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = ignore # ignore/add/remove/force +sp_cpp_cast_paren = ignore # ignore/add/remove/force # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = ignore # ignore/add/remove/force +sp_sizeof_paren = ignore # ignore/add/remove/force # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # ignore/add/remove/force # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = add # ignore/add/remove/force +sp_inside_braces_enum = add # ignore/add/remove/force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = add # ignore/add/remove/force +sp_inside_braces_struct = add # ignore/add/remove/force # Add or remove space inside '{' and '}' -sp_inside_braces = add # ignore/add/remove/force +sp_inside_braces = add # ignore/add/remove/force # Add or remove space inside '{}' -sp_inside_braces_empty = remove # ignore/add/remove/force +sp_inside_braces_empty = remove # ignore/add/remove/force # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = ignore # ignore/add/remove/force +sp_type_func = ignore # ignore/add/remove/force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = add # ignore/add/remove/force +sp_func_proto_paren = add # ignore/add/remove/force # Add or remove space between function name and '(' on function definition -sp_func_def_paren = add # ignore/add/remove/force +sp_func_def_paren = add # ignore/add/remove/force # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # ignore/add/remove/force # Add or remove space inside function '(' and ')' -sp_inside_fparen = ignore # ignore/add/remove/force +sp_inside_fparen = ignore # ignore/add/remove/force # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # ignore/add/remove/force # Add or remove space between ')' and '{' of function -sp_fparen_brace = add # ignore/add/remove/force +sp_fparen_brace = add # ignore/add/remove/force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = ignore # ignore/add/remove/force +sp_func_call_paren = ignore # ignore/add/remove/force # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = add # ignore/add/remove/force +sp_func_call_user_paren = add # ignore/add/remove/force # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = ignore # ignore/add/remove/force +sp_func_class_paren = ignore # ignore/add/remove/force # Add or remove space between 'return' and '(' -sp_return_paren = add # ignore/add/remove/force +sp_return_paren = add # ignore/add/remove/force # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # ignore/add/remove/force # Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = add # ignore/add/remove/force +sp_defined_paren = add # ignore/add/remove/force # Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = add # ignore/add/remove/force +sp_throw_paren = add # ignore/add/remove/force # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # ignore/add/remove/force # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # ignore/add/remove/force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = add # ignore/add/remove/force +sp_else_brace = add # ignore/add/remove/force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = add # ignore/add/remove/force +sp_brace_else = add # ignore/add/remove/force # Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = add # ignore/add/remove/force +sp_brace_typedef = add # ignore/add/remove/force # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = add # ignore/add/remove/force +sp_catch_brace = add # ignore/add/remove/force # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = add # ignore/add/remove/force +sp_brace_catch = add # ignore/add/remove/force # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = add # ignore/add/remove/force +sp_finally_brace = add # ignore/add/remove/force # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = add # ignore/add/remove/force +sp_brace_finally = add # ignore/add/remove/force # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = add # ignore/add/remove/force +sp_try_brace = add # ignore/add/remove/force # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = add # ignore/add/remove/force +sp_getset_brace = add # ignore/add/remove/force # Add or remove space before the '::' operator -sp_before_dc = remove # ignore/add/remove/force +sp_before_dc = remove # ignore/add/remove/force # Add or remove space after the '::' operator -sp_after_dc = remove # ignore/add/remove/force +sp_after_dc = remove # ignore/add/remove/force # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # ignore/add/remove/force # Add or remove space after the '!' (not) operator. -sp_not = remove # ignore/add/remove/force +sp_not = remove # ignore/add/remove/force # Add or remove space after the '~' (invert) operator. -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # ignore/add/remove/force # Add or remove space after the '&' (address-of) operator. # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # ignore/add/remove/force # Add or remove space around the '.' or '->' operators -sp_member = remove # ignore/add/remove/force +sp_member = remove # ignore/add/remove/force # Add or remove space after the '*' (dereference) operator. # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # ignore/add/remove/force # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7' -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # ignore/add/remove/force # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;' -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # ignore/add/remove/force # Add or remove space before a backslash-newline at the end of a line -sp_before_nl_cont = add # ignore/add/remove/force +sp_before_nl_cont = add # ignore/add/remove/force # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force +sp_after_oc_scope = ignore # ignore/add/remove/force # Add or remove space after the colon in message specs # '-(int) f:(int) x;' vs '-(int) f: (int) x;' -sp_after_oc_colon = ignore # ignore/add/remove/force +sp_after_oc_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in message specs # '-(int) f: (int) x;' vs '-(int) f : (int) x;' -sp_before_oc_colon = ignore # ignore/add/remove/force +sp_before_oc_colon = ignore # ignore/add/remove/force # Add or remove space after the colon in message specs # '[object setValue:1];' vs '[object setValue: 1];' -sp_after_send_oc_colon = ignore # ignore/add/remove/force +sp_after_send_oc_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in message specs # '[object setValue:1];' vs '[object setValue :1];' -sp_before_send_oc_colon = ignore # ignore/add/remove/force +sp_before_send_oc_colon = ignore # ignore/add/remove/force # Add or remove space after the (type) in message specs # '-(int) f: (int) x;' vs '-(int) f: (int)x;' -sp_after_oc_type = ignore # ignore/add/remove/force +sp_after_oc_type = ignore # ignore/add/remove/force # Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = ignore # ignore/add/remove/force +sp_cond_colon = ignore # ignore/add/remove/force # Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = ignore # ignore/add/remove/force +sp_cond_question = ignore # ignore/add/remove/force # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = ignore # ignore/add/remove/force +sp_case_label = ignore # ignore/add/remove/force # Control the space around the D '..' operator. -sp_range = ignore # ignore/add/remove/force +sp_range = ignore # ignore/add/remove/force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # false/true # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # false/true # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # false/true # Align variable definitions in prototypes and functions -align_func_params = true # false/true +align_func_params = true # false/true # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = false # false/true +align_same_func_call_params = false # false/true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 1 # number +align_var_def_span = 1 # number # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 2 # number +align_var_def_star_style = 2 # number # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # number # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # number # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # number # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # false/true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = true # false/true +align_var_def_inline = true # false/true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 1 # number +align_assign_span = 1 # number # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 # number # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 1 # number +align_enum_equ_span = 1 # number # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 1 # number +align_enum_equ_thresh = 1 # number # The span for aligning struct/union (0=don't align) -align_var_struct_span = 1 # number +align_var_struct_span = 1 # number # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # number # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # number # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 1 # number +align_struct_init_span = 1 # number # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 1 # number +align_typedef_gap = 1 # number # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 1 # number +align_typedef_span = 1 # number # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # number # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 2 # number +align_typedef_star_style = 2 # number # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typdef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # number # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 1 # number +align_right_cmt_span = 1 # number # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = true # false/true +align_right_cmt_mix = true # false/true # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. -align_right_cmt_gap = 1 # number +align_right_cmt_gap = 1 # number # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # number # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # number # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # false/true # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true +align_single_line_func = false # false/true # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # false/true # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # number # The span for aligning ObjC msg spec (0=don't align) -align_oc_msg_spec_span = 0 # number +align_oc_msg_spec_span = 0 # number # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = false # false/true +align_nl_cont = false # false/true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 0 # number +align_pp_define_gap = 0 # number # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 1 # number +align_pp_define_span = 1 # number # Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = true # false/true +align_left_shift = true # false/true # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # false/true # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = false # false/true +nl_assign_leave_one_liners = false # false/true # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = false # false/true +nl_class_leave_one_liners = false # false/true # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = false # false/true +nl_enum_leave_one_liners = false # false/true # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # false/true # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # false/true # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # false/true # Add or remove newlines at the start of the file -nl_start_of_file = ignore # ignore/add/remove/force +nl_start_of_file = ignore # ignore/add/remove/force # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # number # Add or remove newline at the end of the file -nl_end_of_file = add # ignore/add/remove/force +nl_end_of_file = add # ignore/add/remove/force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # number # Add or remove newline between '=' and '{' -nl_assign_brace = ignore # ignore/add/remove/force +nl_assign_brace = ignore # ignore/add/remove/force # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # ignore/add/remove/force # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # ignore/add/remove/force # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # number # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = ignore # ignore/add/remove/force +nl_fcall_brace = ignore # ignore/add/remove/force # Add or remove newline between 'enum' and '{' -nl_enum_brace = add # ignore/add/remove/force +nl_enum_brace = add # ignore/add/remove/force # Add or remove newline between 'struct and '{' -nl_struct_brace = add # ignore/add/remove/force +nl_struct_brace = add # ignore/add/remove/force # Add or remove newline between 'union' and '{' -nl_union_brace = add # ignore/add/remove/force +nl_union_brace = add # ignore/add/remove/force # Add or remove newline between 'if' and '{' -nl_if_brace = force # ignore/add/remove/force +nl_if_brace = force # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # ignore/add/remove/force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = add # ignore/add/remove/force +nl_elseif_brace = add # ignore/add/remove/force # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # ignore/add/remove/force # Add or remove newline between 'else' and 'if' -nl_else_if = ignore # ignore/add/remove/force +nl_else_if = ignore # ignore/add/remove/force # Add or remove newline between '}' and 'finally' -nl_brace_finally = add # ignore/add/remove/force +nl_brace_finally = add # ignore/add/remove/force # Add or remove newline between 'finally' and '{' -nl_finally_brace = add # ignore/add/remove/force +nl_finally_brace = add # ignore/add/remove/force # Add or remove newline between 'try' and '{' -nl_try_brace = add # ignore/add/remove/force +nl_try_brace = add # ignore/add/remove/force # Add or remove newline between get/set and '{' -nl_getset_brace = add # ignore/add/remove/force +nl_getset_brace = add # ignore/add/remove/force # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # ignore/add/remove/force # Add or remove newline between 'catch' and '{' -nl_catch_brace = add # ignore/add/remove/force +nl_catch_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'catch' -nl_brace_catch = add # ignore/add/remove/force +nl_brace_catch = add # ignore/add/remove/force # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # ignore/add/remove/force # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = ignore # ignore/add/remove/force +nl_brace_while = ignore # ignore/add/remove/force # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # ignore/add/remove/force # Add or remove newline when condition spans two or more lines -nl_multi_line_cond = true # false/true +nl_multi_line_cond = true # false/true # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = false # false/true +nl_multi_line_define = false # false/true # Whether to put a newline before 'case' statement -nl_before_case = false # false/true +nl_before_case = false # false/true # Add or remove newline between ')' and 'throw' -nl_before_throw = ignore # ignore/add/remove/force +nl_before_throw = ignore # ignore/add/remove/force # Whether to put a newline after 'case' statement -nl_after_case = false # false/true +nl_after_case = false # false/true # Newline between namespace and { -nl_namespace_brace = ignore # ignore/add/remove/force +nl_namespace_brace = ignore # ignore/add/remove/force # Add or remove newline between 'template<>' and whatever follows. -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # ignore/add/remove/force # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # ignore/add/remove/force # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = force # ignore/add/remove/force +nl_class_init_args = force # ignore/add/remove/force # Add or remove newline between return type and function name in definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = ignore # ignore/add/remove/force +nl_func_proto_type_name = ignore # ignore/add/remove/force # Add or remove newline between a function name and the opening '(' -nl_func_paren = ignore # ignore/add/remove/force +nl_func_paren = ignore # ignore/add/remove/force # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # ignore/add/remove/force # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = force # ignore/add/remove/force +nl_func_decl_args = force # ignore/add/remove/force # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # ignore/add/remove/force # Add or remove newline between function signature and '{' -nl_fdef_brace = force # ignore/add/remove/force +nl_fdef_brace = force # ignore/add/remove/force # Whether to put a newline after 'return' statement -nl_after_return = false # false/true +nl_after_return = false # false/true # Add or remove a newline between the return keyword and return expression. -nl_return_expr = ignore # ignore/add/remove/force +nl_return_expr = ignore # ignore/add/remove/force # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # false/true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = true # false/true +nl_after_brace_open = true # false/true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true +nl_after_brace_open_cmt = false # false/true # Whether to put a newline after a virtual brace open. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = false # false/true +nl_after_vbrace_open = false # false/true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # false/true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true +nl_squeeze_ifdef = false # false/true # Add or remove newline before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # ignore/add/remove/force # Add or remove newline after 'if' -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # ignore/add/remove/force # Add or remove newline before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # ignore/add/remove/force # Add or remove newline after 'for' -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # ignore/add/remove/force # Add or remove newline before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # ignore/add/remove/force # Add or remove newline after 'while' -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # ignore/add/remove/force # Add or remove newline before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # ignore/add/remove/force # Add or remove newline after 'switch' -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # ignore/add/remove/force # Add or remove newline before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # ignore/add/remove/force # Add or remove newline after 'do' -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # ignore/add/remove/force # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # false/true # Whether to double-space before the close brace of a struct/union/enum -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # false/true # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # ignore/add/remove/force # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # false/true # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # false/true # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # false/true # # Positioning options # # The position of arithmetic operators in wrapped expressions -pos_arith = ignore # ignore/lead/trail +pos_arith = ignore # ignore/lead/trail # The position of assignment in wrapped expressions -pos_assign = ignore # ignore/lead/trail +pos_assign = ignore # ignore/lead/trail # The position of boolean operators in wrapped expressions -pos_bool = ignore # ignore/lead/trail +pos_bool = ignore # ignore/lead/trail # The position of the comma in wrapped expressions -pos_comma = ignore # ignore/lead/trail +pos_comma = ignore # ignore/lead/trail # The position of the comma in the constructor initialization list -pos_class_comma = ignore # ignore/lead/trail +pos_class_comma = ignore # ignore/lead/trail # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # ignore/lead/trail # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 96 # number +code_width = 96 # number # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true +ls_for_split_full = false # false/true # Whether to fully split long function protos/calls at commas -ls_func_split_full = true # false/true +ls_func_split_full = true # false/true # # Blank line options # # The maximum consecutive newlines -nl_max = 0 # number +nl_max = 0 # number # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # number # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 0 # number +nl_after_func_proto_group = 0 # number # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 0 # number +nl_after_func_body = 0 # number # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 0 # number +nl_after_func_body_one_liner = 0 # number # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 0 # number +nl_before_block_comment = 0 # number # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # number # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # number # Whether to force a newline after a mulit-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # false/true # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 0 # number +nl_before_access_spec = 0 # number # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # number # The number of newlines between a function def and the function comment. # 0 = No change. -nl_comment_func_def = 0 # number +nl_comment_func_def = 0 # number # The number of newlines after a try-catch-finally block that isn't followed by a brace close. # 0 = No change. -nl_after_try_catch_finally = 0 # number +nl_after_try_catch_finally = 0 # number # The number of newlines before and after a property, indexer or event decl. # 0 = No change. -nl_around_cs_property = 0 # number +nl_around_cs_property = 0 # number # The number of newlines between the get/set/add/remove handlers in C#. # 0 = No change. -nl_between_get_set = 0 # number +nl_between_get_set = 0 # number # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = false # false/true +eat_blanks_after_open_brace = false # false/true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = false # false/true +eat_blanks_before_close_brace = false # false/true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # ignore/add/remove/force # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # ignore/add/remove/force # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = add # ignore/add/remove/force +mod_full_brace_function = add # ignore/add/remove/force # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # ignore/add/remove/force # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # number # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # ignore/add/remove/force # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = add # ignore/add/remove/force +mod_paren_on_return = add # ignore/add/remove/force # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # false/true # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = false # false/true +mod_full_paren_if_bool = false # false/true # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = false # false/true +mod_remove_extra_semicolon = false # false/true # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 0 # number +mod_add_long_function_closebrace_comment = 0 # number # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number +mod_add_long_switch_closebrace_comment = 0 # number # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # false/true # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # false/true # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # false/true # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = false # false/true +mod_move_case_break = false # false/true # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = false # false/true +mod_remove_empty_return = false # false/true # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # number # If false, disable all multi-line comment changes, including cmt_width and leading chars. # Default is true. -cmt_indent_multi = true # false/true +cmt_indent_multi = true # false/true # Whether to group c-comments that look like they are in a block -cmt_c_group = true # false/true +cmt_c_group = true # false/true # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = true # false/true +cmt_c_nl_start = true # false/true # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = true # false/true +cmt_c_nl_end = true # false/true # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = true # false/true +cmt_cpp_group = true # false/true # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = true # false/true +cmt_cpp_nl_start = true # false/true # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = true # false/true +cmt_cpp_nl_end = true # false/true # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # false/true # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # false/true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # number # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # number # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true # false/true # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitue $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # string # The filename that contains text to insert before a function implementation if the function isn't preceeded with a C/C++ comment. # Will substitue $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # string # The filename that contains text to insert before a class if the class isn't preceeded with a C/C++ comment. # Will substitue $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # string # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true +cmt_insert_before_preproc = false # false/true # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # ignore/add/remove/force # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # false/true # If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. -pp_indent_count = 1 # number +pp_indent_count = 1 # number # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # ignore/add/remove/force # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # number # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # number # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # false/true # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # number # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true +pp_if_indent_code = false # false/true # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # false/true # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/nl_class-a.cfg b/tests/config/nl_class-a.cfg index 4a8c6bf166..dbba713723 100644 --- a/tests/config/nl_class-a.cfg +++ b/tests/config/nl_class-a.cfg @@ -1,6 +1,6 @@ # -nl_class_brace = Add -indent_class = True -indent_namespace = True +nl_class_brace = Add +indent_class = True +indent_namespace = True diff --git a/tests/config/nl_class-r.cfg b/tests/config/nl_class-r.cfg index 425d079775..66741bdaf4 100644 --- a/tests/config/nl_class-r.cfg +++ b/tests/config/nl_class-r.cfg @@ -1,6 +1,6 @@ # -nl_class_brace = Remove -indent_class = True -indent_namespace = True +nl_class_brace = Remove +indent_class = True +indent_namespace = True diff --git a/tests/config/nl_create_one_liner.cfg b/tests/config/nl_create_one_liner.cfg index 381ee7d01f..558b4cbe52 100644 --- a/tests/config/nl_create_one_liner.cfg +++ b/tests/config/nl_create_one_liner.cfg @@ -1,8 +1,8 @@ -indent_columns = 3 -indent_func_call_param = true +indent_columns = 3 +indent_func_call_param = true -nl_create_if_one_liner = true -nl_create_for_one_liner = true -nl_create_while_one_liner = true +nl_create_if_one_liner = true +nl_create_for_one_liner = true +nl_create_while_one_liner = true diff --git a/tests/config/nl_ds_struct_enum-1.cfg b/tests/config/nl_ds_struct_enum-1.cfg index 077e016e32..f65327aec2 100644 --- a/tests/config/nl_ds_struct_enum-1.cfg +++ b/tests/config/nl_ds_struct_enum-1.cfg @@ -2,6 +2,6 @@ # Double-space commented struct/enum/union blocks # -nl_ds_struct_enum_cmt = true -nl_ds_struct_enum_close_brace = false +nl_ds_struct_enum_cmt = true +nl_ds_struct_enum_close_brace = false diff --git a/tests/config/nl_ds_struct_enum-2.cfg b/tests/config/nl_ds_struct_enum-2.cfg index a7ba6e01c5..287c9dc5fd 100644 --- a/tests/config/nl_ds_struct_enum-2.cfg +++ b/tests/config/nl_ds_struct_enum-2.cfg @@ -3,6 +3,6 @@ # Add an extra newline before the close brace # -nl_ds_struct_enum_cmt = true -nl_ds_struct_enum_close_brace = true +nl_ds_struct_enum_cmt = true +nl_ds_struct_enum_close_brace = true diff --git a/tests/config/nl_endif.cfg b/tests/config/nl_endif.cfg index e9bb5faa52..503b37c486 100644 --- a/tests/config/nl_endif.cfg +++ b/tests/config/nl_endif.cfg @@ -1,160 +1,160 @@ -align_func_params=true -align_keep_tabs=false -align_nl_cont=false -align_number_right=false -align_on_tabstop=false -align_right_cmt_mix=false -align_var_def_colon=false -align_var_def_inline=false -align_with_tabs=false -cmt_c_group=false -cmt_c_nl_end=false -cmt_c_nl_start=false -cmt_cpp_group=false -cmt_cpp_nl_end=false -cmt_cpp_nl_start=false -cmt_cpp_to_c=false -cmt_star_cont=false -eat_blanks_after_open_brace=false -eat_blanks_before_close_brace=false -indent_align_string=false -indent_bool_paren=false -indent_brace_parent=false -indent_braces=false -indent_braces_no_func=false -indent_class=false -indent_class_colon=false -indent_col1_comment=false -indent_comma_paren=false -indent_func_call_param=false -indent_func_class_param=false -indent_func_ctor_var_param=false -indent_func_def_param=true -indent_func_param_double=false -indent_func_proto_param=false -indent_namespace=false -indent_paren_nl=true -indent_preserve_sql=false -indent_square_nl=false -ls_for_split_full=false -ls_func_split_full=false -mod_full_paren_if_bool=false -mod_pawn_semicolon=false -mod_remove_extra_semicolon=true -mod_sort_import=false -mod_sort_include=false -mod_sort_using=false -nl_after_brace_open=true -nl_after_brace_open_cmt=false -nl_after_case=false -nl_after_multiline_comment=false -nl_after_return=true -nl_after_semicolon=true -nl_after_vbrace_open=true -nl_assign_leave_one_liners=true -nl_before_case=true -nl_class_leave_one_liners=false -nl_collapse_empty_body=true -nl_create_for_one_liner=false -nl_create_if_one_liner=false -nl_create_while_one_liner=false -nl_define_macro=false -nl_ds_struct_enum_close_brace=false -nl_ds_struct_enum_cmt=false -nl_enum_leave_one_liners=false -nl_func_leave_one_liners=false -nl_getset_leave_one_liners=false -nl_if_leave_one_liners=false -nl_multi_line_cond=false -nl_squeeze_ifdef=true -pp_define_at_level=true -pp_if_indent_code=true -pp_indent_at_level=true -pp_region_indent_code=true -sp_balance_nested_parens=false -align_assign_span=0 -align_right_cmt_span=3 -align_var_def_span=1 -align_var_def_star_style=0 -cmt_width=108 -code_width=108 -indent_case_brace=0 -indent_case_shift=0 -indent_columns=3 -indent_switch_case=3 -indent_with_tabs=0 -input_tab_size=3 -mod_add_long_function_closebrace_comment=1 -mod_add_long_switch_closebrace_comment=16 -nl_end_of_file_min=2 -nl_func_var_def_blk=1 -pp_indent_region=3 -pp_space_count=3 -mod_paren_on_return=force -nl_after_do=force -nl_after_for=force -nl_after_if=force -nl_after_switch=force -nl_after_while=force -nl_before_do=force -nl_before_for=force -nl_before_if=force -nl_before_switch=force -nl_before_while=force -nl_brace_else=force -nl_brace_while=force -nl_class_brace=force -nl_else_brace=force -nl_elseif_brace=force -nl_end_of_file=force -nl_fcall_brace=force -nl_fdef_brace=force -nl_for_brace=force -nl_func_decl_args=force -nl_func_decl_end=add -nl_func_decl_start=force -nl_func_paren=force -nl_func_proto_type_name=remove -nl_func_type_name=remove -nl_if_brace=force -nl_while_brace=add -pos_class_comma=trail -pos_comma=trail -pp_indent=force -sp_after_cast=remove -sp_after_comma=force -sp_after_oc_type=remove -sp_after_ptr_star=add -sp_after_sparen=force -sp_arith=force -sp_assign=force -sp_before_comma=remove -sp_before_ptr_star=remove -sp_before_semi=remove -sp_before_semi_for=remove -sp_before_semi_for_empty=remove -sp_before_sparen=remove -sp_before_square=remove -sp_before_squares=remove -sp_bool=force -sp_brace_else=force -sp_compare=force -sp_deref=remove -sp_fparen_brace=force -sp_func_call_paren=remove -sp_func_def_paren=remove -sp_func_proto_paren=remove -sp_incdec=remove -sp_inside_braces=force -sp_inside_fparen=remove -sp_inside_fparens=remove -sp_inside_paren=remove -sp_inside_paren_cast=remove -sp_inside_sparen=remove -sp_macro=force -sp_macro_func=force -sp_member=remove -sp_not=remove -sp_paren_paren=remove -sp_return_paren=force -sp_type_func=force +align_func_params = true +align_keep_tabs = false +align_nl_cont = false +align_number_right = false +align_on_tabstop = false +align_right_cmt_mix = false +align_var_def_colon = false +align_var_def_inline = false +align_with_tabs = false +cmt_c_group = false +cmt_c_nl_end = false +cmt_c_nl_start = false +cmt_cpp_group = false +cmt_cpp_nl_end = false +cmt_cpp_nl_start = false +cmt_cpp_to_c = false +cmt_star_cont = false +eat_blanks_after_open_brace = false +eat_blanks_before_close_brace = false +indent_align_string = false +indent_bool_paren = false +indent_brace_parent = false +indent_braces = false +indent_braces_no_func = false +indent_class = false +indent_class_colon = false +indent_col1_comment = false +indent_comma_paren = false +indent_func_call_param = false +indent_func_class_param = false +indent_func_ctor_var_param = false +indent_func_def_param = true +indent_func_param_double = false +indent_func_proto_param = false +indent_namespace = false +indent_paren_nl = true +indent_preserve_sql = false +indent_square_nl = false +ls_for_split_full = false +ls_func_split_full = false +mod_full_paren_if_bool = false +mod_pawn_semicolon = false +mod_remove_extra_semicolon = true +mod_sort_import = false +mod_sort_include = false +mod_sort_using = false +nl_after_brace_open = true +nl_after_brace_open_cmt = false +nl_after_case = false +nl_after_multiline_comment = false +nl_after_return = true +nl_after_semicolon = true +nl_after_vbrace_open = true +nl_assign_leave_one_liners = true +nl_before_case = true +nl_class_leave_one_liners = false +nl_collapse_empty_body = true +nl_create_for_one_liner = false +nl_create_if_one_liner = false +nl_create_while_one_liner = false +nl_define_macro = false +nl_ds_struct_enum_close_brace = false +nl_ds_struct_enum_cmt = false +nl_enum_leave_one_liners = false +nl_func_leave_one_liners = false +nl_getset_leave_one_liners = false +nl_if_leave_one_liners = false +nl_multi_line_cond = false +nl_squeeze_ifdef = true +pp_define_at_level = true +pp_if_indent_code = true +pp_indent_at_level = true +pp_region_indent_code = true +sp_balance_nested_parens = false +align_assign_span = 0 +align_right_cmt_span = 3 +align_var_def_span = 1 +align_var_def_star_style = 0 +cmt_width = 108 +code_width = 108 +indent_case_brace = 0 +indent_case_shift = 0 +indent_columns = 3 +indent_switch_case = 3 +indent_with_tabs = 0 +input_tab_size = 3 +mod_add_long_function_closebrace_comment = 1 +mod_add_long_switch_closebrace_comment = 16 +nl_end_of_file_min = 2 +nl_func_var_def_blk = 1 +pp_indent_region = 3 +pp_space_count = 3 +mod_paren_on_return = force +nl_after_do = force +nl_after_for = force +nl_after_if = force +nl_after_switch = force +nl_after_while = force +nl_before_do = force +nl_before_for = force +nl_before_if = force +nl_before_switch = force +nl_before_while = force +nl_brace_else = force +nl_brace_while = force +nl_class_brace = force +nl_else_brace = force +nl_elseif_brace = force +nl_end_of_file = force +nl_fcall_brace = force +nl_fdef_brace = force +nl_for_brace = force +nl_func_decl_args = force +nl_func_decl_end = add +nl_func_decl_start = force +nl_func_paren = force +nl_func_proto_type_name = remove +nl_func_type_name = remove +nl_if_brace = force +nl_while_brace = add +pos_class_comma = trail +pos_comma = trail +pp_indent = force +sp_after_cast = remove +sp_after_comma = force +sp_after_oc_type = remove +sp_after_ptr_star = add +sp_after_sparen = force +sp_arith = force +sp_assign = force +sp_before_comma = remove +sp_before_ptr_star = remove +sp_before_semi = remove +sp_before_semi_for = remove +sp_before_semi_for_empty = remove +sp_before_sparen = remove +sp_before_square = remove +sp_before_squares = remove +sp_bool = force +sp_brace_else = force +sp_compare = force +sp_deref = remove +sp_fparen_brace = force +sp_func_call_paren = remove +sp_func_def_paren = remove +sp_func_proto_paren = remove +sp_incdec = remove +sp_inside_braces = force +sp_inside_fparen = remove +sp_inside_fparens = remove +sp_inside_paren = remove +sp_inside_paren_cast = remove +sp_inside_sparen = remove +sp_macro = force +sp_macro_func = force +sp_member = remove +sp_not = remove +sp_paren_paren = remove +sp_return_paren = force +sp_type_func = force diff --git a/tests/config/nl_enum_own_lines-1.cfg b/tests/config/nl_enum_own_lines-1.cfg index 40263834c0..fd0297de53 100644 --- a/tests/config/nl_enum_own_lines-1.cfg +++ b/tests/config/nl_enum_own_lines-1.cfg @@ -1,2 +1,2 @@ -nl_enum_own_lines = ignore -code_width=80 +nl_enum_own_lines = ignore +code_width = 80 diff --git a/tests/config/nl_enum_own_lines-2.cfg b/tests/config/nl_enum_own_lines-2.cfg index 86fbf2ebb1..0b3de76f9c 100644 --- a/tests/config/nl_enum_own_lines-2.cfg +++ b/tests/config/nl_enum_own_lines-2.cfg @@ -1,2 +1,2 @@ -nl_enum_own_lines = add -code_width=80 +nl_enum_own_lines = add +code_width = 80 diff --git a/tests/config/nl_enum_own_lines-3.cfg b/tests/config/nl_enum_own_lines-3.cfg index aec8d5e7a6..2fbc0fa2c6 100644 --- a/tests/config/nl_enum_own_lines-3.cfg +++ b/tests/config/nl_enum_own_lines-3.cfg @@ -1,2 +1,2 @@ -nl_enum_own_lines = remove -code_width=80 +nl_enum_own_lines = remove +code_width = 80 diff --git a/tests/config/nl_enum_own_lines-4.cfg b/tests/config/nl_enum_own_lines-4.cfg index 554cd90991..8f6bfd8714 100644 --- a/tests/config/nl_enum_own_lines-4.cfg +++ b/tests/config/nl_enum_own_lines-4.cfg @@ -1,4 +1,4 @@ -nl_enum_own_lines = force -code_width=80 +nl_enum_own_lines = force +code_width = 80 -nl_remove_extra_newlines = 2 +nl_remove_extra_newlines = 2 diff --git a/tests/config/nl_func_call_empty.cfg b/tests/config/nl_func_call_empty.cfg index 6609b3ddcd..d9e6ae5754 100644 --- a/tests/config/nl_func_call_empty.cfg +++ b/tests/config/nl_func_call_empty.cfg @@ -1 +1 @@ -nl_func_call_empty = remove \ No newline at end of file +nl_func_call_empty = remove diff --git a/tests/config/nl_func_call_paren.cfg b/tests/config/nl_func_call_paren.cfg index eda1295b85..0071825fb3 100644 --- a/tests/config/nl_func_call_paren.cfg +++ b/tests/config/nl_func_call_paren.cfg @@ -1 +1 @@ -nl_func_call_paren = force \ No newline at end of file +nl_func_call_paren = force diff --git a/tests/config/nl_func_call_paren_empty.cfg b/tests/config/nl_func_call_paren_empty.cfg index 89c83415d6..6bc21d582a 100644 --- a/tests/config/nl_func_call_paren_empty.cfg +++ b/tests/config/nl_func_call_paren_empty.cfg @@ -1 +1 @@ -nl_func_call_paren_empty = remove \ No newline at end of file +nl_func_call_paren_empty = remove diff --git a/tests/config/nl_func_class_scope.cfg b/tests/config/nl_func_class_scope.cfg index 92b7f078e2..656b544dbe 100644 --- a/tests/config/nl_func_class_scope.cfg +++ b/tests/config/nl_func_class_scope.cfg @@ -1 +1 @@ -nl_func_class_scope=add \ No newline at end of file +nl_func_class_scope = add diff --git a/tests/config/nl_func_decl_1.cfg b/tests/config/nl_func_decl_1.cfg index 1dd3bd3a51..f2ba70c726 100644 --- a/tests/config/nl_func_decl_1.cfg +++ b/tests/config/nl_func_decl_1.cfg @@ -1,17 +1,17 @@ -nl_func_paren = remove -nl_func_decl_empty = remove -nl_func_decl_start = remove -nl_func_decl_args = remove -nl_func_decl_end = remove +nl_func_paren = remove +nl_func_decl_empty = remove +nl_func_decl_start = remove +nl_func_decl_args = remove +nl_func_decl_end = remove -nl_func_def_paren = force -nl_func_def_empty = force -nl_func_def_start = force -nl_func_def_args = force -nl_func_def_end = force +nl_func_def_paren = force +nl_func_def_empty = force +nl_func_def_start = force +nl_func_def_args = force +nl_func_def_end = force # a few more options to make the output pretty -sp_after_comma = force -sp_inside_paren = force -sp_inside_fparen = force +sp_after_comma = force +sp_inside_paren = force +sp_inside_fparen = force diff --git a/tests/config/nl_func_decl_2.cfg b/tests/config/nl_func_decl_2.cfg index 57a95f78c3..82773175f1 100644 --- a/tests/config/nl_func_decl_2.cfg +++ b/tests/config/nl_func_decl_2.cfg @@ -1,19 +1,19 @@ -nl_func_paren = force -nl_func_decl_empty = force -nl_func_decl_start = force -nl_func_decl_args = force -nl_func_decl_end = force +nl_func_paren = force +nl_func_decl_empty = force +nl_func_decl_start = force +nl_func_decl_args = force +nl_func_decl_end = force -nl_func_def_paren = remove -nl_func_def_empty = remove -nl_func_def_start = remove -nl_func_def_args = remove -nl_func_def_end = remove +nl_func_def_paren = remove +nl_func_def_empty = remove +nl_func_def_start = remove +nl_func_def_args = remove +nl_func_def_end = remove # a few more options to make the output pretty -sp_after_comma = force -sp_inside_paren = force -sp_inside_fparen = force -align_func_params = true +sp_after_comma = force +sp_inside_paren = force +sp_inside_fparen = force +align_func_params = true diff --git a/tests/config/nl_func_def_paren_empty.cfg b/tests/config/nl_func_def_paren_empty.cfg index 16372420e5..6805578ecc 100644 --- a/tests/config/nl_func_def_paren_empty.cfg +++ b/tests/config/nl_func_def_paren_empty.cfg @@ -1,4 +1,4 @@ -# The option that is being overridden by nl_func_def_paren_empty -nl_func_def_paren = force - -nl_func_def_paren_empty = remove \ No newline at end of file +# The option that is being overridden by nl_func_def_paren_empty +nl_func_def_paren = force + +nl_func_def_paren_empty = remove diff --git a/tests/config/nl_func_paren_empty.cfg b/tests/config/nl_func_paren_empty.cfg index de1a510de2..3b00a75c11 100644 --- a/tests/config/nl_func_paren_empty.cfg +++ b/tests/config/nl_func_paren_empty.cfg @@ -1,4 +1,4 @@ -# The option that is being overridden by nl_func_paren_empty -nl_func_paren = force - -nl_func_paren_empty = remove \ No newline at end of file +# The option that is being overridden by nl_func_paren_empty +nl_func_paren = force + +nl_func_paren_empty = remove diff --git a/tests/config/nl_func_scope_name.cfg b/tests/config/nl_func_scope_name.cfg index ac59aa9d65..649dfc0e5a 100644 --- a/tests/config/nl_func_scope_name.cfg +++ b/tests/config/nl_func_scope_name.cfg @@ -1,7 +1,7 @@ -sp_cmt_cpp_start = add +sp_cmt_cpp_start = add # align_var_def_span = 16 -align_func_proto_span =16 -align_on_operator =true -nl_func_scope_name = add +align_func_proto_span = 16 +align_on_operator = true +nl_func_scope_name = add diff --git a/tests/config/nl_func_type_name_class.cfg b/tests/config/nl_func_type_name_class.cfg index 0dc5051729..058d68d3b9 100644 --- a/tests/config/nl_func_type_name_class.cfg +++ b/tests/config/nl_func_type_name_class.cfg @@ -1,8 +1,8 @@ -sp_cmt_cpp_start = add +sp_cmt_cpp_start = add # align_var_def_span = 16 -align_func_proto_span =16 -align_on_operator =true -nl_func_type_name = force -nl_func_type_name_class = remove -nl_func_proto_type_name = force +align_func_proto_span = 16 +align_on_operator = true +nl_func_type_name = force +nl_func_type_name_class = remove +nl_func_proto_type_name = force diff --git a/tests/config/nl_func_type_name_force.cfg b/tests/config/nl_func_type_name_force.cfg index 8314c421c9..a17583158c 100644 --- a/tests/config/nl_func_type_name_force.cfg +++ b/tests/config/nl_func_type_name_force.cfg @@ -1,8 +1,8 @@ -sp_cmt_cpp_start = add +sp_cmt_cpp_start = add # align_var_def_span = 16 -align_func_proto_span =16 -align_on_operator =true -nl_func_type_name = force -nl_func_proto_type_name = force +align_func_proto_span = 16 +align_on_operator = true +nl_func_type_name = force +nl_func_proto_type_name = force diff --git a/tests/config/nl_func_type_name_remove.cfg b/tests/config/nl_func_type_name_remove.cfg index 58cc7afd6e..38ea276886 100644 --- a/tests/config/nl_func_type_name_remove.cfg +++ b/tests/config/nl_func_type_name_remove.cfg @@ -1,8 +1,8 @@ -sp_cmt_cpp_start = add +sp_cmt_cpp_start = add # align_var_def_span = 16 -align_func_proto_span =16 -align_on_operator =true -nl_func_type_name = remove -nl_func_proto_type_name = remove +align_func_proto_span = 16 +align_on_operator = true +nl_func_type_name = remove +nl_func_proto_type_name = remove diff --git a/tests/config/nl_max_blank_in_func-0.cfg b/tests/config/nl_max_blank_in_func-0.cfg index 41483c826f..597ccf5919 100644 --- a/tests/config/nl_max_blank_in_func-0.cfg +++ b/tests/config/nl_max_blank_in_func-0.cfg @@ -1 +1 @@ -nl_max_blank_in_func = 1 +nl_max_blank_in_func = 1 diff --git a/tests/config/nl_max_blank_in_func-1.cfg b/tests/config/nl_max_blank_in_func-1.cfg index f22ae66cda..09bbe0fc7f 100644 --- a/tests/config/nl_max_blank_in_func-1.cfg +++ b/tests/config/nl_max_blank_in_func-1.cfg @@ -1 +1 @@ -nl_max_blank_in_func = 4 +nl_max_blank_in_func = 4 diff --git a/tests/config/nl_max_blank_in_func-2.cfg b/tests/config/nl_max_blank_in_func-2.cfg index 6bb3ad36a1..5c3718d146 100644 --- a/tests/config/nl_max_blank_in_func-2.cfg +++ b/tests/config/nl_max_blank_in_func-2.cfg @@ -1 +1 @@ -nl_max_blank_in_func = 5 +nl_max_blank_in_func = 5 diff --git a/tests/config/nl_namespace-a.cfg b/tests/config/nl_namespace-a.cfg index 43b8c01387..dedcb955e2 100644 --- a/tests/config/nl_namespace-a.cfg +++ b/tests/config/nl_namespace-a.cfg @@ -1,6 +1,6 @@ # -nl_namespace_brace = Add -indent_class = True -indent_namespace = True +nl_namespace_brace = Add +indent_class = True +indent_namespace = True diff --git a/tests/config/nl_namespace-r.cfg b/tests/config/nl_namespace-r.cfg index 54a3cc356d..0ff8d61388 100644 --- a/tests/config/nl_namespace-r.cfg +++ b/tests/config/nl_namespace-r.cfg @@ -1,6 +1,6 @@ # -nl_namespace_brace = Remove -indent_class = True -indent_namespace = True +nl_namespace_brace = Remove +indent_class = True +indent_namespace = True diff --git a/tests/config/nl_semicolon.cfg b/tests/config/nl_semicolon.cfg index 333f5410cc..e75523de1e 100644 --- a/tests/config/nl_semicolon.cfg +++ b/tests/config/nl_semicolon.cfg @@ -1,100 +1,100 @@ # -nl_after_semicolon = True -nl_after_brace_open = True +nl_after_semicolon = True +nl_after_brace_open = True -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size -indent_columns = output_tab_size -indent_label = 2 # pos: absolute col, neg: relative column -indent_align_string = False # align broken strings -indent_brace = 0 -indent_member = indent_columns +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 3 # new tab size +indent_columns = output_tab_size +indent_label = 2 # pos: absolute col, neg: relative column +indent_align_string = False # align broken strings +indent_brace = 0 +indent_member = indent_columns -nl_assign_brace = add # "= {" vs "= \n {" -nl_enum_brace = add # "enum {" vs "enum \n {" -nl_union_brace = add # "union {" vs "union \n {" -nl_struct_brace = add # "struct {" vs "struct \n {" -nl_do_brace = add # "do {" vs "do \n {" -nl_if_brace = add # "if () {" vs "if () \n {" -nl_for_brace = add # "for () {" vs "for () \n {" -nl_else_brace = add # "else {" vs "else \n {" -nl_while_brace = add # "while () {" vs "while () \n {" -nl_switch_brace = add # "switch () {" vs "switch () \n {" -nl_func_var_def_blk = 1 -nl_before_case = 1 -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" -nl_after_return = TRUE -nl_brace_while = remove -nl_brace_else = add -nl_squeeze_ifdef = TRUE +nl_assign_brace = add # "= {" vs "= \n {" +nl_enum_brace = add # "enum {" vs "enum \n {" +nl_union_brace = add # "union {" vs "union \n {" +nl_struct_brace = add # "struct {" vs "struct \n {" +nl_do_brace = add # "do {" vs "do \n {" +nl_if_brace = add # "if () {" vs "if () \n {" +nl_for_brace = add # "for () {" vs "for () \n {" +nl_else_brace = add # "else {" vs "else \n {" +nl_while_brace = add # "while () {" vs "while () \n {" +nl_switch_brace = add # "switch () {" vs "switch () \n {" +nl_func_var_def_blk = 1 +nl_before_case = 1 +nl_fcall_brace = add # "foo() {" vs "foo()\n{" +nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_after_return = TRUE +nl_brace_while = remove +nl_brace_else = add +nl_squeeze_ifdef = TRUE -mod_paren_on_return = add # "return 1;" vs "return (1);" -mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" -mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" +mod_paren_on_return = add # "return 1;" vs "return (1);" +mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" +mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" +mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" +mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" -sp_before_byref = remove -sp_before_semi = remove -sp_before_semi_for = remove -sp_after_semi_for = force -sp_before_semi_for_empty = remove -sp_after_semi_for_empty = remove -sp_paren_paren = remove # space between (( and )) -sp_return_paren = remove # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" -sp_inside_paren = remove -sp_inside_fparen = remove -sp_inside_sparen = remove -sp_inside_square = remove +sp_before_byref = remove +sp_before_semi = remove +sp_before_semi_for = remove +sp_after_semi_for = force +sp_before_semi_for_empty = remove +sp_after_semi_for_empty = remove +sp_paren_paren = remove # space between (( and )) +sp_return_paren = remove # "return (1);" vs "return(1);" +sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" +sp_before_sparen = force # "if (" vs "if(" +sp_after_sparen = force # "if () {" vs "if (){" +sp_after_cast = remove # "(int) a" vs "(int)a" +sp_inside_braces = force # "{ 1 }" vs "{1}" +sp_inside_braces_struct = force # "{ 1 }" vs "{1}" +sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_inside_paren = remove +sp_inside_fparen = remove +sp_inside_sparen = remove +sp_inside_square = remove #sp_type_func = ignore -sp_assign = force -sp_arith = force -sp_bool = force -sp_compare = force -sp_assign = force -sp_after_comma = force -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" -sp_after_ptr_star = remove -sp_before_ptr_star = force -sp_between_ptr_star = remove +sp_assign = force +sp_arith = force +sp_bool = force +sp_compare = force +sp_assign = force +sp_after_comma = force +sp_func_def_paren = remove # "int foo (){" vs "int foo(){" +sp_func_call_paren = remove # "foo (" vs "foo(" +sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_after_ptr_star = remove +sp_before_ptr_star = force +sp_between_ptr_star = remove -align_with_tabs = FALSE # use tabs to align -align_on_tabstop = FALSE # align on tabstops -align_enum_equ_span = 4 -align_nl_cont = TRUE -align_var_def_span = 2 -align_var_def_inline = TRUE -align_var_def_star_style = 1 -align_var_def_colon = TRUE -align_assign_span = 1 +align_with_tabs = FALSE # use tabs to align +align_on_tabstop = FALSE # align on tabstops +align_enum_equ_span = 4 +align_nl_cont = TRUE +align_var_def_span = 2 +align_var_def_inline = TRUE +align_var_def_star_style = 1 +align_var_def_colon = TRUE +align_assign_span = 1 # align_assign_thresh = 8 -align_struct_init_span = 3 -align_var_struct_span = 3 -align_right_cmt_span = 3 -align_pp_define_span = 3 -align_pp_define_gap = 4 -align_number_right = TRUE -align_typedef_span = 5 -align_typedef_gap = 3 +align_struct_init_span = 3 +align_var_struct_span = 3 +align_right_cmt_span = 3 +align_pp_define_span = 3 +align_pp_define_gap = 4 +align_number_right = TRUE +align_typedef_span = 5 +align_typedef_gap = 3 -cmt_star_cont = TRUE +cmt_star_cont = TRUE -eat_blanks_before_close_brace = TRUE -eat_blanks_after_open_brace = TRUE +eat_blanks_before_close_brace = TRUE +eat_blanks_after_open_brace = TRUE # indent_namespace = FALSE -indent_class = TRUE +indent_class = TRUE diff --git a/tests/config/nl_template_class-force.cfg b/tests/config/nl_template_class-force.cfg index 3e5ebb61f9..6b4c906048 100644 --- a/tests/config/nl_template_class-force.cfg +++ b/tests/config/nl_template_class-force.cfg @@ -2,25 +2,25 @@ # Forces a newline between template '>' and class # -indent_columns = 3 +indent_columns = 3 -sp_before_byref = remove -sp_after_byref = force +sp_before_byref = remove +sp_after_byref = force -indent_class = True +indent_class = True -sp_func_def_paren = remove -sp_func_proto_paren = remove -sp_after_operator = force -sp_after_angle = force -sp_angle_word = force -sp_angle_paren = remove -sp_angle_paren_empty = remove -sp_arith = force -sp_compare = force +sp_func_def_paren = remove +sp_func_proto_paren = remove +sp_after_operator = force +sp_after_angle = force +sp_angle_word = force +sp_angle_paren = remove +sp_angle_paren_empty = remove +sp_arith = force +sp_compare = force -nl_template_class = force -sp_inside_braces = force -sp_inside_braces_struct = force +nl_template_class = force +sp_inside_braces = force +sp_inside_braces_struct = force -tok_split_gte = true +tok_split_gte = true diff --git a/tests/config/nl_template_class-remove.cfg b/tests/config/nl_template_class-remove.cfg index d227876c6e..49a667e226 100644 --- a/tests/config/nl_template_class-remove.cfg +++ b/tests/config/nl_template_class-remove.cfg @@ -2,29 +2,29 @@ # Removes newlines between template '>' and class # -indent_columns = 3 +indent_columns = 3 -sp_before_byref = remove -sp_after_byref = force +sp_before_byref = remove +sp_after_byref = force -indent_class = True +indent_class = True -sp_func_def_paren = remove -sp_func_proto_paren = remove -sp_after_operator = force -sp_after_angle = force -sp_angle_word = force -sp_angle_paren = remove -sp_angle_paren_empty = remove -sp_arith = force -sp_compare = force +sp_func_def_paren = remove +sp_func_proto_paren = remove +sp_after_operator = force +sp_after_angle = force +sp_angle_word = force +sp_angle_paren = remove +sp_angle_paren_empty = remove +sp_arith = force +sp_compare = force -nl_template_class = remove +nl_template_class = remove -sp_inside_braces = force -sp_inside_braces_struct = force +sp_inside_braces = force +sp_inside_braces_struct = force -tok_split_gte = true +tok_split_gte = true -sp_after_cast = force -sp_before_unnamed_ptr_star = remove +sp_after_cast = force +sp_before_unnamed_ptr_star = remove diff --git a/tests/config/nl_try-a.cfg b/tests/config/nl_try-a.cfg index 1c054e75ad..a54bc30219 100644 --- a/tests/config/nl_try-a.cfg +++ b/tests/config/nl_try-a.cfg @@ -1,8 +1,8 @@ # -nl_catch_brace = force -nl_try_brace = force -nl_brace_catch = force +nl_catch_brace = force +nl_try_brace = force +nl_brace_catch = force -nl_after_vbrace_open = true +nl_after_vbrace_open = true diff --git a/tests/config/nl_type_brace_init_lst-f.cfg b/tests/config/nl_type_brace_init_lst-f.cfg index 1b29c5cd3e..8d8df5a92b 100644 --- a/tests/config/nl_type_brace_init_lst-f.cfg +++ b/tests/config/nl_type_brace_init_lst-f.cfg @@ -1 +1 @@ -nl_type_brace_init_lst = force \ No newline at end of file +nl_type_brace_init_lst = force diff --git a/tests/config/nl_type_brace_init_lst-r.cfg b/tests/config/nl_type_brace_init_lst-r.cfg index 83393a62c8..7a8fb4d7b7 100644 --- a/tests/config/nl_type_brace_init_lst-r.cfg +++ b/tests/config/nl_type_brace_init_lst-r.cfg @@ -1 +1 @@ -nl_type_brace_init_lst = remove \ No newline at end of file +nl_type_brace_init_lst = remove diff --git a/tests/config/nl_type_brace_init_lst_close-f.cfg b/tests/config/nl_type_brace_init_lst_close-f.cfg index 43932fc612..3b30a9065f 100644 --- a/tests/config/nl_type_brace_init_lst_close-f.cfg +++ b/tests/config/nl_type_brace_init_lst_close-f.cfg @@ -1 +1 @@ -nl_type_brace_init_lst_close = force \ No newline at end of file +nl_type_brace_init_lst_close = force diff --git a/tests/config/nl_type_brace_init_lst_close-r.cfg b/tests/config/nl_type_brace_init_lst_close-r.cfg index baf5e7b20a..cc0288d445 100644 --- a/tests/config/nl_type_brace_init_lst_close-r.cfg +++ b/tests/config/nl_type_brace_init_lst_close-r.cfg @@ -1 +1 @@ -nl_type_brace_init_lst_close = remove \ No newline at end of file +nl_type_brace_init_lst_close = remove diff --git a/tests/config/nl_type_brace_init_lst_open-f.cfg b/tests/config/nl_type_brace_init_lst_open-f.cfg index 8277640307..ba55d0db07 100644 --- a/tests/config/nl_type_brace_init_lst_open-f.cfg +++ b/tests/config/nl_type_brace_init_lst_open-f.cfg @@ -1 +1 @@ -nl_type_brace_init_lst_open = force \ No newline at end of file +nl_type_brace_init_lst_open = force diff --git a/tests/config/nl_type_brace_init_lst_open-r.cfg b/tests/config/nl_type_brace_init_lst_open-r.cfg index 1a978b9480..d227ff1fa6 100644 --- a/tests/config/nl_type_brace_init_lst_open-r.cfg +++ b/tests/config/nl_type_brace_init_lst_open-r.cfg @@ -1 +1 @@ -nl_type_brace_init_lst_open = remove \ No newline at end of file +nl_type_brace_init_lst_open = remove diff --git a/tests/config/no_squeeze_ifdef.cfg b/tests/config/no_squeeze_ifdef.cfg index 9451fe8bcc..840f60da86 100644 --- a/tests/config/no_squeeze_ifdef.cfg +++ b/tests/config/no_squeeze_ifdef.cfg @@ -1,2 +1,2 @@ -nl_before_return = true -nl_after_return = true +nl_before_return = true +nl_after_return = true diff --git a/tests/config/obj-c-properties.cfg b/tests/config/obj-c-properties.cfg index 6b599dc5c7..f4896d0edf 100644 --- a/tests/config/obj-c-properties.cfg +++ b/tests/config/obj-c-properties.cfg @@ -1,10 +1,10 @@ -sp_inside_paren = remove +sp_inside_paren = remove -mod_sort_oc_properties = true +mod_sort_oc_properties = true mod_sort_oc_property_thread_safe_weight = 6 -mod_sort_oc_property_readwrite_weight = 5 -mod_sort_oc_property_reference_weight = 4 +mod_sort_oc_property_readwrite_weight = 5 +mod_sort_oc_property_reference_weight = 4 mod_sort_oc_property_nullability_weight = 3 -mod_sort_oc_property_getter_weight = 2 -mod_sort_oc_property_setter_weight = 1 +mod_sort_oc_property_getter_weight = 2 +mod_sort_oc_property_setter_weight = 1 diff --git a/tests/config/obj-c.cfg b/tests/config/obj-c.cfg index ea6bf3a92a..1bec5914db 100644 --- a/tests/config/obj-c.cfg +++ b/tests/config/obj-c.cfg @@ -1,232 +1,232 @@ -newlines = auto -input_tab_size = 8 -output_tab_size = 3 -string_escape_char = 92 -indent_columns = 3 -indent_with_tabs = 0 -indent_align_string = false -indent_xml_string = 0 -indent_brace = 0 -indent_braces = false -indent_braces_no_func = false -indent_brace_parent = false -indent_namespace = false -indent_class = true -indent_class_colon = false -indent_func_call_param = false -indent_member = 3 -indent_sing_line_comments = 0 -indent_switch_case = 0 -indent_case_brace = 0 -indent_col1_comment = false -indent_label = 2 -indent_access_spec = 2 -indent_paren_nl = false -indent_square_nl = false -sp_arith = force -sp_assign = force -sp_bool = force -sp_compare = force -sp_inside_paren = remove -sp_paren_paren = remove -sp_balance_nested_parens = false -sp_paren_brace = ignore -sp_before_ptr_star = force -sp_between_ptr_star = remove -sp_after_ptr_star = remove -sp_before_byref = remove -sp_after_byref = ignore -sp_before_angle = remove -sp_after_angle = force -sp_angle_paren = remove -sp_angle_paren_empty = remove -sp_angle_word = force -sp_before_sparen = force -sp_inside_sparen = remove -sp_after_sparen = force -sp_sparen_brace = ignore -sp_special_semi = ignore -sp_before_semi = remove -sp_before_semi_for = ignore -sp_before_square = ignore -sp_before_squares = ignore -sp_inside_square = remove -sp_after_comma = force -sp_before_comma = remove -sp_after_operator = ignore -sp_after_cast = remove -sp_sizeof_paren = remove -sp_after_tag = ignore -sp_inside_braces_enum = force -sp_inside_braces_struct = force -sp_inside_braces = force -sp_inside_angle = remove -sp_type_func = ignore -sp_func_proto_paren = remove -sp_func_def_paren = remove -sp_inside_fparens = ignore -sp_inside_fparen = remove -sp_square_fparen = ignore -sp_fparen_brace = ignore -sp_func_call_paren = remove -sp_func_class_paren = ignore -sp_return_paren = remove -sp_macro = ignore -sp_before_semi_for_empty = force -sp_before_oc_colon = remove -sp_after_oc_colon = force -sp_after_oc_scope = remove -sp_after_oc_type = force +newlines = auto +input_tab_size = 8 +output_tab_size = 3 +string_escape_char = 92 +indent_columns = 3 +indent_with_tabs = 0 +indent_align_string = false +indent_xml_string = 0 +indent_brace = 0 +indent_braces = false +indent_braces_no_func = false +indent_brace_parent = false +indent_namespace = false +indent_class = true +indent_class_colon = false +indent_func_call_param = false +indent_member = 3 +indent_sing_line_comments = 0 +indent_switch_case = 0 +indent_case_brace = 0 +indent_col1_comment = false +indent_label = 2 +indent_access_spec = 2 +indent_paren_nl = false +indent_square_nl = false +sp_arith = force +sp_assign = force +sp_bool = force +sp_compare = force +sp_inside_paren = remove +sp_paren_paren = remove +sp_balance_nested_parens = false +sp_paren_brace = ignore +sp_before_ptr_star = force +sp_between_ptr_star = remove +sp_after_ptr_star = remove +sp_before_byref = remove +sp_after_byref = ignore +sp_before_angle = remove +sp_after_angle = force +sp_angle_paren = remove +sp_angle_paren_empty = remove +sp_angle_word = force +sp_before_sparen = force +sp_inside_sparen = remove +sp_after_sparen = force +sp_sparen_brace = ignore +sp_special_semi = ignore +sp_before_semi = remove +sp_before_semi_for = ignore +sp_before_square = ignore +sp_before_squares = ignore +sp_inside_square = remove +sp_after_comma = force +sp_before_comma = remove +sp_after_operator = ignore +sp_after_cast = remove +sp_sizeof_paren = remove +sp_after_tag = ignore +sp_inside_braces_enum = force +sp_inside_braces_struct = force +sp_inside_braces = force +sp_inside_angle = remove +sp_type_func = ignore +sp_func_proto_paren = remove +sp_func_def_paren = remove +sp_inside_fparens = ignore +sp_inside_fparen = remove +sp_square_fparen = ignore +sp_fparen_brace = ignore +sp_func_call_paren = remove +sp_func_class_paren = ignore +sp_return_paren = remove +sp_macro = ignore +sp_before_semi_for_empty = force +sp_before_oc_colon = remove +sp_after_oc_colon = force +sp_after_oc_scope = remove +sp_after_oc_type = force -align_oc_msg_colon_span = 1 # align parameters in an Obj-C message on the ':' but stop after this many lines (0=don't align) -align_oc_msg_spec_span = 2 # the span for aligning ObjC msg spec (0=don't align) +align_oc_msg_colon_span = 1 # align parameters in an Obj-C message on the ':' but stop after this many lines (0=don't align) +align_oc_msg_spec_span = 2 # the span for aligning ObjC msg spec (0=don't align) -sp_macro_func = ignore -sp_else_brace = ignore -sp_brace_else = ignore -sp_catch_brace = ignore -sp_brace_catch = ignore -sp_finally_brace = ignore -sp_brace_finally = ignore -sp_try_brace = ignore -sp_getset_brace = ignore -align_keep_tabs = false -align_with_tabs = false -align_on_tabstop = false -align_number_right = true -align_func_params = true -align_var_def_span = 2 -align_var_def_star_style = 1 -align_var_def_thresh = 0 -align_var_def_colon = true -align_var_def_inline = true -align_assign_span = 1 -align_assign_thresh = 0 -align_enum_equ_span = 4 -align_enum_equ_thresh = 0 -align_var_struct_span = 3 -align_struct_init_span = 3 -align_typedef_gap = 3 -align_typedef_span = 5 -align_typedef_star_style = 0 -align_right_cmt_span = 3 -align_func_proto_span = 0 -align_nl_cont = true -align_pp_define_gap = 4 -align_pp_define_span = 3 -code_width = 0 -nl_collapse_empty_body = false -nl_class_leave_one_liners = true -nl_assign_leave_one_liners = true -nl_start_of_file = ignore -nl_start_of_file_min = 0 -nl_end_of_file = force -nl_end_of_file_min = 1 -nl_assign_brace = add -nl_func_var_def_blk = 1 -nl_fcall_brace = add -nl_enum_brace = add -nl_struct_brace = add -nl_union_brace = add -nl_if_brace = add -nl_brace_else = add -nl_elseif_brace = ignore -nl_else_brace = add -nl_brace_finally = ignore -nl_finally_brace = add -nl_try_brace = add -nl_getset_brace = ignore -nl_for_brace = add -nl_catch_brace = add -nl_brace_catch = ignore -nl_while_brace = add -nl_do_brace = add -nl_brace_while = remove -nl_switch_brace = add -nl_before_case = true -nl_after_case = false -nl_namespace_brace = ignore -nl_template_class = ignore -nl_class_brace = ignore -nl_class_init_args = ignore -nl_func_type_name = ignore -nl_func_decl_start = ignore -nl_func_decl_args = ignore -nl_func_decl_end = ignore -nl_fdef_brace = add -nl_after_return = true -nl_after_semicolon = true -nl_after_brace_open = true -nl_after_vbrace_open = true -nl_after_access_spec = 1 -nl_assign_leave_one_liners = true -nl_class_leave_one_liners = true -nl_enum_leave_one_liners = true -nl_getset_leave_one_liners = true -nl_define_macro = false -nl_squeeze_ifdef = true -nl_before_if = ignore -nl_after_if = ignore -nl_before_for = ignore -nl_after_for = ignore -nl_before_while = ignore -nl_after_while = ignore -nl_before_switch = ignore -nl_after_switch = ignore -nl_before_do = ignore -nl_after_do = ignore -nl_ds_struct_enum_cmt = false -pos_bool = ignore -pos_class_colon = ignore -ls_for_split_full = false -ls_func_split_full = false -nl_max = 0 -nl_after_func_proto = 0 -nl_after_func_proto_group = 0 -nl_after_func_body = 0 -nl_after_func_body_one_liner = 0 -nl_before_block_comment = 0 -nl_before_c_comment = 0 -nl_before_cpp_comment = 0 -eat_blanks_after_open_brace = true -eat_blanks_before_close_brace = true -mod_full_brace_do = add -mod_full_brace_for = add -mod_full_brace_function = ignore -mod_full_brace_if = add -mod_full_brace_nl = 0 -mod_full_brace_while = add -mod_paren_on_return = ignore -mod_pawn_semicolon = false -mod_full_paren_if_bool = false -cmt_cpp_group = false -cmt_cpp_nl_start = false -cmt_cpp_nl_end = false -cmt_cpp_to_c = false -cmt_star_cont = true -cmt_sp_before_star_cont = 0 -cmt_sp_after_star_cont = 0 -pp_indent = remove -pp_space = remove -sp_after_dc = remove -sp_before_dc = remove -sp_attribute_paren = remove -sp_after_send_oc_colon = force -sp_after_oc_msg_receiver = force -sp_inside_tparen = remove -sp_after_tparen_close = remove -sp_after_assign = force -sp_after_oc_block_caret = remove -sp_after_ptr_star_func = remove -sp_ptr_star_paren = remove +sp_macro_func = ignore +sp_else_brace = ignore +sp_brace_else = ignore +sp_catch_brace = ignore +sp_brace_catch = ignore +sp_finally_brace = ignore +sp_brace_finally = ignore +sp_try_brace = ignore +sp_getset_brace = ignore +align_keep_tabs = false +align_with_tabs = false +align_on_tabstop = false +align_number_right = true +align_func_params = true +align_var_def_span = 2 +align_var_def_star_style = 1 +align_var_def_thresh = 0 +align_var_def_colon = true +align_var_def_inline = true +align_assign_span = 1 +align_assign_thresh = 0 +align_enum_equ_span = 4 +align_enum_equ_thresh = 0 +align_var_struct_span = 3 +align_struct_init_span = 3 +align_typedef_gap = 3 +align_typedef_span = 5 +align_typedef_star_style = 0 +align_right_cmt_span = 3 +align_func_proto_span = 0 +align_nl_cont = true +align_pp_define_gap = 4 +align_pp_define_span = 3 +code_width = 0 +nl_collapse_empty_body = false +nl_class_leave_one_liners = true +nl_assign_leave_one_liners = true +nl_start_of_file = ignore +nl_start_of_file_min = 0 +nl_end_of_file = force +nl_end_of_file_min = 1 +nl_assign_brace = add +nl_func_var_def_blk = 1 +nl_fcall_brace = add +nl_enum_brace = add +nl_struct_brace = add +nl_union_brace = add +nl_if_brace = add +nl_brace_else = add +nl_elseif_brace = ignore +nl_else_brace = add +nl_brace_finally = ignore +nl_finally_brace = add +nl_try_brace = add +nl_getset_brace = ignore +nl_for_brace = add +nl_catch_brace = add +nl_brace_catch = ignore +nl_while_brace = add +nl_do_brace = add +nl_brace_while = remove +nl_switch_brace = add +nl_before_case = true +nl_after_case = false +nl_namespace_brace = ignore +nl_template_class = ignore +nl_class_brace = ignore +nl_class_init_args = ignore +nl_func_type_name = ignore +nl_func_decl_start = ignore +nl_func_decl_args = ignore +nl_func_decl_end = ignore +nl_fdef_brace = add +nl_after_return = true +nl_after_semicolon = true +nl_after_brace_open = true +nl_after_vbrace_open = true +nl_after_access_spec = 1 +nl_assign_leave_one_liners = true +nl_class_leave_one_liners = true +nl_enum_leave_one_liners = true +nl_getset_leave_one_liners = true +nl_define_macro = false +nl_squeeze_ifdef = true +nl_before_if = ignore +nl_after_if = ignore +nl_before_for = ignore +nl_after_for = ignore +nl_before_while = ignore +nl_after_while = ignore +nl_before_switch = ignore +nl_after_switch = ignore +nl_before_do = ignore +nl_after_do = ignore +nl_ds_struct_enum_cmt = false +pos_bool = ignore +pos_class_colon = ignore +ls_for_split_full = false +ls_func_split_full = false +nl_max = 0 +nl_after_func_proto = 0 +nl_after_func_proto_group = 0 +nl_after_func_body = 0 +nl_after_func_body_one_liner = 0 +nl_before_block_comment = 0 +nl_before_c_comment = 0 +nl_before_cpp_comment = 0 +eat_blanks_after_open_brace = true +eat_blanks_before_close_brace = true +mod_full_brace_do = add +mod_full_brace_for = add +mod_full_brace_function = ignore +mod_full_brace_if = add +mod_full_brace_nl = 0 +mod_full_brace_while = add +mod_paren_on_return = ignore +mod_pawn_semicolon = false +mod_full_paren_if_bool = false +cmt_cpp_group = false +cmt_cpp_nl_start = false +cmt_cpp_nl_end = false +cmt_cpp_to_c = false +cmt_star_cont = true +cmt_sp_before_star_cont = 0 +cmt_sp_after_star_cont = 0 +pp_indent = remove +pp_space = remove +sp_after_dc = remove +sp_before_dc = remove +sp_attribute_paren = remove +sp_after_send_oc_colon = force +sp_after_oc_msg_receiver = force +sp_inside_tparen = remove +sp_after_tparen_close = remove +sp_after_assign = force +sp_after_oc_block_caret = remove +sp_after_ptr_star_func = remove +sp_ptr_star_paren = remove -sp_cond_ternary_short = remove # short ternary is b ?: c, instead of a ? b : c. add/remove space between ? and : +sp_cond_ternary_short = remove # short ternary is b ?: c, instead of a ? b : c. add/remove space between ? and : -indent_oc_block = true +indent_oc_block = true -nl_oc_msg_args = true -nl_oc_msg_leave_one_liner = true +nl_oc_msg_args = true +nl_oc_msg_leave_one_liner = true -align_oc_msg_colon_first = false +align_oc_msg_colon_first = false -indent_oc_msg_colon = 4 +indent_oc_msg_colon = 4 diff --git a/tests/config/objc_bug_497.cfg b/tests/config/objc_bug_497.cfg index 9a86ad9884..db700e25a4 100644 --- a/tests/config/objc_bug_497.cfg +++ b/tests/config/objc_bug_497.cfg @@ -1,2 +1,2 @@ -indent_continue = 10 -indent_with_tabs = 0 +indent_continue = 10 +indent_with_tabs = 0 diff --git a/tests/config/objc_complex_method.cfg b/tests/config/objc_complex_method.cfg index 17b2076722..32af23e4d7 100644 --- a/tests/config/objc_complex_method.cfg +++ b/tests/config/objc_complex_method.cfg @@ -4,37 +4,37 @@ # $Id: objc.cfg 488 2009-10-08 12:44:38Z andreberg $ # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -output_tab_size = 4 # new tab size -indent_columns = output_tab_size -indent_label = 2 # pos: absolute col, neg: relative column -indent_align_assign = FALSE +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +output_tab_size = 4 # new tab size +indent_columns = output_tab_size +indent_label = 2 # pos: absolute col, neg: relative column +indent_align_assign = FALSE # # Indenting # # indent_brace = 0 -indent_switch_case = indent_columns +indent_switch_case = indent_columns # # Inter-symbol newlines # -nl_enum_brace = remove # "enum {" vs "enum \n {" -nl_union_brace = remove # "union {" vs "union \n {" -nl_struct_brace = remove # "struct {" vs "struct \n {" -nl_do_brace = remove # "do {" vs "do \n {" -nl_if_brace = remove # "if () {" vs "if () \n {" -nl_for_brace = remove # "for () {" vs "for () \n {" -nl_else_brace = remove # "else {" vs "else \n {" -nl_while_brace = remove # "while () {" vs "while () \n {" -nl_switch_brace = remove # "switch () {" vs "switch () \n {" -nl_brace_while = remove # "} while" vs "} \n while" - cuddle while -nl_brace_else = remove # "} else" vs "} \n else" - cuddle else -nl_func_var_def_blk = 1 -nl_fcall_brace = remove # "list_for_each() {" vs "list_for_each()\n{" -nl_fdef_brace = remove # "int foo() {" vs "int foo()\n{" +nl_enum_brace = remove # "enum {" vs "enum \n {" +nl_union_brace = remove # "union {" vs "union \n {" +nl_struct_brace = remove # "struct {" vs "struct \n {" +nl_do_brace = remove # "do {" vs "do \n {" +nl_if_brace = remove # "if () {" vs "if () \n {" +nl_for_brace = remove # "for () {" vs "for () \n {" +nl_else_brace = remove # "else {" vs "else \n {" +nl_while_brace = remove # "while () {" vs "while () \n {" +nl_switch_brace = remove # "switch () {" vs "switch () \n {" +nl_brace_while = remove # "} while" vs "} \n while" - cuddle while +nl_brace_else = remove # "} else" vs "} \n else" - cuddle else +nl_func_var_def_blk = 1 +nl_fcall_brace = remove # "list_for_each() {" vs "list_for_each()\n{" +nl_fdef_brace = remove # "int foo() {" vs "int foo()\n{" # nl_after_return = TRUE; # nl_before_case = 1 @@ -43,87 +43,87 @@ nl_fdef_brace = remove # "int foo() {" vs "int foo()\n{" # Source code modifications # -mod_paren_on_return = ignore # "return 1;" vs "return (1);" -mod_full_brace_if = ignore # "if (a) a--;" vs "if (a) { a--; }" -mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = ignore # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = remove # "while (a) a--;" vs "while (a) { a--; }" -mod_full_brace_nl = 3 # don't remove if more than 3 newlines -mod_add_long_ifdef_endif_comment = 20 -mod_add_long_ifdef_else_comment = mod_add_long_ifdef_else_comment -mod_add_long_switch_closebrace_comment = mod_add_long_ifdef_else_comment -mod_add_long_function_closebrace_comment = mod_add_long_ifdef_else_comment +mod_paren_on_return = ignore # "return 1;" vs "return (1);" +mod_full_brace_if = ignore # "if (a) a--;" vs "if (a) { a--; }" +mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" +mod_full_brace_do = ignore # "do a--; while ();" vs "do { a--; } while ();" +mod_full_brace_while = remove # "while (a) a--;" vs "while (a) { a--; }" +mod_full_brace_nl = 3 # don't remove if more than 3 newlines +mod_add_long_ifdef_endif_comment = 20 +mod_add_long_ifdef_else_comment = mod_add_long_ifdef_else_comment +mod_add_long_switch_closebrace_comment = mod_add_long_ifdef_else_comment +mod_add_long_function_closebrace_comment = mod_add_long_ifdef_else_comment # # Inter-character spacing options # # sp_return_paren = force # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = add # "{ 1 }" vs "{1}" -sp_inside_braces_struct = add # "{ 1 }" vs "{1}" -sp_inside_braces_enum = add # "{ 1 }" vs "{1}" -sp_inside_fparen = remove # "func( param )" vs "func(param)" -sp_paren_brace = force -sp_assign = add -sp_arith = add -sp_bool = add -sp_compare = add -sp_assign = add -sp_after_comma = add -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" -sp_before_ptr_star = force -sp_after_ptr_star = force -sp_before_unnamed_ptr_star = ignore -sp_between_ptr_star = remove -sp_after_ptr_star_func = force -sp_before_ptr_star_func = force -sp_cmt_cpp_start = add -sp_cond_question = force -sp_cond_colon = force -sp_else_brace = force -sp_brace_else = force -sp_after_class_colon = force -sp_before_class_colon = force -sp_before_case_colon = remove +sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" +sp_before_sparen = force # "if (" vs "if(" +sp_after_sparen = force # "if () {" vs "if (){" +sp_after_cast = remove # "(int) a" vs "(int)a" +sp_inside_braces = add # "{ 1 }" vs "{1}" +sp_inside_braces_struct = add # "{ 1 }" vs "{1}" +sp_inside_braces_enum = add # "{ 1 }" vs "{1}" +sp_inside_fparen = remove # "func( param )" vs "func(param)" +sp_paren_brace = force +sp_assign = add +sp_arith = add +sp_bool = add +sp_compare = add +sp_assign = add +sp_after_comma = add +sp_func_def_paren = remove # "int foo (){" vs "int foo(){" +sp_func_call_paren = remove # "foo (" vs "foo(" +sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_before_ptr_star = force +sp_after_ptr_star = force +sp_before_unnamed_ptr_star = ignore +sp_between_ptr_star = remove +sp_after_ptr_star_func = force +sp_before_ptr_star_func = force +sp_cmt_cpp_start = add +sp_cond_question = force +sp_cond_colon = force +sp_else_brace = force +sp_brace_else = force +sp_after_class_colon = force +sp_before_class_colon = force +sp_before_case_colon = remove # Objective-C specifics -sp_before_oc_colon = remove -sp_after_oc_colon = remove -sp_after_oc_scope = force -sp_after_oc_type = remove -sp_after_oc_return_type = force -sp_before_send_oc_colon = remove -sp_after_send_oc_colon = remove -sp_after_oc_at_sel = remove +sp_before_oc_colon = remove +sp_after_oc_colon = remove +sp_after_oc_scope = force +sp_after_oc_type = remove +sp_after_oc_return_type = force +sp_before_send_oc_colon = remove +sp_after_send_oc_colon = remove +sp_after_oc_at_sel = remove # # Aligning stuff # -align_with_tabs = False # use tabs to align -align_on_tabstop = False # align on tabstops +align_with_tabs = False # use tabs to align +align_on_tabstop = False # align on tabstops # align_keep_tabs = True -align_enum_equ_span = 4 # '=' in enum definition +align_enum_equ_span = 4 # '=' in enum definition # align_nl_cont = True # align_var_def_span = 2 # align_var_def_inline = True # align_var_def_star = False # align_var_def_colon = True # align_assign_span = 1 -align_struct_init_span = 4 # align stuff in a structure init '= { }' -align_right_cmt_span = 8 -align_right_cmt_gap = 8 -align_pp_define_span = 8 +align_struct_init_span = 4 # align stuff in a structure init '= { }' +align_right_cmt_span = 8 +align_right_cmt_gap = 8 +align_pp_define_span = 8 #align_pp_define_gap = 8 # Objective-C specifics -align_oc_msg_colon_span = 1 # align parameters in an Obj-C message on the ':' but stop after this many lines (0=don't align) -align_oc_msg_spec_span = 0 # the span for aligning ObjC msg spec (0=don't align) +align_oc_msg_colon_span = 1 # align parameters in an Obj-C message on the ':' but stop after this many lines (0=don't align) +align_oc_msg_spec_span = 0 # the span for aligning ObjC msg spec (0=don't align) # # Line Splitting options @@ -135,7 +135,7 @@ align_oc_msg_spec_span = 0 # the span for aligning ObjC msg spec (0= # Comment modifications # -cmt_star_cont = True # Whether to put a star on subsequent comment lines +cmt_star_cont = True # Whether to put a star on subsequent comment lines diff --git a/tests/config/oc-split.cfg b/tests/config/oc-split.cfg index 6f3f0d6a23..8b9332febd 100644 --- a/tests/config/oc-split.cfg +++ b/tests/config/oc-split.cfg @@ -1,2 +1,2 @@ -align_oc_msg_colon_span = 1 +align_oc_msg_colon_span = 1 diff --git a/tests/config/oc_cond_colon.cfg b/tests/config/oc_cond_colon.cfg index 54868af4ed..d969fce28a 100644 --- a/tests/config/oc_cond_colon.cfg +++ b/tests/config/oc_cond_colon.cfg @@ -1,6 +1,6 @@ -sp_before_send_oc_colon = force -sp_after_send_oc_colon = force -sp_cond_colon = remove +sp_before_send_oc_colon = force +sp_after_send_oc_colon = force +sp_cond_colon = remove # without this, no_space_table's {CT_UNKNOWN,CT_SQUARE_OPEN} combo removes the space between ? and CT_SQUARE_OPEN, but not between ? and CT_WORD -sp_cond_question = add +sp_cond_question = add diff --git a/tests/config/op-space-force.cfg b/tests/config/op-space-force.cfg index ec15bb50ba..bab1199c67 100644 --- a/tests/config/op-space-force.cfg +++ b/tests/config/op-space-force.cfg @@ -2,17 +2,17 @@ # Forces a space after an operator # -indent_columns = 3 +indent_columns = 3 -sp_before_byref = remove -sp_after_byref = force +sp_before_byref = remove +sp_after_byref = force -indent_class = True +indent_class = True -sp_func_def_paren = remove -sp_func_proto_paren = remove -sp_after_operator = force +sp_func_def_paren = remove +sp_func_proto_paren = remove +sp_after_operator = force -sp_after_operator_sym = force +sp_after_operator_sym = force -align_right_cmt_span = 2 +align_right_cmt_span = 2 diff --git a/tests/config/op-space-remove-align-1.cfg b/tests/config/op-space-remove-align-1.cfg index a677706fe9..d76684a8a2 100644 --- a/tests/config/op-space-remove-align-1.cfg +++ b/tests/config/op-space-remove-align-1.cfg @@ -2,20 +2,20 @@ # Removes a space after an operator # -indent_columns = 3 +indent_columns = 3 -sp_before_byref = remove -sp_after_byref = force +sp_before_byref = remove +sp_after_byref = force -indent_class = True +indent_class = True -sp_func_def_paren = remove -sp_func_proto_paren = remove -sp_after_operator = remove -sp_after_operator_sym = remove +sp_func_def_paren = remove +sp_func_proto_paren = remove +sp_after_operator = remove +sp_after_operator_sym = remove -align_right_cmt_span = 2 +align_right_cmt_span = 2 -align_var_class_span = 2 -align_var_def_span = 2 -align_mix_var_proto = true +align_var_class_span = 2 +align_var_def_span = 2 +align_mix_var_proto = true diff --git a/tests/config/op-space-remove-align-2.cfg b/tests/config/op-space-remove-align-2.cfg index 01c89728e2..c901293a42 100644 --- a/tests/config/op-space-remove-align-2.cfg +++ b/tests/config/op-space-remove-align-2.cfg @@ -2,21 +2,21 @@ # Removes a space after an operator # -indent_columns = 3 +indent_columns = 3 -sp_before_byref = remove -sp_after_byref = force +sp_before_byref = remove +sp_after_byref = force -indent_class = True +indent_class = True -sp_func_def_paren = remove -sp_func_proto_paren = remove -sp_after_operator = remove -sp_after_operator_sym = remove +sp_func_def_paren = remove +sp_func_proto_paren = remove +sp_after_operator = remove +sp_after_operator_sym = remove -align_right_cmt_span = 2 +align_right_cmt_span = 2 -align_var_class_span = 2 -align_var_def_span = 2 -align_mix_var_proto = true -align_on_operator = true +align_var_class_span = 2 +align_var_def_span = 2 +align_mix_var_proto = true +align_on_operator = true diff --git a/tests/config/op-space-remove.cfg b/tests/config/op-space-remove.cfg index c18add8be9..87d50cff18 100644 --- a/tests/config/op-space-remove.cfg +++ b/tests/config/op-space-remove.cfg @@ -2,16 +2,16 @@ # Removes a space after an operator # -indent_columns = 3 +indent_columns = 3 -sp_before_byref = remove -sp_after_byref = force +sp_before_byref = remove +sp_after_byref = force -indent_class = True +indent_class = True -sp_func_def_paren = remove -sp_func_proto_paren = remove -sp_after_operator = remove -sp_after_operator_sym = remove +sp_func_def_paren = remove +sp_func_proto_paren = remove +sp_after_operator = remove +sp_after_operator_sym = remove -align_right_cmt_span = 2 +align_right_cmt_span = 2 diff --git a/tests/config/op_sym_empty.cfg b/tests/config/op_sym_empty.cfg index 932d5efce9..cbabfb5034 100644 --- a/tests/config/op_sym_empty.cfg +++ b/tests/config/op_sym_empty.cfg @@ -1,4 +1,4 @@ -sp_after_operator = remove -sp_after_operator_sym = force -sp_after_operator_sym_empty = remove -sp_inside_fparens = remove +sp_after_operator = remove +sp_after_operator_sym = force +sp_after_operator_sym_empty = remove +sp_inside_fparens = remove diff --git a/tests/config/pascal_ptr.cfg b/tests/config/pascal_ptr.cfg index fe8fb05b34..370cfa8092 100644 --- a/tests/config/pascal_ptr.cfg +++ b/tests/config/pascal_ptr.cfg @@ -2,12 +2,12 @@ # My favorite format # -indent_with_tabs = 0 -input_tab_size = 8 -indent_columns = 4 +indent_with_tabs = 0 +input_tab_size = 8 +indent_columns = 4 -sp_arith = force -sp_after_ptr_star = force -sp_before_ptr_star = remove -sp_between_ptr_star = remove +sp_arith = force +sp_after_ptr_star = force +sp_before_ptr_star = remove +sp_between_ptr_star = remove diff --git a/tests/config/patch_32.cfg b/tests/config/patch_32.cfg index b6db87e6b2..9b423a8e32 100644 --- a/tests/config/patch_32.cfg +++ b/tests/config/patch_32.cfg @@ -1 +1 @@ -cmt_cpp_to_c = true +cmt_cpp_to_c = true diff --git a/tests/config/pawn-escape.cfg b/tests/config/pawn-escape.cfg index 2cb61cd396..c0501bb921 100644 --- a/tests/config/pawn-escape.cfg +++ b/tests/config/pawn-escape.cfg @@ -2,47 +2,47 @@ # junk # -indent_with_tabs = 0 -input_tab_size = 4 +indent_with_tabs = 0 +input_tab_size = 4 #output_tab_size = 4 -indent_columns = 4 - -align_pp_define_span = 1 -align_pp_define_gap = 3 -align_right_cmt_span = 2 - -nl_if_brace = remove -nl_elseif_brace = remove -nl_else_brace = remove -nl_brace_else = remove -nl_fdef_brace = force - -sp_arith = force -sp_macro = force -sp_macro_func = force -sp_sparen_brace = add -sp_after_sparen = add -sp_fparen_brace = force -sp_square_fparen = remove -sp_inside_braces = add -sp_after_tag = remove - -cmt_star_cont = true +indent_columns = 4 + +align_pp_define_span = 1 +align_pp_define_gap = 3 +align_right_cmt_span = 2 + +nl_if_brace = remove +nl_elseif_brace = remove +nl_else_brace = remove +nl_brace_else = remove +nl_fdef_brace = force + +sp_arith = force +sp_macro = force +sp_macro_func = force +sp_sparen_brace = add +sp_after_sparen = add +sp_fparen_brace = force +sp_square_fparen = remove +sp_inside_braces = add +sp_after_tag = remove + +cmt_star_cont = true #cmt_cpp_to_c = true #cmt_cpp_group = true #cmt_cpp_nl_start = true #cmt_cpp_nl_end = true -mod_full_brace_if = add -mod_full_brace_for = add -mod_full_brace_do = add -mod_full_brace_while = add -mod_full_brace_function = add +mod_full_brace_if = add +mod_full_brace_for = add +mod_full_brace_do = add +mod_full_brace_while = add +mod_full_brace_function = add # note: for normal usage, this option is 'bad' -mod_pawn_semicolon = true +mod_pawn_semicolon = true # '^' - didn't want to make another option type -string_escape_char = 94 -string_escape_char = 94 +string_escape_char = 94 +string_escape_char = 94 diff --git a/tests/config/pawn.cfg b/tests/config/pawn.cfg index af15e79ad4..3024c393d8 100644 --- a/tests/config/pawn.cfg +++ b/tests/config/pawn.cfg @@ -2,47 +2,47 @@ # junk # -indent_with_tabs = 0 -input_tab_size = 4 -output_tab_size = 8 -indent_columns = 4 - -align_pp_define_span = 1 -align_pp_define_gap = 3 -align_right_cmt_span = 2 - -nl_if_brace = remove -nl_elseif_brace = remove -nl_else_brace = remove -nl_brace_else = remove -nl_fdef_brace = force - -sp_arith = force -sp_macro = force -sp_macro_func = force -sp_sparen_brace = force -sp_after_sparen = add -sp_fparen_brace = force -sp_square_fparen = remove -sp_inside_braces = add -sp_after_tag = remove -sp_else_brace = force -sp_brace_else = force -sp_paren_brace = force - -cmt_star_cont = true +indent_with_tabs = 0 +input_tab_size = 4 +output_tab_size = 8 +indent_columns = 4 + +align_pp_define_span = 1 +align_pp_define_gap = 3 +align_right_cmt_span = 2 + +nl_if_brace = remove +nl_elseif_brace = remove +nl_else_brace = remove +nl_brace_else = remove +nl_fdef_brace = force + +sp_arith = force +sp_macro = force +sp_macro_func = force +sp_sparen_brace = force +sp_after_sparen = add +sp_fparen_brace = force +sp_square_fparen = remove +sp_inside_braces = add +sp_after_tag = remove +sp_else_brace = force +sp_brace_else = force +sp_paren_brace = force + +cmt_star_cont = true #cmt_cpp_to_c = true #cmt_cpp_group = true #cmt_cpp_nl_start = true #cmt_cpp_nl_end = true -mod_full_brace_if = add -mod_full_brace_for = add -mod_full_brace_do = add -mod_full_brace_while = add -mod_full_brace_function = add +mod_full_brace_if = add +mod_full_brace_for = add +mod_full_brace_do = add +mod_full_brace_while = add +mod_full_brace_function = add # note: for normal usage, this option is 'bad' -mod_pawn_semicolon = true +mod_pawn_semicolon = true diff --git a/tests/config/pbtech.cfg b/tests/config/pbtech.cfg index ee266744ad..b1ff83130c 100644 --- a/tests/config/pbtech.cfg +++ b/tests/config/pbtech.cfg @@ -1,124 +1,124 @@ -newlines = auto # auto/lf/crlf/cr -input_tab_size = 4 -output_tab_size = 4 +newlines = auto # auto/lf/crlf/cr +input_tab_size = 4 +output_tab_size = 4 -tok_split_gte = true # tweaks for termplate >= etc +tok_split_gte = true # tweaks for termplate >= etc # # Indenting # -indent_columns = 4 -indent_with_tabs = 0 -indent_cmt_with_tabs = false -indent_brace = 0 # Spaces to indent '{' from level -indent_namespace = true # the 'namespace' body is indented -indent_extern = true # Whether the 'extern "C"' body is indented -indent_class = true # method declarations and definitions -indent_class_colon = true # indent the stuff after a leading class colon -indent_ctor_init_leading = 4 # virtual indent from the ':' for member initializers. Default is 2. (applies to the leading colon case) -indent_ctor_init = 0 # # Additional indenting for constructor initializer list -indent_label = 0 # indent goto labels -indent_access_spec = -4 # Same as indent_label, but for access specifiers that are followed by a colon +indent_columns = 4 +indent_with_tabs = 0 +indent_cmt_with_tabs = false +indent_brace = 0 # Spaces to indent '{' from level +indent_namespace = true # the 'namespace' body is indented +indent_extern = true # Whether the 'extern "C"' body is indented +indent_class = true # method declarations and definitions +indent_class_colon = true # indent the stuff after a leading class colon +indent_ctor_init_leading = 4 # virtual indent from the ':' for member initializers. Default is 2. (applies to the leading colon case) +indent_ctor_init = 0 # # Additional indenting for constructor initializer list +indent_label = 0 # indent goto labels +indent_access_spec = -4 # Same as indent_label, but for access specifiers that are followed by a colon # # Spacing options # -sp_arith = add -sp_assign = add -sp_assign_default = add -sp_enum_assign = add -sp_bool = add - -sp_before_ptr_star = add -sp_after_ptr_star = remove -sp_before_byref = add -sp_after_byref = remove - -sp_angle_shift = remove -sp_permit_cpp11_shift = true -sp_cpp_lambda_assign = remove -sp_cpp_lambda_paren = remove - -sp_before_sparen = add -sp_after_semi_for_empty = remove - -sp_after_comma = add -sp_before_comma = remove -sp_paren_comma = force -sp_after_class_colon = add -sp_before_case_colon = remove -sp_after_operator = remove -sp_after_operator_sym = remove -sp_after_cast = remove -sp_cpp_cast_paren = remove -sp_cmt_cpp_start = add +sp_arith = add +sp_assign = add +sp_assign_default = add +sp_enum_assign = add +sp_bool = add + +sp_before_ptr_star = add +sp_after_ptr_star = remove +sp_before_byref = add +sp_after_byref = remove + +sp_angle_shift = remove +sp_permit_cpp11_shift = true +sp_cpp_lambda_assign = remove +sp_cpp_lambda_paren = remove + +sp_before_sparen = add +sp_after_semi_for_empty = remove + +sp_after_comma = add +sp_before_comma = remove +sp_paren_comma = force +sp_after_class_colon = add +sp_before_case_colon = remove +sp_after_operator = remove +sp_after_operator_sym = remove +sp_after_cast = remove +sp_cpp_cast_paren = remove +sp_cmt_cpp_start = add # # Code alignment (not left column spaces/tabs) # -align_keep_tabs = false # keep non-indenting tabs -align_with_tabs = false # false/true -align_on_tabstop = true # bump out to the next tab when aligning +align_keep_tabs = false # keep non-indenting tabs +align_with_tabs = false # false/true +align_on_tabstop = true # bump out to the next tab when aligning -align_var_def_span = 1 # The span for aligning variable definitions (0=don't align) -align_var_def_star_style = 1 # number -align_var_def_amp_style = 1 # number -align_var_struct_span = 1 # number +align_var_def_span = 1 # The span for aligning variable definitions (0=don't align) +align_var_def_star_style = 1 # number +align_var_def_amp_style = 1 # number +align_var_struct_span = 1 # number # # Newline adding and removing options # -nl_enum_brace = add # newline between 'enum' and '{' +nl_enum_brace = add # newline between 'enum' and '{' # Add or remove newline between 'struct and '{' -nl_struct_brace = add # ignore/add/remove/force +nl_struct_brace = add # ignore/add/remove/force # Add or remove newline between 'union' and '{' -nl_union_brace = ignore # ignore/add/remove/force +nl_union_brace = ignore # ignore/add/remove/force # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # ignore/add/remove/force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = add # ignore/add/remove/force +nl_elseif_brace = add # ignore/add/remove/force # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force - -nl_try_brace = add # newline between 'try' and '{' -nl_for_brace = add # newline between 'for' and '{' -nl_catch_brace = add # newline between 'catch' and '{' -nl_brace_catch = add # newline between '}' and 'catch' -nl_while_brace = add # newline between 'while' and '{' -nl_do_brace = add # newline between 'do' and '{' -nl_brace_while = remove # newline between '}' and 'while' of 'do' statement -nl_switch_brace = add # newline between 'switch' and '{' -nl_after_case = true # Whether to put a newline after 'case' statement -nl_namespace_brace = add # Newline between namespace and { -nl_class_brace = add # newline between 'class' and '{' -nl_after_vbrace_close = true # newline before return in: 'if (foo) a++; return;' -nl_after_do = add # blank line after 'do/while' statement +nl_else_brace = add # ignore/add/remove/force + +nl_try_brace = add # newline between 'try' and '{' +nl_for_brace = add # newline between 'for' and '{' +nl_catch_brace = add # newline between 'catch' and '{' +nl_brace_catch = add # newline between '}' and 'catch' +nl_while_brace = add # newline between 'while' and '{' +nl_do_brace = add # newline between 'do' and '{' +nl_brace_while = remove # newline between '}' and 'while' of 'do' statement +nl_switch_brace = add # newline between 'switch' and '{' +nl_after_case = true # Whether to put a newline after 'case' statement +nl_namespace_brace = add # Newline between namespace and { +nl_class_brace = add # newline between 'class' and '{' +nl_after_vbrace_close = true # newline before return in: 'if (foo) a++; return;' +nl_after_do = add # blank line after 'do/while' statement # # Positioning options # # The position of the comma in the constructor initialization list -pos_class_comma = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_comma = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of colons between constructor and member initialization -pos_class_colon = lead # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_colon = lead # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # # Code modifying options (non-whitespace) # -mod_remove_empty_return = true +mod_remove_empty_return = true -set FOR BOOST_FOREACH +set FOR BOOST_FOREACH diff --git a/tests/config/pos_compare-eol.cfg b/tests/config/pos_compare-eol.cfg index e9022315c3..9cca1022db 100644 --- a/tests/config/pos_compare-eol.cfg +++ b/tests/config/pos_compare-eol.cfg @@ -1,2 +1,2 @@ -pos_compare = trail -sp_compare = force +pos_compare = trail +sp_compare = force diff --git a/tests/config/pos_compare-sol.cfg b/tests/config/pos_compare-sol.cfg index 896546bd11..9096ee25aa 100644 --- a/tests/config/pos_compare-sol.cfg +++ b/tests/config/pos_compare-sol.cfg @@ -1,2 +1,2 @@ -pos_compare = lead -sp_compare = force +pos_compare = lead +sp_compare = force diff --git a/tests/config/pos_conditional-eol.cfg b/tests/config/pos_conditional-eol.cfg index 377c373d74..b061995ff8 100644 --- a/tests/config/pos_conditional-eol.cfg +++ b/tests/config/pos_conditional-eol.cfg @@ -1,2 +1,2 @@ -pos_conditional = trail -sp_cond_question = force +pos_conditional = trail +sp_cond_question = force diff --git a/tests/config/pos_conditional-sol.cfg b/tests/config/pos_conditional-sol.cfg index bf1497b8dd..c1fbe76a18 100644 --- a/tests/config/pos_conditional-sol.cfg +++ b/tests/config/pos_conditional-sol.cfg @@ -1,2 +1,2 @@ -pos_conditional = lead -sp_cond_question = force +pos_conditional = lead +sp_cond_question = force diff --git a/tests/config/pp-indent-1.cfg b/tests/config/pp-indent-1.cfg index ab65876466..751efe20b6 100644 --- a/tests/config/pp-indent-1.cfg +++ b/tests/config/pp-indent-1.cfg @@ -2,8 +2,8 @@ # Remove all PP spacing and indent # -pp_indent = remove -pp_space = remove +pp_indent = remove +pp_space = remove # Gives the format # |#ifdef SOMETHING diff --git a/tests/config/pp-indent-2.cfg b/tests/config/pp-indent-2.cfg index eccaa35583..7417cb917b 100644 --- a/tests/config/pp-indent-2.cfg +++ b/tests/config/pp-indent-2.cfg @@ -2,9 +2,9 @@ # Remove all PP spacing and indent # -pp_indent = remove -pp_space = add -pp_space_count = 2 +pp_indent = remove +pp_space = add +pp_space_count = 2 # Gives the format # |#ifdef SOMETHING diff --git a/tests/config/pp-indent-3.cfg b/tests/config/pp-indent-3.cfg index 0bd315747e..cd67e1e4fb 100644 --- a/tests/config/pp-indent-3.cfg +++ b/tests/config/pp-indent-3.cfg @@ -2,8 +2,8 @@ # Remove all PP spacing and indent # -pp_indent = add -pp_space = remove +pp_indent = add +pp_space = remove # Gives the format # |#ifdef SOMETHING diff --git a/tests/config/pp-pragma.cfg b/tests/config/pp-pragma.cfg index 575b62cd5d..b83d2167ae 100644 --- a/tests/config/pp-pragma.cfg +++ b/tests/config/pp-pragma.cfg @@ -1,3 +1,3 @@ -pp_indent_at_level True -pp_define_at_level True -pp_if_indent_code True +pp_indent_at_level = True +pp_define_at_level = True +pp_if_indent_code = True diff --git a/tests/config/pp-space.cfg b/tests/config/pp-space.cfg index 606452b48e..9740d17f53 100644 --- a/tests/config/pp-space.cfg +++ b/tests/config/pp-space.cfg @@ -1,7 +1,7 @@ -indent_columns = 4 -indent_with_tabs = 1 -output_tab_size = 4 -pp_indent = add -pp_indent_count = 4 -pp_indent_at_level = false +indent_columns = 4 +indent_with_tabs = 1 +output_tab_size = 4 +pp_indent = add +pp_indent_count = 4 +pp_indent_at_level = false diff --git a/tests/config/pp_define_at_level-1.cfg b/tests/config/pp_define_at_level-1.cfg index 1b668768ec..5c37fdcf92 100644 --- a/tests/config/pp_define_at_level-1.cfg +++ b/tests/config/pp_define_at_level-1.cfg @@ -1,7 +1,7 @@ -pp_define_at_level = true -indent_class = true -indent_columns = 4 -indent_with_tabs = 0 -output_tab_size = 8 +pp_define_at_level = true +indent_class = true +indent_columns = 4 +indent_with_tabs = 0 +output_tab_size = 8 diff --git a/tests/config/pp_if_indent-0.cfg b/tests/config/pp_if_indent-0.cfg index ff06e95ac9..4eef77c94b 100644 --- a/tests/config/pp_if_indent-0.cfg +++ b/tests/config/pp_if_indent-0.cfg @@ -1,7 +1,7 @@ # default region indent -pp_indent = add -indent_columns = 4 -pp_if_indent_code = false -pp_indent_if = 0 -pp_indent_at_level = true +pp_indent = add +indent_columns = 4 +pp_if_indent_code = false +pp_indent_if = 0 +pp_indent_at_level = true diff --git a/tests/config/pp_if_indent-1.cfg b/tests/config/pp_if_indent-1.cfg index 25cc297db9..1ab1ce3f37 100644 --- a/tests/config/pp_if_indent-1.cfg +++ b/tests/config/pp_if_indent-1.cfg @@ -1,7 +1,7 @@ # indented region code -pp_indent = add -indent_columns = 4 -pp_if_indent_code = true -pp_indent_if = 0 -pp_indent_at_level = true +pp_indent = add +indent_columns = 4 +pp_if_indent_code = true +pp_indent_if = 0 +pp_indent_at_level = true diff --git a/tests/config/pp_if_indent-2.cfg b/tests/config/pp_if_indent-2.cfg index f3ec36813e..af8fbd6a79 100644 --- a/tests/config/pp_if_indent-2.cfg +++ b/tests/config/pp_if_indent-2.cfg @@ -1,7 +1,7 @@ # out-dented region preprocs -pp_indent = add -indent_columns = 4 -pp_if_indent_code = false -pp_indent_if = -4 -pp_indent_at_level = true +pp_indent = add +indent_columns = 4 +pp_if_indent_code = false +pp_indent_if = -4 +pp_indent_at_level = true diff --git a/tests/config/pp_if_indent-3.cfg b/tests/config/pp_if_indent-3.cfg index 3815cefe07..5a07a1ef1a 100644 --- a/tests/config/pp_if_indent-3.cfg +++ b/tests/config/pp_if_indent-3.cfg @@ -1,7 +1,7 @@ # Abs column region preproc -pp_indent = add -indent_columns = 4 -pp_if_indent_code = true -pp_indent_if = 0 -pp_indent_at_level = false +pp_indent = add +indent_columns = 4 +pp_if_indent_code = true +pp_indent_if = 0 +pp_indent_at_level = false diff --git a/tests/config/pp_if_indent-4.cfg b/tests/config/pp_if_indent-4.cfg index a7f6d1d635..6c3bdc2d89 100644 --- a/tests/config/pp_if_indent-4.cfg +++ b/tests/config/pp_if_indent-4.cfg @@ -1,10 +1,10 @@ # indented region code -pp_indent = add -pp_indent_count = 1 -indent_columns = 4 -pp_if_indent_code = true -pp_indent_if = 0 -pp_indent_at_level = true -pp_space = remove -pp_space_count = 0 -pp_define_at_level = true +pp_indent = add +pp_indent_count = 1 +indent_columns = 4 +pp_if_indent_code = true +pp_indent_if = 0 +pp_indent_at_level = true +pp_space = remove +pp_space_count = 0 +pp_define_at_level = true diff --git a/tests/config/pp_indent_brace.cfg b/tests/config/pp_indent_brace.cfg index c52e541502..6a39406323 100644 --- a/tests/config/pp_indent_brace.cfg +++ b/tests/config/pp_indent_brace.cfg @@ -1,2 +1,2 @@ -pp_indent_brace = false -pp_if_indent_code = true \ No newline at end of file +pp_indent_brace = false +pp_if_indent_code = true diff --git a/tests/config/pp_indent_case.cfg b/tests/config/pp_indent_case.cfg index f60f2de7e8..ce203764cb 100644 --- a/tests/config/pp_indent_case.cfg +++ b/tests/config/pp_indent_case.cfg @@ -1,2 +1,2 @@ -pp_indent_case = false -pp_if_indent_code = true \ No newline at end of file +pp_indent_case = false +pp_if_indent_code = true diff --git a/tests/config/pp_indent_extern.cfg b/tests/config/pp_indent_extern.cfg index b44435b6e6..c1ce08cb6c 100644 --- a/tests/config/pp_indent_extern.cfg +++ b/tests/config/pp_indent_extern.cfg @@ -1,2 +1,2 @@ -pp_indent_extern = false -pp_if_indent_code = true \ No newline at end of file +pp_indent_extern = false +pp_if_indent_code = true diff --git a/tests/config/pp_indent_func_def.cfg b/tests/config/pp_indent_func_def.cfg index 5a93dbc914..f470e3dee2 100644 --- a/tests/config/pp_indent_func_def.cfg +++ b/tests/config/pp_indent_func_def.cfg @@ -1,2 +1,2 @@ -pp_indent_func_def = false -pp_if_indent_code = true \ No newline at end of file +pp_indent_func_def = false +pp_if_indent_code = true diff --git a/tests/config/pp_ret.cfg b/tests/config/pp_ret.cfg index 75f988f018..293f8d9353 100644 --- a/tests/config/pp_ret.cfg +++ b/tests/config/pp_ret.cfg @@ -4,19 +4,19 @@ # # The type of line endings -newlines = auto # auto/lf/crlf/cr +newlines = auto # auto/lf/crlf/cr # The original size of tabs in the input -input_tab_size = 8 # number +input_tab_size = 8 # number # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 8 # number +output_tab_size = 8 # number # The ascii value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # number # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # number # # Indenting @@ -24,726 +24,726 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 4 # number +indent_columns = 4 # number # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # number # Whether to indent strings broken by '\' so that they line up -indent_align_string = false # false/true +indent_align_string = false # false/true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # number # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # number # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # false/true # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # false/true # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # false/true # Whether the 'namespace' body is indented -indent_namespace = true # false/true +indent_namespace = true # false/true # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # false/true # Whether to indent the stuff after a leading class colon -indent_class_colon = false # false/true +indent_class_colon = false # false/true # Whether to indent continued function call parameters one indent level (true) or aligns instead of indent (false) -indent_func_call_param = false # false/true +indent_func_call_param = false # false/true # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 0 # number +indent_member = 0 # number # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # number # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 0 # number +indent_switch_case = 0 # number # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # number # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 0 # number +indent_case_brace = 0 # number # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # false/true # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # number # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = -4 # number +indent_access_spec = -4 # number # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # false/true # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 0 # number +indent_paren_close = 0 # number # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # false/true # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # false/true # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # false/true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = add # ignore/add/remove/force +sp_arith = add # ignore/add/remove/force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = add # ignore/add/remove/force +sp_assign = add # ignore/add/remove/force # Add or remove space around boolean operators '&&' and '||' -sp_bool = add # ignore/add/remove/force +sp_bool = add # ignore/add/remove/force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = add # ignore/add/remove/force +sp_compare = add # ignore/add/remove/force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # ignore/add/remove/force # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # ignore/add/remove/force # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # false/true # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # ignore/add/remove/force # Add or remove space before pointer star '*' -sp_before_ptr_star = remove # ignore/add/remove/force +sp_before_ptr_star = remove # ignore/add/remove/force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # ignore/add/remove/force # Add or remove space after pointer star '*' -sp_after_ptr_star = add # ignore/add/remove/force +sp_after_ptr_star = add # ignore/add/remove/force # Add or remove space before reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # ignore/add/remove/force # Add or remove space after reference sign '&' -sp_after_byref = add # ignore/add/remove/force +sp_after_byref = add # ignore/add/remove/force # Add or remove space before '<>' -sp_before_angle = ignore # ignore/add/remove/force +sp_before_angle = ignore # ignore/add/remove/force # Add or remove space after '<>' -sp_after_angle = ignore # ignore/add/remove/force +sp_after_angle = ignore # ignore/add/remove/force # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = ignore # ignore/add/remove/force +sp_angle_paren = ignore # ignore/add/remove/force # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = ignore # ignore/add/remove/force +sp_angle_word = ignore # ignore/add/remove/force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = add # ignore/add/remove/force +sp_before_sparen = add # ignore/add/remove/force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # ignore/add/remove/force # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = ignore # ignore/add/remove/force +sp_after_sparen = ignore # ignore/add/remove/force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = add # ignore/add/remove/force +sp_sparen_brace = add # ignore/add/remove/force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # ignore/add/remove/force # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # ignore/add/remove/force # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = remove # ignore/add/remove/force +sp_before_semi_for = remove # ignore/add/remove/force # Add or remove space before a semicolon of an empty part of a for statment. -sp_before_semi_for_empty = add # ignore/add/remove/force +sp_before_semi_for_empty = add # ignore/add/remove/force # Add or remove space after the final semicolon of an empty part of a for statment: for ( ; ; ). -sp_after_semi_for_empty = add # ignore/add/remove/force +sp_after_semi_for_empty = add # ignore/add/remove/force # Add or remove space before '[' (except '[]') -sp_before_square = remove # ignore/add/remove/force +sp_before_square = remove # ignore/add/remove/force # Add or remove space before '[]' -sp_before_squares = remove # ignore/add/remove/force +sp_before_squares = remove # ignore/add/remove/force # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # ignore/add/remove/force # Add or remove space after ',' -sp_after_comma = add # ignore/add/remove/force +sp_after_comma = add # ignore/add/remove/force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # ignore/add/remove/force # Add or remove space between 'operator' and operator sign -sp_after_operator = remove # ignore/add/remove/force +sp_after_operator = remove # ignore/add/remove/force # Add or remove space after cast -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # ignore/add/remove/force # Add or remove spaces inside cast parens -sp_inside_paren_cast = remove # ignore/add/remove/force +sp_inside_paren_cast = remove # ignore/add/remove/force # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # ignore/add/remove/force # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # ignore/add/remove/force # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = ignore # ignore/add/remove/force +sp_inside_braces_enum = ignore # ignore/add/remove/force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = ignore # ignore/add/remove/force +sp_inside_braces_struct = ignore # ignore/add/remove/force # Add or remove space inside '{' and '}' -sp_inside_braces = ignore # ignore/add/remove/force +sp_inside_braces = ignore # ignore/add/remove/force # Add or remove space inside '<' and '>' -sp_inside_angle = ignore # ignore/add/remove/force +sp_inside_angle = ignore # ignore/add/remove/force # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = ignore # ignore/add/remove/force +sp_type_func = ignore # ignore/add/remove/force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # ignore/add/remove/force # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # ignore/add/remove/force # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # ignore/add/remove/force # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # ignore/add/remove/force # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # ignore/add/remove/force # Add or remove space between ')' and '{' of function -sp_fparen_brace = ignore # ignore/add/remove/force +sp_fparen_brace = ignore # ignore/add/remove/force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = ignore # ignore/add/remove/force +sp_func_call_paren = ignore # ignore/add/remove/force # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = ignore # ignore/add/remove/force +sp_func_class_paren = ignore # ignore/add/remove/force # Add or remove space between 'return' and '(' -sp_return_paren = ignore # ignore/add/remove/force +sp_return_paren = ignore # ignore/add/remove/force # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # ignore/add/remove/force # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # ignore/add/remove/force # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # ignore/add/remove/force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = ignore # ignore/add/remove/force +sp_else_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # ignore/add/remove/force # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # ignore/add/remove/force # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # ignore/add/remove/force # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # ignore/add/remove/force # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # ignore/add/remove/force # Add or remove space before the '::' operator -sp_before_dc = ignore # ignore/add/remove/force +sp_before_dc = ignore # ignore/add/remove/force # Add or remove space after the '::' operator -sp_after_dc = ignore # ignore/add/remove/force +sp_after_dc = ignore # ignore/add/remove/force # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # ignore/add/remove/force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # false/true # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # false/true # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # false/true # Align variable definitions in prototypes and functions -align_func_params = false # false/true +align_func_params = false # false/true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 0 # number +align_var_def_span = 0 # number # How to align the star in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_star_style = 0 # number +align_var_def_star_style = 0 # number # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # number # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # number # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # false/true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = false # false/true +align_var_def_inline = false # false/true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 0 # number +align_assign_span = 0 # number # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 # number # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 0 # number +align_enum_equ_span = 0 # number # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # number # The span for aligning struct/union (0=don't align) -align_var_struct_span = 0 # number +align_var_struct_span = 0 # number # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # number # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 0 # number +align_struct_init_span = 0 # number # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number +align_typedef_gap = 0 # number # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 0 # number +align_typedef_span = 0 # number # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # number # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # number # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typdef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # number # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 0 # number +align_right_cmt_span = 0 # number # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # number # Whether to align macros wrapped with a backslash and a newline -align_nl_cont = false # false/true +align_nl_cont = false # false/true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 0 # number +align_pp_define_gap = 0 # number # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 0 # number +align_pp_define_span = 0 # number # # Newline adding and removing options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # number # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # false/true # Don't touch one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = true # false/true +nl_assign_leave_one_liners = true # false/true # Don't touch one-line function bodies inside a class xx { } body -nl_class_leave_one_liners = true # false/true +nl_class_leave_one_liners = true # false/true # Don't touch one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = true # false/true +nl_enum_leave_one_liners = true # false/true # Don't touch one-line get or set functions -nl_getset_leave_one_liners = true # false/true +nl_getset_leave_one_liners = true # false/true # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # ignore/add/remove/force # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # number # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # ignore/add/remove/force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # number # Add or remove newline between '=' and '{' -nl_assign_brace = ignore # ignore/add/remove/force +nl_assign_brace = ignore # ignore/add/remove/force # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # ignore/add/remove/force # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # ignore/add/remove/force # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 0 # number +nl_func_var_def_blk = 0 # number # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = ignore # ignore/add/remove/force +nl_fcall_brace = ignore # ignore/add/remove/force # Add or remove newline between 'enum' and '{' -nl_enum_brace = ignore # ignore/add/remove/force +nl_enum_brace = ignore # ignore/add/remove/force # Add or remove newline between 'struct and '{' -nl_struct_brace = ignore # ignore/add/remove/force +nl_struct_brace = ignore # ignore/add/remove/force # Add or remove newline between 'union' and '{' -nl_union_brace = ignore # ignore/add/remove/force +nl_union_brace = ignore # ignore/add/remove/force # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # ignore/add/remove/force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = add # ignore/add/remove/force +nl_elseif_brace = add # ignore/add/remove/force # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'finally' -nl_brace_finally = add # ignore/add/remove/force +nl_brace_finally = add # ignore/add/remove/force # Add or remove newline between 'finally' and '{' -nl_finally_brace = add # ignore/add/remove/force +nl_finally_brace = add # ignore/add/remove/force # Add or remove newline between 'try' and '{' -nl_try_brace = add # ignore/add/remove/force +nl_try_brace = add # ignore/add/remove/force # Add or remove newline between get/set and '{' -nl_getset_brace = ignore # ignore/add/remove/force +nl_getset_brace = ignore # ignore/add/remove/force # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # ignore/add/remove/force # Add or remove newline between 'catch' and '{' -nl_catch_brace = add # ignore/add/remove/force +nl_catch_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'catch' -nl_brace_catch = add # ignore/add/remove/force +nl_brace_catch = add # ignore/add/remove/force # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # ignore/add/remove/force # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = add # ignore/add/remove/force +nl_brace_while = add # ignore/add/remove/force # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # ignore/add/remove/force # Add or remove newline when condition spans two or more lines -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # false/true # Whether to put a newline before 'case' statement -nl_before_case = false # false/true +nl_before_case = false # false/true # Whether to put a newline after 'case' statement -nl_after_case = false # false/true +nl_after_case = false # false/true # Newline between namespace and { -nl_namespace_brace = add # ignore/add/remove/force +nl_namespace_brace = add # ignore/add/remove/force # Add or remove newline between 'template<>' and 'class' -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # ignore/add/remove/force # Add or remove newline between 'class' and '{' -nl_class_brace = add # ignore/add/remove/force +nl_class_brace = add # ignore/add/remove/force # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in definition -nl_func_type_name = remove # ignore/add/remove/force +nl_func_type_name = remove # ignore/add/remove/force # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # ignore/add/remove/force # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # ignore/add/remove/force # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # ignore/add/remove/force # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # ignore/add/remove/force # Whether to put a newline after 'return' statement -nl_after_return = false # false/true +nl_after_return = false # false/true # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # false/true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = true # false/true +nl_after_brace_open = true # false/true # Whether to put a newline after a virtual brace open. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = true # false/true +nl_after_vbrace_open = true # false/true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # false/true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true +nl_squeeze_ifdef = false # false/true # Add or remove newline before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # ignore/add/remove/force # Add or remove newline after 'if' -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # ignore/add/remove/force # Add or remove newline before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # ignore/add/remove/force # Add or remove newline after 'for' -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # ignore/add/remove/force # Add or remove newline before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # ignore/add/remove/force # Add or remove newline after 'while' -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # ignore/add/remove/force # Add or remove newline before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # ignore/add/remove/force # Add or remove newline after 'switch' -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # ignore/add/remove/force # Add or remove newline before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # ignore/add/remove/force # Add or remove newline after 'do' -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # ignore/add/remove/force # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # false/true # Whether to double-space before the close brace of a struct/union/enum -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # false/true # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # ignore/add/remove/force # # Positioning options # # The position of boolean operators in wrapped expressions -pos_bool = ignore # ignore/lead/trail +pos_bool = ignore # ignore/lead/trail # The position of the comma in wrapped expressions -pos_comma = ignore # ignore/lead/trail +pos_comma = ignore # ignore/lead/trail # The position of the comma in the constructor initialization list -pos_class_comma = ignore # ignore/lead/trail +pos_class_comma = ignore # ignore/lead/trail # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # ignore/lead/trail # # Line Splitting options # # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true +ls_for_split_full = false # false/true # Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true +ls_func_split_full = false # false/true # # Blank line options # # The maximum consecutive newlines -nl_max = 2 # number +nl_max = 2 # number # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # number # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 0 # number +nl_after_func_proto_group = 0 # number # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 0 # number +nl_after_func_body = 0 # number # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 0 # number +nl_after_func_body_one_liner = 0 # number # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 0 # number +nl_before_block_comment = 0 # number # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # number # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # number # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # false/true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # false/true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = ignore # ignore/add/remove/force +mod_full_brace_do = ignore # ignore/add/remove/force # Add or remove braces on single-line 'for' statement -mod_full_brace_for = ignore # ignore/add/remove/force +mod_full_brace_for = ignore # ignore/add/remove/force # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # ignore/add/remove/force # Add or remove braces on single-line 'if' statement -mod_full_brace_if = ignore # ignore/add/remove/force +mod_full_brace_if = ignore # ignore/add/remove/force # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # number # Add or remove braces on single-line 'while' statement -mod_full_brace_while = ignore # ignore/add/remove/force +mod_full_brace_while = ignore # ignore/add/remove/force # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = ignore # ignore/add/remove/force +mod_paren_on_return = ignore # ignore/add/remove/force # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # false/true # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = false # false/true +mod_full_paren_if_bool = false # false/true # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = false # false/true +mod_remove_extra_semicolon = false # false/true # # Comment modifications # # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # false/true # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # false/true # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # false/true # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # false/true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # number # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # number # # Preprocessor options # # Add or remove indent of preprocessor directives -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # ignore/add/remove/force # Add or remove space between # and, say, define -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # ignore/add/remove/force # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/preproc-cleanup.cfg b/tests/config/preproc-cleanup.cfg index 20bbeec439..bccbb7a9a7 100644 --- a/tests/config/preproc-cleanup.cfg +++ b/tests/config/preproc-cleanup.cfg @@ -2,120 +2,120 @@ # Clean up preprocessor output, ie from "gcc -E" # -nl_after_semicolon = True -nl_after_brace_open = True +nl_after_semicolon = True +nl_after_brace_open = True -newlines = LF # AUTO (default), CRLF, CR, or LF +newlines = LF # AUTO (default), CRLF, CR, or LF -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 3 # new tab size +indent_columns = output_tab_size # indent_label = 0 # pos: absolute col, neg: relative column -indent_align_string = False # align broken strings -indent_brace = 0 -indent_class = true -indent_member = indent_columns +indent_align_string = False # align broken strings +indent_brace = 0 +indent_class = true +indent_member = indent_columns -nl_start_of_file = remove +nl_start_of_file = remove # nl_start_of_file_min = 0 -nl_end_of_file = force -nl_end_of_file_min = 1 -nl_max = 4 -nl_before_block_comment = 2 -nl_after_func_body = 2 -nl_after_func_proto_group = 2 +nl_end_of_file = force +nl_end_of_file_min = 1 +nl_max = 4 +nl_before_block_comment = 2 +nl_after_func_body = 2 +nl_after_func_proto_group = 2 -nl_assign_brace = add # "= {" vs "= \n {" -nl_enum_brace = add # "enum {" vs "enum \n {" -nl_union_brace = add # "union {" vs "union \n {" -nl_struct_brace = add # "struct {" vs "struct \n {" -nl_do_brace = add # "do {" vs "do \n {" -nl_if_brace = add # "if () {" vs "if () \n {" -nl_for_brace = add # "for () {" vs "for () \n {" -nl_else_brace = add # "else {" vs "else \n {" -nl_while_brace = add # "while () {" vs "while () \n {" -nl_switch_brace = add # "switch () {" vs "switch () \n {" -nl_func_var_def_blk = 1 -nl_before_case = 1 -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" -nl_after_return = TRUE -nl_after_case = TRUE -nl_brace_while = remove -nl_brace_else = add -nl_squeeze_ifdef = TRUE +nl_assign_brace = add # "= {" vs "= \n {" +nl_enum_brace = add # "enum {" vs "enum \n {" +nl_union_brace = add # "union {" vs "union \n {" +nl_struct_brace = add # "struct {" vs "struct \n {" +nl_do_brace = add # "do {" vs "do \n {" +nl_if_brace = add # "if () {" vs "if () \n {" +nl_for_brace = add # "for () {" vs "for () \n {" +nl_else_brace = add # "else {" vs "else \n {" +nl_while_brace = add # "while () {" vs "while () \n {" +nl_switch_brace = add # "switch () {" vs "switch () \n {" +nl_func_var_def_blk = 1 +nl_before_case = 1 +nl_fcall_brace = add # "foo() {" vs "foo()\n{" +nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_after_return = TRUE +nl_after_case = TRUE +nl_brace_while = remove +nl_brace_else = add +nl_squeeze_ifdef = TRUE -pos_bool = Trail # BOOL ops on trailing end +pos_bool = Trail # BOOL ops on trailing end -eat_blanks_before_close_brace = TRUE -eat_blanks_after_open_brace = TRUE +eat_blanks_before_close_brace = TRUE +eat_blanks_after_open_brace = TRUE -mod_paren_on_return = add # "return 1;" vs "return (1);" -mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" -mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" +mod_paren_on_return = add # "return 1;" vs "return (1);" +mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" +mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" +mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" +mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" -sp_before_byref = remove -sp_before_semi = remove -sp_paren_paren = remove # space between (( and )) -sp_return_paren = remove # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" -sp_inside_paren = remove -sp_inside_fparen = remove -sp_inside_sparen = remove -sp_inside_square = remove +sp_before_byref = remove +sp_before_semi = remove +sp_paren_paren = remove # space between (( and )) +sp_return_paren = remove # "return (1);" vs "return(1);" +sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" +sp_before_sparen = force # "if (" vs "if(" +sp_after_sparen = force # "if () {" vs "if (){" +sp_after_cast = remove # "(int) a" vs "(int)a" +sp_inside_braces = force # "{ 1 }" vs "{1}" +sp_inside_braces_struct = force # "{ 1 }" vs "{1}" +sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_inside_paren = remove +sp_inside_fparen = remove +sp_inside_sparen = remove +sp_inside_square = remove #sp_type_func = ignore -sp_assign = force -sp_arith = force -sp_bool = force -sp_compare = force -sp_assign = force -sp_after_comma = force -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" -sp_func_class_paren = remove -sp_before_angle = force -sp_after_angle = force -sp_inside_angle = remove -sp_sparen_brace = add -sp_fparen_brace = add -sp_after_ptr_star = remove -sp_before_ptr_star = force -sp_between_ptr_star = remove +sp_assign = force +sp_arith = force +sp_bool = force +sp_compare = force +sp_assign = force +sp_after_comma = force +sp_func_def_paren = remove # "int foo (){" vs "int foo(){" +sp_func_call_paren = remove # "foo (" vs "foo(" +sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_func_class_paren = remove +sp_before_angle = force +sp_after_angle = force +sp_inside_angle = remove +sp_sparen_brace = add +sp_fparen_brace = add +sp_after_ptr_star = remove +sp_before_ptr_star = force +sp_between_ptr_star = remove -align_with_tabs = FALSE # use tabs to align -align_on_tabstop = FALSE # align on tabstops -align_enum_equ_span = 16 -align_nl_cont = TRUE -align_var_def_span = 1 -align_var_def_thresh = 12 -align_var_def_inline = TRUE -align_var_def_star_style = 1 -align_var_def_colon = TRUE -align_assign_span = 1 -align_assign_thresh = 12 -align_struct_init_span = 3 -align_var_struct_span = 99 -align_right_cmt_span = 3 -align_pp_define_span = 3 -align_pp_define_gap = 4 -align_number_right = TRUE -align_typedef_span = 5 -align_typedef_gap = 3 +align_with_tabs = FALSE # use tabs to align +align_on_tabstop = FALSE # align on tabstops +align_enum_equ_span = 16 +align_nl_cont = TRUE +align_var_def_span = 1 +align_var_def_thresh = 12 +align_var_def_inline = TRUE +align_var_def_star_style = 1 +align_var_def_colon = TRUE +align_assign_span = 1 +align_assign_thresh = 12 +align_struct_init_span = 3 +align_var_struct_span = 99 +align_right_cmt_span = 3 +align_pp_define_span = 3 +align_pp_define_gap = 4 +align_number_right = TRUE +align_typedef_span = 5 +align_typedef_gap = 3 -cmt_star_cont = TRUE +cmt_star_cont = TRUE -sp_attribute_paren = remove -pp_indent = remove -pp_space = remove -sp_after_tparen_close = remove +sp_attribute_paren = remove +pp_indent = remove +pp_space = remove +sp_after_tparen_close = remove diff --git a/tests/config/proto-wrap.cfg b/tests/config/proto-wrap.cfg index d97e00d6ac..83d78a686e 100644 --- a/tests/config/proto-wrap.cfg +++ b/tests/config/proto-wrap.cfg @@ -1,3 +1,3 @@ -set PROTO_WRAP WRAP_FUNCTION +set PROTO_WRAP WRAP_FUNCTION -sp_arith = add +sp_arith = add diff --git a/tests/config/ptr_star-1.cfg b/tests/config/ptr_star-1.cfg index 771c26ad0c..edb5e0c72e 100644 --- a/tests/config/ptr_star-1.cfg +++ b/tests/config/ptr_star-1.cfg @@ -1,10 +1,10 @@ -sp_after_ptr_star = force -sp_after_ptr_star_func = force -sp_before_ptr_star = remove -sp_between_ptr_star = remove -sp_before_unnamed_ptr_star = remove +sp_after_ptr_star = force +sp_after_ptr_star_func = force +sp_before_ptr_star = remove +sp_between_ptr_star = remove +sp_before_unnamed_ptr_star = remove -sp_before_byref = remove -sp_after_byref = force -sp_before_unnamed_byref = remove +sp_before_byref = remove +sp_after_byref = force +sp_before_unnamed_byref = remove diff --git a/tests/config/ptr_star-2.cfg b/tests/config/ptr_star-2.cfg index a3bb06748e..e8d151636d 100644 --- a/tests/config/ptr_star-2.cfg +++ b/tests/config/ptr_star-2.cfg @@ -1,10 +1,10 @@ -sp_after_ptr_star = remove -sp_after_ptr_star_func = remove -sp_before_ptr_star = force -sp_between_ptr_star = remove -sp_before_unnamed_ptr_star = ignore +sp_after_ptr_star = remove +sp_after_ptr_star_func = remove +sp_before_ptr_star = force +sp_between_ptr_star = remove +sp_before_unnamed_ptr_star = ignore -sp_before_byref = force -sp_after_byref = remove -sp_before_unnamed_byref = ignore +sp_before_byref = force +sp_after_byref = remove +sp_before_unnamed_byref = ignore diff --git a/tests/config/ptr_star-3.cfg b/tests/config/ptr_star-3.cfg index 64656fe860..d9e30dc8b5 100644 --- a/tests/config/ptr_star-3.cfg +++ b/tests/config/ptr_star-3.cfg @@ -1,10 +1,10 @@ -sp_after_ptr_star = remove -sp_after_ptr_star_func = force -sp_before_ptr_star = force -sp_between_ptr_star = remove -sp_before_unnamed_ptr_star = remove +sp_after_ptr_star = remove +sp_after_ptr_star_func = force +sp_before_ptr_star = force +sp_between_ptr_star = remove +sp_before_unnamed_ptr_star = remove -sp_before_byref = remove -sp_after_byref = force -sp_before_unnamed_byref = force +sp_before_byref = remove +sp_after_byref = force +sp_before_unnamed_byref = force diff --git a/tests/config/ptr_star-4.cfg b/tests/config/ptr_star-4.cfg index 93c83907f2..26be94a324 100644 --- a/tests/config/ptr_star-4.cfg +++ b/tests/config/ptr_star-4.cfg @@ -1 +1 @@ -sp_after_ptr_star_qualifier = force +sp_after_ptr_star_qualifier = force diff --git a/tests/config/qt-1.cfg b/tests/config/qt-1.cfg index 90c78e8685..7953455c6a 100644 --- a/tests/config/qt-1.cfg +++ b/tests/config/qt-1.cfg @@ -1,21 +1,21 @@ -indent_columns = 4 -sp_balance_nested_parens = true -sp_inside_fparen = force -sp_inside_fparens = force -sp_paren_paren = force -sp_before_comma = force -sp_after_comma = force -sp_before_byref = force -sp_before_unnamed_byref = force -sp_after_type = force +indent_columns = 4 +sp_balance_nested_parens = true +sp_inside_fparen = force +sp_inside_fparens = force +sp_paren_paren = force +sp_before_comma = force +sp_after_comma = force +sp_before_byref = force +sp_before_unnamed_byref = force +sp_after_type = force -indent_access_spec=1 -nl_class_brace=force -nl_func_var_def_blk=1 -nl_before_access_spec=2 -nl_after_access_spec=1 -indent_class=true -sp_before_ptr_star=force -nl_end_of_file=force -nl_end_of_file_min=1 -nl_after_semicolon=true +indent_access_spec = 1 +nl_class_brace = force +nl_func_var_def_blk = 1 +nl_before_access_spec = 2 +nl_after_access_spec = 1 +indent_class = true +sp_before_ptr_star = force +nl_end_of_file = force +nl_end_of_file_min = 1 +nl_after_semicolon = true diff --git a/tests/config/rdan.cfg b/tests/config/rdan.cfg index 02d001aa5e..5a934a79da 100644 --- a/tests/config/rdan.cfg +++ b/tests/config/rdan.cfg @@ -17,19 +17,19 @@ # # The type of line endings -newlines = auto # auto/lf/crlf/cr +newlines = auto # auto/lf/crlf/cr # The original size of tabs in the input -input_tab_size = 8 # number +input_tab_size = 8 # number # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 3 # number +output_tab_size = 3 # number # The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # number # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # number # # Indenting @@ -37,1047 +37,1047 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = output_tab_size # number +indent_columns = output_tab_size # number # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # number # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # false/true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # number # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # number # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # false/true # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # false/true # Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # false/true # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # false/true # The number of spaces to indent a namespace block -indent_namespace_level = 0 # number +indent_namespace_level = 0 # number # If the body of the namespace is longer than this number, it won't be indented. # Requires indent_namespace=true. Default=0 (no limit) -indent_namespace_limit = 0 # number +indent_namespace_limit = 0 # number # Whether the 'extern "C"' body is indented -indent_extern = false # false/true +indent_extern = false # false/true # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # false/true # Whether to indent the stuff after a leading class colon -indent_class_colon = true # false/true +indent_class_colon = true # false/true # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level -indent_else_if = false # false/true +indent_else_if = false # false/true # Amount to indent variable declarations after a open brace. neg=relative, pos=absolute -indent_var_def_blk = 0 # number +indent_var_def_blk = 0 # number # True: force indentation of function definition to start in column 1 # False: use the default behavior -indent_func_def_force_col1 = true # false/true +indent_func_def_force_col1 = true # false/true # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = false # false/true +indent_func_call_param = false # false/true # Same as indent_func_call_param, but for function defs -indent_func_def_param = false # false/true +indent_func_def_param = false # false/true # Same as indent_func_call_param, but for function protos -indent_func_proto_param = false # false/true +indent_func_proto_param = false # false/true # Same as indent_func_call_param, but for class declarations -indent_func_class_param = false # false/true +indent_func_class_param = false # false/true # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = false # false/true +indent_func_ctor_var_param = false # false/true # Same as indent_func_call_param, but for templates -indent_template_param = false # false/true +indent_template_param = false # false/true # Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true +indent_func_param_double = false # false/true # Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 0 # number +indent_func_const = 0 # number # Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 0 # number +indent_func_throw = 0 # number # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = indent_columns # number +indent_member = indent_columns # number # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # number # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = false # false/true +indent_relative_single_line_comments = false # false/true # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = indent_columns # number +indent_switch_case = indent_columns # number # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # number # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 0 # number +indent_case_brace = 0 # number # Whether to indent comments found in first column -indent_col1_comment = true # false/true +indent_col1_comment = true # false/true # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # number # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # number # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # false/true # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # false/true # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 1 # number +indent_paren_close = 1 # number # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # false/true # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = true # false/true +indent_bool_paren = true # false/true # If 'indent_bool_paren' is true, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones -indent_first_bool_expr = true # false/true +indent_first_bool_expr = true # false/true # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # false/true # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # false/true # Align continued statements at the '='. Default=True # If FALSE or the '=' is followed by a newline, the next line is indent one tab. -indent_align_assign = true # false/true +indent_align_assign = true # false/true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # ignore/add/remove/force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # ignore/add/remove/force # Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. -sp_before_assign = ignore # ignore/add/remove/force +sp_before_assign = ignore # ignore/add/remove/force # Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. -sp_after_assign = ignore # ignore/add/remove/force +sp_after_assign = ignore # ignore/add/remove/force # Add or remove space around assignment '=' in enum -sp_enum_assign = force # ignore/add/remove/force +sp_enum_assign = force # ignore/add/remove/force # Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_before_assign = ignore # ignore/add/remove/force +sp_enum_before_assign = ignore # ignore/add/remove/force # Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_after_assign = ignore # ignore/add/remove/force +sp_enum_after_assign = ignore # ignore/add/remove/force # Add or remove space around preprocessor '##' concatenation operator. Default=Add -sp_pp_concat = ignore # ignore/add/remove/force +sp_pp_concat = ignore # ignore/add/remove/force # Add or remove space after preprocessor '#' stringify operator. Default=Add -sp_pp_stringify = ignore # ignore/add/remove/force +sp_pp_stringify = ignore # ignore/add/remove/force # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # ignore/add/remove/force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # ignore/add/remove/force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # ignore/add/remove/force # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # ignore/add/remove/force # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # false/true # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # ignore/add/remove/force # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # ignore/add/remove/force # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force +sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # ignore/add/remove/force # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # ignore/add/remove/force # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = remove # ignore/add/remove/force +sp_after_ptr_star_func = remove # ignore/add/remove/force # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = remove # ignore/add/remove/force +sp_before_ptr_star_func = remove # ignore/add/remove/force # Add or remove space before a reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # ignore/add/remove/force # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force +sp_before_unnamed_byref = ignore # ignore/add/remove/force # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = remove # ignore/add/remove/force +sp_after_byref = remove # ignore/add/remove/force # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = remove # ignore/add/remove/force +sp_after_byref_func = remove # ignore/add/remove/force # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = remove # ignore/add/remove/force +sp_before_byref_func = remove # ignore/add/remove/force # Add or remove space between type and word. Default=Force -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # ignore/add/remove/force # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. -sp_template_angle = ignore # ignore/add/remove/force +sp_template_angle = ignore # ignore/add/remove/force # Add or remove space before '<>' -sp_before_angle = remove # ignore/add/remove/force +sp_before_angle = remove # ignore/add/remove/force # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # ignore/add/remove/force # Add or remove space after '<>' -sp_after_angle = force # ignore/add/remove/force +sp_after_angle = force # ignore/add/remove/force # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = ignore # ignore/add/remove/force +sp_angle_paren = ignore # ignore/add/remove/force # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = ignore # ignore/add/remove/force +sp_angle_word = ignore # ignore/add/remove/force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # ignore/add/remove/force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # ignore/add/remove/force # Add or remove space before if-condition ')'. Overrides sp_inside_sparen. -sp_inside_sparen_close = ignore # ignore/add/remove/force +sp_inside_sparen_close = ignore # ignore/add/remove/force # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # ignore/add/remove/force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = add # ignore/add/remove/force +sp_sparen_brace = add # ignore/add/remove/force # Add or remove space between 'invariant' and '(' in the D language. -sp_invariant_paren = ignore # ignore/add/remove/force +sp_invariant_paren = ignore # ignore/add/remove/force # Add or remove space after the ')' in 'invariant (C) c' in the D language. -sp_after_invariant_paren = ignore # ignore/add/remove/force +sp_after_invariant_paren = ignore # ignore/add/remove/force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # ignore/add/remove/force # Add or remove space before ';'. Default=Remove -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # ignore/add/remove/force # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = ignore # ignore/add/remove/force +sp_before_semi_for = ignore # ignore/add/remove/force # Add or remove space before a semicolon of an empty part of a for statement. -sp_before_semi_for_empty = force # ignore/add/remove/force +sp_before_semi_for_empty = force # ignore/add/remove/force # Add or remove space after ';', except when followed by a comment. Default=Add -sp_after_semi = remove # ignore/add/remove/force +sp_after_semi = remove # ignore/add/remove/force # Add or remove space after ';' in non-empty 'for' statements. Default=Force -sp_after_semi_for = force # ignore/add/remove/force +sp_after_semi_for = force # ignore/add/remove/force # Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; ). -sp_after_semi_for_empty = force # ignore/add/remove/force +sp_after_semi_for_empty = force # ignore/add/remove/force # Add or remove space before '[' (except '[]') -sp_before_square = remove # ignore/add/remove/force +sp_before_square = remove # ignore/add/remove/force # Add or remove space before '[]' -sp_before_squares = remove # ignore/add/remove/force +sp_before_squares = remove # ignore/add/remove/force # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # ignore/add/remove/force # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # ignore/add/remove/force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # ignore/add/remove/force # Add or remove space before the variadic '...' -sp_before_ellipsis = ignore # ignore/add/remove/force +sp_before_ellipsis = ignore # ignore/add/remove/force # Add or remove space after class ':' -sp_after_class_colon = ignore # ignore/add/remove/force +sp_after_class_colon = ignore # ignore/add/remove/force # Add or remove space before class ':' -sp_before_class_colon = ignore # ignore/add/remove/force +sp_before_class_colon = ignore # ignore/add/remove/force # Add or remove space before case ':'. Default=Remove -sp_before_case_colon = remove # ignore/add/remove/force +sp_before_case_colon = remove # ignore/add/remove/force # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # ignore/add/remove/force # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = ignore # ignore/add/remove/force +sp_after_operator_sym = ignore # ignore/add/remove/force # Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # ignore/add/remove/force # Add or remove spaces inside cast parens -sp_inside_paren_cast = remove # ignore/add/remove/force +sp_inside_paren_cast = remove # ignore/add/remove/force # Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = remove # ignore/add/remove/force +sp_cpp_cast_paren = remove # ignore/add/remove/force # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # ignore/add/remove/force # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # ignore/add/remove/force # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = remove # ignore/add/remove/force +sp_inside_braces_enum = remove # ignore/add/remove/force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = remove # ignore/add/remove/force +sp_inside_braces_struct = remove # ignore/add/remove/force # Add or remove space inside '{' and '}' -sp_inside_braces = remove # ignore/add/remove/force +sp_inside_braces = remove # ignore/add/remove/force # Add or remove space inside '{}' -sp_inside_braces_empty = ignore # ignore/add/remove/force +sp_inside_braces_empty = ignore # ignore/add/remove/force # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = remove # ignore/add/remove/force +sp_type_func = remove # ignore/add/remove/force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # ignore/add/remove/force # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # ignore/add/remove/force # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # ignore/add/remove/force # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # ignore/add/remove/force # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = remove # ignore/add/remove/force +sp_square_fparen = remove # ignore/add/remove/force # Add or remove space between ')' and '{' of function -sp_fparen_brace = add # ignore/add/remove/force +sp_fparen_brace = add # ignore/add/remove/force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # ignore/add/remove/force # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = remove # ignore/add/remove/force +sp_func_call_user_paren = remove # ignore/add/remove/force # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # ignore/add/remove/force # Add or remove space between 'return' and '(' -sp_return_paren = remove # ignore/add/remove/force +sp_return_paren = remove # ignore/add/remove/force # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # ignore/add/remove/force # Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = remove # ignore/add/remove/force +sp_defined_paren = remove # ignore/add/remove/force # Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = remove # ignore/add/remove/force +sp_throw_paren = remove # ignore/add/remove/force # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # ignore/add/remove/force # Add or remove space between macro function ')' and value -sp_macro_func = remove # ignore/add/remove/force +sp_macro_func = remove # ignore/add/remove/force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = ignore # ignore/add/remove/force +sp_else_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # ignore/add/remove/force # Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = ignore # ignore/add/remove/force +sp_brace_typedef = ignore # ignore/add/remove/force # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # ignore/add/remove/force # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # ignore/add/remove/force # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # ignore/add/remove/force # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # ignore/add/remove/force # Add or remove space before the '::' operator -sp_before_dc = remove # ignore/add/remove/force +sp_before_dc = remove # ignore/add/remove/force # Add or remove space after the '::' operator -sp_after_dc = remove # ignore/add/remove/force +sp_after_dc = remove # ignore/add/remove/force # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # ignore/add/remove/force # Add or remove space after the '!' (not) operator. Default=Remove -sp_not = remove # ignore/add/remove/force +sp_not = remove # ignore/add/remove/force # Add or remove space after the '~' (invert) operator. Default=Remove -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # ignore/add/remove/force # Add or remove space after the '&' (address-of) operator. Default=Remove # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # ignore/add/remove/force # Add or remove space around the '.' or '->' operators. Default=Remove -sp_member = remove # ignore/add/remove/force +sp_member = remove # ignore/add/remove/force # Add or remove space after the '*' (dereference) operator. Default=Remove # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # ignore/add/remove/force # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # ignore/add/remove/force # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # ignore/add/remove/force # Add or remove space before a backslash-newline at the end of a line. Default=Add -sp_before_nl_cont = force # ignore/add/remove/force +sp_before_nl_cont = force # ignore/add/remove/force # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force +sp_after_oc_scope = ignore # ignore/add/remove/force # Add or remove space after the colon in message specs # '-(int) f:(int) x;' vs '-(int) f: (int) x;' -sp_after_oc_colon = ignore # ignore/add/remove/force +sp_after_oc_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in message specs # '-(int) f: (int) x;' vs '-(int) f : (int) x;' -sp_before_oc_colon = ignore # ignore/add/remove/force +sp_before_oc_colon = ignore # ignore/add/remove/force # Add or remove space after the colon in message specs # '[object setValue:1];' vs '[object setValue: 1];' -sp_after_send_oc_colon = ignore # ignore/add/remove/force +sp_after_send_oc_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in message specs # '[object setValue:1];' vs '[object setValue :1];' -sp_before_send_oc_colon = ignore # ignore/add/remove/force +sp_before_send_oc_colon = ignore # ignore/add/remove/force # Add or remove space after the (type) in message specs # '-(int)f: (int) x;' vs '-(int)f: (int)x;' -sp_after_oc_type = ignore # ignore/add/remove/force +sp_after_oc_type = ignore # ignore/add/remove/force # Add or remove space after the first (type) in message specs # '-(int) f:(int)x;' vs '-(int)f:(int)x;' -sp_after_oc_return_type = ignore # ignore/add/remove/force +sp_after_oc_return_type = ignore # ignore/add/remove/force # Add or remove space between '@selector' and '(' # '@selector(msgName).' vs '@selector (msgName)' -sp_after_oc_at_sel = ignore # ignore/add/remove/force +sp_after_oc_at_sel = ignore # ignore/add/remove/force # Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = force # ignore/add/remove/force +sp_cond_colon = force # ignore/add/remove/force # Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = force # ignore/add/remove/force +sp_cond_question = force # ignore/add/remove/force # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = force # ignore/add/remove/force +sp_case_label = force # ignore/add/remove/force # Control the space around the D '..' operator. -sp_range = ignore # ignore/add/remove/force +sp_range = ignore # ignore/add/remove/force # Control the space after the opening of a C++ comment '// A' vs '//A' -sp_cmt_cpp_start = ignore # ignore/add/remove/force +sp_cmt_cpp_start = ignore # ignore/add/remove/force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # false/true # Whether to use tabs for aligning -align_with_tabs = false # false/true +align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # false/true # Whether to right-align numbers -align_number_right = true # false/true +align_number_right = true # false/true # Align variable definitions in prototypes and functions -align_func_params = true # false/true +align_func_params = true # false/true # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = false # false/true +align_same_func_call_params = false # false/true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 1 # number +align_var_def_span = 1 # number # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 2 # number +align_var_def_star_style = 2 # number # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 2 # number +align_var_def_amp_style = 2 # number # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # number # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # number # Whether to align the colon in struct bit fields -align_var_def_colon = true # false/true +align_var_def_colon = true # false/true # Whether to align any attribute after the variable name -align_var_def_attribute = false # false/true +align_var_def_attribute = false # false/true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = true # false/true +align_var_def_inline = true # false/true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 1 # number +align_assign_span = 1 # number # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 # number # !!!! 1 si possible de supprimer lignes vides dans enum # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 1 # number +align_enum_equ_span = 1 # number # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # number # The span for aligning struct/union (0=don't align) -align_var_struct_span = 99 # number +align_var_struct_span = 99 # number # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # number # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # number # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 3 # number +align_struct_init_span = 3 # number # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 1 # number +align_typedef_gap = 1 # number # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 1 # number +align_typedef_span = 1 # number # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # number # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typedef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 2 # number +align_typedef_star_style = 2 # number # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typedef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 2 # number +align_typedef_amp_style = 2 # number # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 3 # number +align_right_cmt_span = 3 # number # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # false/true # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. -align_right_cmt_gap = 0 # number +align_right_cmt_gap = 0 # number # Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore) -align_right_cmt_at_col = code_width # number +align_right_cmt_at_col = code_width # number # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 1 # number +align_func_proto_span = 1 # number # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # number # Align function protos on the 'operator' keyword instead of what follows -align_on_operator = false # false/true +align_on_operator = false # false/true # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # false/true # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true +align_single_line_func = false # false/true # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # false/true # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # number # The span for aligning ObjC msg spec (0=don't align) -align_oc_msg_spec_span = 0 # number +align_oc_msg_spec_span = 0 # number # !!!! analyser options ayant un impact sur le format des macros # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = false # false/true +align_nl_cont = false # false/true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 1 # number +align_pp_define_gap = 1 # number # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 3 # number +align_pp_define_span = 3 # number # Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = false # false/true +align_left_shift = false # false/true # Align parameters in an Obj-C message on the ':' -align_oc_decl_colon = false # false/true +align_oc_decl_colon = false # false/true # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # false/true # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = true # false/true +nl_assign_leave_one_liners = true # false/true # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = true # false/true +nl_class_leave_one_liners = true # false/true # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = false # false/true +nl_enum_leave_one_liners = false # false/true # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # false/true # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # false/true # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # false/true # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # ignore/add/remove/force # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # number # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # ignore/add/remove/force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # number # Add or remove newline between '=' and '{' -nl_assign_brace = force # ignore/add/remove/force +nl_assign_brace = force # ignore/add/remove/force # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # ignore/add/remove/force # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # ignore/add/remove/force # The number of blank lines after a block of variable definitions -nl_func_var_def_blk = 2 # number +nl_func_var_def_blk = 2 # number # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = force # ignore/add/remove/force +nl_fcall_brace = force # ignore/add/remove/force # Add or remove newline between 'enum' and '{' -nl_enum_brace = force # ignore/add/remove/force +nl_enum_brace = force # ignore/add/remove/force # Add or remove newline between 'struct and '{' -nl_struct_brace = force # ignore/add/remove/force +nl_struct_brace = force # ignore/add/remove/force # Add or remove newline between 'union' and '{' -nl_union_brace = force # ignore/add/remove/force +nl_union_brace = force # ignore/add/remove/force # Add or remove newline between 'if' and '{' -nl_if_brace = force # ignore/add/remove/force +nl_if_brace = force # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = force # ignore/add/remove/force +nl_brace_else = force # ignore/add/remove/force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = ignore # ignore/add/remove/force +nl_elseif_brace = ignore # ignore/add/remove/force # Add or remove newline between 'else' and '{' -nl_else_brace = force # ignore/add/remove/force +nl_else_brace = force # ignore/add/remove/force # Add or remove newline between 'else' and 'if' -nl_else_if = remove # ignore/add/remove/force +nl_else_if = remove # ignore/add/remove/force # Add or remove newline between '}' and 'finally' -nl_brace_finally = ignore # ignore/add/remove/force +nl_brace_finally = ignore # ignore/add/remove/force # Add or remove newline between 'finally' and '{' -nl_finally_brace = ignore # ignore/add/remove/force +nl_finally_brace = ignore # ignore/add/remove/force # Add or remove newline between 'try' and '{' -nl_try_brace = ignore # ignore/add/remove/force +nl_try_brace = ignore # ignore/add/remove/force # Add or remove newline between get/set and '{' -nl_getset_brace = force # ignore/add/remove/force +nl_getset_brace = force # ignore/add/remove/force # Add or remove newline between 'for' and '{' -nl_for_brace = force # ignore/add/remove/force +nl_for_brace = force # ignore/add/remove/force # Add or remove newline between 'catch' and '{' -nl_catch_brace = ignore # ignore/add/remove/force +nl_catch_brace = ignore # ignore/add/remove/force # Add or remove newline between '}' and 'catch' -nl_brace_catch = ignore # ignore/add/remove/force +nl_brace_catch = ignore # ignore/add/remove/force # Add or remove newline between 'while' and '{' -nl_while_brace = force # ignore/add/remove/force +nl_while_brace = force # ignore/add/remove/force # Add or remove newline between two open or close braces. # Due to general newline/brace handling, REMOVE may not work. -nl_brace_brace = ignore # ignore/add/remove/force +nl_brace_brace = ignore # ignore/add/remove/force # Add or remove newline between 'do' and '{' -nl_do_brace = force # ignore/add/remove/force +nl_do_brace = force # ignore/add/remove/force # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = force # ignore/add/remove/force +nl_brace_while = force # ignore/add/remove/force # Add or remove newline between 'switch' and '{' -nl_switch_brace = force # ignore/add/remove/force +nl_switch_brace = force # ignore/add/remove/force # !!!!!! ??? # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # false/true # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = false # false/true +nl_multi_line_define = false # false/true # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # false/true # Add or remove newline between ')' and 'throw' -nl_before_throw = ignore # ignore/add/remove/force +nl_before_throw = ignore # ignore/add/remove/force # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # false/true # Newline between namespace and { -nl_namespace_brace = ignore # ignore/add/remove/force +nl_namespace_brace = ignore # ignore/add/remove/force # Add or remove newline between 'template<>' and whatever follows. -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # ignore/add/remove/force # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # ignore/add/remove/force # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in a function definition -nl_func_type_name = remove # ignore/add/remove/force +nl_func_type_name = remove # ignore/add/remove/force # Add or remove newline between return type and function name inside a class {} # Uses nl_func_type_name or nl_func_proto_type_name if set to ignore. -nl_func_type_name_class = ignore # ignore/add/remove/force +nl_func_type_name_class = ignore # ignore/add/remove/force # Add or remove newline between function scope and name in a definition # Controls the newline after '::' in 'void A::f() { }' -nl_func_scope_name = ignore # ignore/add/remove/force +nl_func_scope_name = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = remove # ignore/add/remove/force +nl_func_proto_type_name = remove # ignore/add/remove/force # Add or remove newline between a function name and the opening '(' -nl_func_paren = remove # ignore/add/remove/force +nl_func_paren = remove # ignore/add/remove/force # Add or remove newline after '(' in a function declaration -nl_func_decl_start = remove # ignore/add/remove/force +nl_func_decl_start = remove # ignore/add/remove/force # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # ignore/add/remove/force # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = remove # ignore/add/remove/force +nl_func_decl_end = remove # ignore/add/remove/force # Add or remove newline between '()' in a function declaration. -nl_func_decl_empty = ignore # ignore/add/remove/force +nl_func_decl_empty = ignore # ignore/add/remove/force # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # ignore/add/remove/force # Whether to put a newline after 'return' statement -nl_after_return = true # false/true +nl_after_return = true # false/true # Add or remove a newline between the return keyword and return expression. -nl_return_expr = remove # ignore/add/remove/force +nl_return_expr = remove # ignore/add/remove/force # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # false/true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = true # false/true +nl_after_brace_open = true # false/true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true +nl_after_brace_open_cmt = false # false/true # Whether to put a newline after a virtual brace open. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = false # false/true +nl_after_vbrace_open = false # false/true # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. -nl_after_brace_close = true # false/true +nl_after_brace_close = true # false/true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # false/true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = true # false/true +nl_squeeze_ifdef = true # false/true # Add or remove blank line before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # ignore/add/remove/force # Add or remove blank line after 'if' -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # ignore/add/remove/force # Add or remove blank line before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # ignore/add/remove/force # Add or remove blank line after 'for' -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # ignore/add/remove/force # Add or remove blank line before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # ignore/add/remove/force # Add or remove blank line after 'while' -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # ignore/add/remove/force # Add or remove blank line before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # ignore/add/remove/force # Add or remove blank line after 'switch' -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # ignore/add/remove/force # Add or remove blank line before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # ignore/add/remove/force # Add or remove blank line after 'do' -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # ignore/add/remove/force # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # false/true # Whether to double-space before the close brace of a struct/union/enum # (lower priority than 'eat_blanks_before_close_brace') -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # false/true # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # ignore/add/remove/force # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # false/true # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # false/true # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # false/true # # Positioning options # # The position of arithmetic operators in wrapped expressions -pos_arith = lead # ignore/lead/trail +pos_arith = lead # ignore/lead/trail # The position of assignment in wrapped expressions -pos_assign = trail # ignore/lead/trail +pos_assign = trail # ignore/lead/trail # The position of boolean operators in wrapped expressions -pos_bool = lead_force # ignore/lead/trail +pos_bool = lead_force # ignore/lead/trail # The position of comparison operators in wrapped expressions -pos_compare = lead # ignore/lead/trail +pos_compare = lead # ignore/lead/trail # The position of conditional (b ? t : f) operators in wrapped expressions -pos_conditional = lead_force # ignore/lead/trail +pos_conditional = lead_force # ignore/lead/trail # The position of the comma in wrapped expressions -pos_comma = trail # ignore/lead/trail +pos_comma = trail # ignore/lead/trail # The position of the comma in the constructor initialization list -pos_class_comma = ignore # ignore/lead/trail +pos_class_comma = ignore # ignore/lead/trail # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # ignore/lead/trail # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 80 # number +code_width = 80 # number # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = true # false/true +ls_for_split_full = true # false/true # Whether to fully split long function protos/calls at commas -ls_func_split_full = true # false/true +ls_func_split_full = true # false/true # # Blank line options # # The maximum consecutive newlines -nl_max = 3 # number +nl_max = 3 # number # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # number # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # number # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # number # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 2 # number +nl_after_func_body_one_liner = 2 # number # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # number # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # number # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # number # Whether to force a newline after a mulit-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # false/true # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 0 # number +nl_before_access_spec = 0 # number # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # number # The number of newlines between a function def and the function comment. # 0 = No change. -nl_comment_func_def = 0 # number +nl_comment_func_def = 0 # number # The number of newlines after a try-catch-finally block that isn't followed by a brace close. # 0 = No change. -nl_after_try_catch_finally = 0 # number +nl_after_try_catch_finally = 0 # number # The number of newlines before and after a property, indexer or event decl. # 0 = No change. -nl_around_cs_property = 0 # number +nl_around_cs_property = 0 # number # The number of newlines between the get/set/add/remove handlers in C#. # 0 = No change. -nl_between_get_set = 0 # number +nl_between_get_set = 0 # number # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # false/true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # false/true # # Code modifying options (non-whitespace) @@ -1085,181 +1085,181 @@ eat_blanks_before_close_brace = true # false/true # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # ignore/add/remove/force # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # ignore/add/remove/force # Add or remove braces on single-line function definitions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # ignore/add/remove/force # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # ignore/add/remove/force # Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if. # If any must be braced, they are all braced. If all can be unbraced, then the braces are removed. -mod_full_brace_if_chain = false # false/true +mod_full_brace_if_chain = false # false/true # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # number # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # ignore/add/remove/force # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = add # ignore/add/remove/force +mod_paren_on_return = add # ignore/add/remove/force # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # false/true # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = true # false/true +mod_full_paren_if_bool = true # false/true # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = false # false/true +mod_remove_extra_semicolon = false # false/true # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 0 # number +mod_add_long_function_closebrace_comment = 0 # number # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number +mod_add_long_switch_closebrace_comment = 0 # number # If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after # the #else, a comment will be added. -mod_add_long_ifdef_endif_comment = 0 # number +mod_add_long_ifdef_endif_comment = 0 # number # If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after # the #endif, a comment will be added. -mod_add_long_ifdef_else_comment = 0 # number +mod_add_long_ifdef_else_comment = 0 # number # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # false/true # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # false/true # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # false/true # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = false # false/true +mod_move_case_break = false # false/true # Will add or remove the braces around a fully braced case statement. # Will only remove the braces if there are no variable declarations in the block. -mod_case_brace = remove # ignore/add/remove/force +mod_case_brace = remove # ignore/add/remove/force # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = false # false/true +mod_remove_empty_return = false # false/true # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = code_width # number +cmt_width = code_width # number # Set the comment reflow mode (default: 0) # 0: no reflowing (apart from the line wrapping due to cmt_width) # 1: no touching at all # 2: full reflow -cmt_reflow_mode = 0 # number +cmt_reflow_mode = 0 # number # If false, disable all multi-line comment changes, including cmt_width and leading chars. # Default is true. -cmt_indent_multi = true # false/true +cmt_indent_multi = true # false/true # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # false/true # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # false/true # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # false/true # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # false/true # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # false/true # Whether to put a star on subsequent comment lines -cmt_star_cont = true # false/true +cmt_star_cont = true # false/true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # number # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # number # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true # false/true # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # string # The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_footer = "" # string +cmt_insert_file_footer = "" # string # The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment. # Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # string # The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment. # Will substitute $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # string # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true +cmt_insert_before_preproc = false # false/true # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = add # ignore/add/remove/force +pp_indent = add # ignore/add/remove/force # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = true # false/true +pp_indent_at_level = true # false/true # If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. -pp_indent_count = 3 # number +pp_indent_count = 3 # number # Add or remove space after # based on pp_level of #if blocks -pp_space = remove # ignore/add/remove/force +pp_space = remove # ignore/add/remove/force # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # number # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # number # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # false/true # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # number # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = true # false/true +pp_if_indent_code = true # false/true # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # false/true # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/region-0.cfg b/tests/config/region-0.cfg index 46736d3784..de1d219eba 100644 --- a/tests/config/region-0.cfg +++ b/tests/config/region-0.cfg @@ -1,7 +1,7 @@ # default region indent -indent_columns = 4 -pp_region_indent_code = false -pp_indent_region = 0 +indent_columns = 4 +pp_region_indent_code = false +pp_indent_region = 0 -indent_class = true +indent_class = true diff --git a/tests/config/region-1.cfg b/tests/config/region-1.cfg index 014a0765a4..94bccf714b 100644 --- a/tests/config/region-1.cfg +++ b/tests/config/region-1.cfg @@ -1,7 +1,7 @@ # indented region code -indent_columns = 4 -pp_region_indent_code = true -pp_indent_region = 0 +indent_columns = 4 +pp_region_indent_code = true +pp_indent_region = 0 -indent_class = true +indent_class = true diff --git a/tests/config/region-2.cfg b/tests/config/region-2.cfg index 16151de6cf..c2ab3a1d1b 100644 --- a/tests/config/region-2.cfg +++ b/tests/config/region-2.cfg @@ -1,7 +1,7 @@ # out-dented region preprocs -indent_columns = 4 -pp_region_indent_code = false -pp_indent_region = -4 +indent_columns = 4 +pp_region_indent_code = false +pp_indent_region = -4 -indent_class = true +indent_class = true diff --git a/tests/config/region-3.cfg b/tests/config/region-3.cfg index 1745830319..eee99baee5 100644 --- a/tests/config/region-3.cfg +++ b/tests/config/region-3.cfg @@ -1,7 +1,7 @@ # Abs column region preproc -indent_columns = 4 -pp_region_indent_code = false -pp_indent_region = 2 +indent_columns = 4 +pp_region_indent_code = false +pp_indent_region = 2 -indent_class = true +indent_class = true diff --git a/tests/config/return-1.cfg b/tests/config/return-1.cfg index 4603a9c30f..5513b333c5 100644 --- a/tests/config/return-1.cfg +++ b/tests/config/return-1.cfg @@ -1,11 +1,11 @@ -indent_columns = 4 -indent_with_tabs = 0 +indent_columns = 4 +indent_with_tabs = 0 -nl_after_return = true -mod_paren_on_return = add -nl_return_expr = remove +nl_after_return = true +mod_paren_on_return = add +nl_return_expr = remove -sp_before_semi = remove -sp_inside_paren = remove +sp_before_semi = remove +sp_inside_paren = remove diff --git a/tests/config/return-2.cfg b/tests/config/return-2.cfg index af872ab908..5201afa78a 100644 --- a/tests/config/return-2.cfg +++ b/tests/config/return-2.cfg @@ -1,11 +1,11 @@ -indent_columns = 4 -indent_with_tabs = 0 +indent_columns = 4 +indent_with_tabs = 0 -nl_after_return = true -mod_paren_on_return = remove -nl_return_expr = remove +nl_after_return = true +mod_paren_on_return = remove +nl_return_expr = remove -sp_before_semi = remove -sp_inside_paren = remove +sp_before_semi = remove +sp_inside_paren = remove diff --git a/tests/config/return-3.cfg b/tests/config/return-3.cfg index 26c81d4978..9bc65e6318 100644 --- a/tests/config/return-3.cfg +++ b/tests/config/return-3.cfg @@ -1,11 +1,11 @@ -indent_columns = 4 -indent_with_tabs = 0 +indent_columns = 4 +indent_with_tabs = 0 -nl_after_return = true -mod_paren_on_return = remove -nl_return_expr = force +nl_after_return = true +mod_paren_on_return = remove +nl_return_expr = force -sp_before_semi = remove -sp_inside_paren = remove +sp_before_semi = remove +sp_inside_paren = remove diff --git a/tests/config/return-4.cfg b/tests/config/return-4.cfg index 0dcfffa725..d535058daa 100644 --- a/tests/config/return-4.cfg +++ b/tests/config/return-4.cfg @@ -1,12 +1,12 @@ -indent_columns = 4 -indent_with_tabs = 0 +indent_columns = 4 +indent_with_tabs = 0 -nl_before_return = true -nl_after_return = true -mod_paren_on_return = force -nl_return_expr = force +nl_before_return = true +nl_after_return = true +mod_paren_on_return = force +nl_return_expr = force -sp_before_semi = remove -sp_inside_paren = remove +sp_before_semi = remove +sp_inside_paren = remove diff --git a/tests/config/sef.cfg b/tests/config/sef.cfg index d457175d6b..54651a4cf9 100644 --- a/tests/config/sef.cfg +++ b/tests/config/sef.cfg @@ -1,258 +1,258 @@ -newlines = crlf -input_tab_size = 4 -output_tab_size = 4 -string_escape_char = 92 -string_escape_char2 = 0 -indent_columns = 4 -indent_with_tabs = 2 -indent_align_string = false -indent_xml_string = 0 -indent_brace = 0 -indent_braces = false -indent_braces_no_func = false -indent_brace_parent = false -indent_namespace = true -indent_class = false -indent_class_colon = false -indent_constr_colon = false -indent_func_call_param = false -indent_func_class_param = true -indent_func_ctor_var_param = true -indent_func_param_double = true -indent_member = 0 -indent_sing_line_comments = 0 -indent_switch_case = 4 -indent_case_shift = 0 -indent_case_brace = 0 -indent_col1_comment = false -indent_label = 1 -indent_access_spec = 1 -indent_paren_nl = false -indent_paren_close = 0 -indent_comma_paren = false -indent_bool_paren = false -indent_square_nl = false -indent_preserve_sql = false -sp_arith = force -sp_assign = force -sp_bool = force -sp_compare = add -sp_inside_paren = remove -sp_paren_paren = remove -sp_balance_nested_parens = false -sp_paren_brace = force -sp_before_ptr_star = remove -sp_between_ptr_star = ignore -sp_after_ptr_star = add -sp_before_byref = remove -sp_after_byref = ignore -sp_before_angle = ignore -sp_after_angle = ignore -sp_angle_paren = ignore -sp_angle_word = ignore -sp_before_sparen = force -sp_inside_sparen = remove -sp_after_sparen = force -sp_sparen_brace = force -sp_special_semi = ignore -sp_before_semi = ignore -sp_before_semi_for = ignore -sp_before_semi_for_empty = ignore -sp_after_semi_for_empty = ignore -sp_before_square = remove -sp_before_squares = ignore -sp_inside_square = ignore -sp_after_comma = add -sp_before_comma = remove -sp_after_operator = ignore -sp_after_cast = ignore -sp_inside_paren_cast = ignore -sp_sizeof_paren = ignore -sp_after_tag = ignore -sp_inside_braces_enum = ignore -sp_inside_braces_struct = ignore -sp_inside_braces = ignore -sp_inside_angle = ignore -sp_type_func = remove -sp_func_proto_paren = remove -sp_func_def_paren = remove -sp_inside_fparens = remove -sp_inside_fparen = remove -sp_square_fparen = ignore -sp_fparen_brace = add -sp_func_call_paren = remove -sp_func_class_paren = remove -sp_return_paren = ignore -sp_attribute_paren = ignore -sp_macro = ignore -sp_macro_func = ignore -sp_else_brace = ignore -sp_brace_else = ignore -sp_catch_brace = ignore -sp_brace_catch = ignore -sp_finally_brace = ignore -sp_brace_finally = ignore -sp_try_brace = ignore -sp_getset_brace = ignore -sp_before_dc = ignore -sp_after_dc = remove -sp_d_array_colon = ignore -sp_not = remove -sp_inv = remove -sp_addr = remove -sp_deref = remove -align_keep_tabs = false -align_with_tabs = true -align_on_tabstop = true -align_number_right = false -align_func_params = false -align_var_def_span = 0 -align_var_def_star_style = 0 -align_var_def_amp_style = 0 -align_var_def_thresh = 0 -align_var_def_colon = false -align_var_def_inline = false -align_assign_span = 0 -align_assign_thresh = 0 -align_enum_equ_span = 0 -align_enum_equ_thresh = 0 -align_var_struct_span = 0 -align_var_struct_thresh = 0 -align_struct_init_span = 0 -align_typedef_gap = 0 -align_typedef_span = 0 -align_typedef_func = 0 -align_typedef_star_style = 0 -align_typedef_amp_style = 0 -align_right_cmt_span = 0 -align_func_proto_span = 0 -align_nl_cont = false -align_pp_define_gap = 0 -align_pp_define_span = 0 -nl_collapse_empty_body = false -nl_assign_leave_one_liners = false -nl_class_leave_one_liners = false -nl_enum_leave_one_liners = false -nl_getset_leave_one_liners = false -nl_func_leave_one_liners = true -nl_if_leave_one_liners = false -nl_start_of_file = ignore -nl_start_of_file_min = 0 -nl_end_of_file = ignore -nl_end_of_file_min = 0 -nl_assign_brace = ignore -nl_assign_square = ignore -nl_after_square_assign = ignore -nl_func_var_def_blk = 0 -nl_fcall_brace = ignore -nl_enum_brace = ignore -nl_struct_brace = ignore -nl_union_brace = ignore -nl_if_brace = remove -nl_brace_else = add -nl_elseif_brace = remove -nl_else_brace = remove -nl_brace_finally = ignore -nl_finally_brace = ignore -nl_try_brace = ignore -nl_getset_brace = ignore -nl_for_brace = remove -nl_catch_brace = ignore -nl_brace_catch = ignore -nl_while_brace = remove -nl_do_brace = remove -nl_brace_while = add -nl_switch_brace = remove -nl_multi_line_cond = false -nl_before_case = false -nl_after_case = false -nl_namespace_brace = ignore -nl_template_class = ignore -nl_class_brace = ignore -nl_class_init_args = force -nl_constr_init_args = force -nl_func_type_name = remove -nl_func_paren = remove -nl_func_decl_start = remove -nl_func_decl_args = remove -nl_func_decl_end = remove -nl_fdef_brace = ignore -nl_after_return = false -nl_after_semicolon = true -nl_after_brace_open = true -nl_after_brace_open_cmt = false -nl_after_vbrace_open = false -nl_define_macro = false -nl_squeeze_ifdef = false -nl_before_if = ignore -nl_after_if = ignore -nl_before_for = ignore -nl_after_for = ignore -nl_before_while = ignore -nl_after_while = ignore -nl_before_switch = ignore -nl_after_switch = ignore -nl_before_do = ignore -nl_after_do = ignore -nl_ds_struct_enum_cmt = false -nl_ds_struct_enum_close_brace = false -nl_class_colon = add -nl_constr_colon = add -nl_create_if_one_liner = false -nl_create_for_one_liner = false -nl_create_while_one_liner = false -pos_bool = lead -pos_comma = trail -pos_class_comma = trail -pos_constr_comma = trail -pos_class_colon = lead -pos_constr_colon = lead -code_width = 80 -ls_for_split_full = true -ls_func_split_full = true -nl_max = 3 -nl_after_func_proto = 0 -nl_after_func_proto_group = 0 -nl_after_func_body = 3 -nl_after_func_body_one_liner = 2 -nl_before_block_comment = 0 -nl_before_c_comment = 0 -nl_before_cpp_comment = 0 -nl_after_multiline_comment = false -nl_before_access_spec = 1 -nl_after_access_spec = 0 -eat_blanks_after_open_brace = true -eat_blanks_before_close_brace = true -mod_full_brace_do = add -mod_full_brace_for = add -mod_full_brace_function = ignore -mod_full_brace_if = add -mod_full_brace_nl = 0 -mod_full_brace_while = add -mod_paren_on_return = ignore -mod_pawn_semicolon = false -mod_full_paren_if_bool = false -mod_remove_extra_semicolon = false -cmt_width = 80 -cmt_c_group = false -cmt_c_nl_start = false -cmt_c_nl_end = false -cmt_cpp_group = false -cmt_cpp_nl_start = false -cmt_cpp_nl_end = false -cmt_cpp_to_c = false -cmt_star_cont = false -cmt_sp_before_star_cont = 0 -cmt_sp_after_star_cont = 0 -cmt_insert_file_header = "" -cmt_insert_func_header = "" -cmt_insert_class_header = "" -pp_indent = ignore -pp_indent_at_level = false -pp_space = ignore -pp_space_count = 0 -pp_indent_region = 0 -pp_region_indent_code = false -pp_indent_if = 0 -pp_if_indent_code = false -pp_define_at_level = false +newlines = crlf +input_tab_size = 4 +output_tab_size = 4 +string_escape_char = 92 +string_escape_char2 = 0 +indent_columns = 4 +indent_with_tabs = 2 +indent_align_string = false +indent_xml_string = 0 +indent_brace = 0 +indent_braces = false +indent_braces_no_func = false +indent_brace_parent = false +indent_namespace = true +indent_class = false +indent_class_colon = false +indent_constr_colon = false +indent_func_call_param = false +indent_func_class_param = true +indent_func_ctor_var_param = true +indent_func_param_double = true +indent_member = 0 +indent_sing_line_comments = 0 +indent_switch_case = 4 +indent_case_shift = 0 +indent_case_brace = 0 +indent_col1_comment = false +indent_label = 1 +indent_access_spec = 1 +indent_paren_nl = false +indent_paren_close = 0 +indent_comma_paren = false +indent_bool_paren = false +indent_square_nl = false +indent_preserve_sql = false +sp_arith = force +sp_assign = force +sp_bool = force +sp_compare = add +sp_inside_paren = remove +sp_paren_paren = remove +sp_balance_nested_parens = false +sp_paren_brace = force +sp_before_ptr_star = remove +sp_between_ptr_star = ignore +sp_after_ptr_star = add +sp_before_byref = remove +sp_after_byref = ignore +sp_before_angle = ignore +sp_after_angle = ignore +sp_angle_paren = ignore +sp_angle_word = ignore +sp_before_sparen = force +sp_inside_sparen = remove +sp_after_sparen = force +sp_sparen_brace = force +sp_special_semi = ignore +sp_before_semi = ignore +sp_before_semi_for = ignore +sp_before_semi_for_empty = ignore +sp_after_semi_for_empty = ignore +sp_before_square = remove +sp_before_squares = ignore +sp_inside_square = ignore +sp_after_comma = add +sp_before_comma = remove +sp_after_operator = ignore +sp_after_cast = ignore +sp_inside_paren_cast = ignore +sp_sizeof_paren = ignore +sp_after_tag = ignore +sp_inside_braces_enum = ignore +sp_inside_braces_struct = ignore +sp_inside_braces = ignore +sp_inside_angle = ignore +sp_type_func = remove +sp_func_proto_paren = remove +sp_func_def_paren = remove +sp_inside_fparens = remove +sp_inside_fparen = remove +sp_square_fparen = ignore +sp_fparen_brace = add +sp_func_call_paren = remove +sp_func_class_paren = remove +sp_return_paren = ignore +sp_attribute_paren = ignore +sp_macro = ignore +sp_macro_func = ignore +sp_else_brace = ignore +sp_brace_else = ignore +sp_catch_brace = ignore +sp_brace_catch = ignore +sp_finally_brace = ignore +sp_brace_finally = ignore +sp_try_brace = ignore +sp_getset_brace = ignore +sp_before_dc = ignore +sp_after_dc = remove +sp_d_array_colon = ignore +sp_not = remove +sp_inv = remove +sp_addr = remove +sp_deref = remove +align_keep_tabs = false +align_with_tabs = true +align_on_tabstop = true +align_number_right = false +align_func_params = false +align_var_def_span = 0 +align_var_def_star_style = 0 +align_var_def_amp_style = 0 +align_var_def_thresh = 0 +align_var_def_colon = false +align_var_def_inline = false +align_assign_span = 0 +align_assign_thresh = 0 +align_enum_equ_span = 0 +align_enum_equ_thresh = 0 +align_var_struct_span = 0 +align_var_struct_thresh = 0 +align_struct_init_span = 0 +align_typedef_gap = 0 +align_typedef_span = 0 +align_typedef_func = 0 +align_typedef_star_style = 0 +align_typedef_amp_style = 0 +align_right_cmt_span = 0 +align_func_proto_span = 0 +align_nl_cont = false +align_pp_define_gap = 0 +align_pp_define_span = 0 +nl_collapse_empty_body = false +nl_assign_leave_one_liners = false +nl_class_leave_one_liners = false +nl_enum_leave_one_liners = false +nl_getset_leave_one_liners = false +nl_func_leave_one_liners = true +nl_if_leave_one_liners = false +nl_start_of_file = ignore +nl_start_of_file_min = 0 +nl_end_of_file = ignore +nl_end_of_file_min = 0 +nl_assign_brace = ignore +nl_assign_square = ignore +nl_after_square_assign = ignore +nl_func_var_def_blk = 0 +nl_fcall_brace = ignore +nl_enum_brace = ignore +nl_struct_brace = ignore +nl_union_brace = ignore +nl_if_brace = remove +nl_brace_else = add +nl_elseif_brace = remove +nl_else_brace = remove +nl_brace_finally = ignore +nl_finally_brace = ignore +nl_try_brace = ignore +nl_getset_brace = ignore +nl_for_brace = remove +nl_catch_brace = ignore +nl_brace_catch = ignore +nl_while_brace = remove +nl_do_brace = remove +nl_brace_while = add +nl_switch_brace = remove +nl_multi_line_cond = false +nl_before_case = false +nl_after_case = false +nl_namespace_brace = ignore +nl_template_class = ignore +nl_class_brace = ignore +nl_class_init_args = force +nl_constr_init_args = force +nl_func_type_name = remove +nl_func_paren = remove +nl_func_decl_start = remove +nl_func_decl_args = remove +nl_func_decl_end = remove +nl_fdef_brace = ignore +nl_after_return = false +nl_after_semicolon = true +nl_after_brace_open = true +nl_after_brace_open_cmt = false +nl_after_vbrace_open = false +nl_define_macro = false +nl_squeeze_ifdef = false +nl_before_if = ignore +nl_after_if = ignore +nl_before_for = ignore +nl_after_for = ignore +nl_before_while = ignore +nl_after_while = ignore +nl_before_switch = ignore +nl_after_switch = ignore +nl_before_do = ignore +nl_after_do = ignore +nl_ds_struct_enum_cmt = false +nl_ds_struct_enum_close_brace = false +nl_class_colon = add +nl_constr_colon = add +nl_create_if_one_liner = false +nl_create_for_one_liner = false +nl_create_while_one_liner = false +pos_bool = lead +pos_comma = trail +pos_class_comma = trail +pos_constr_comma = trail +pos_class_colon = lead +pos_constr_colon = lead +code_width = 80 +ls_for_split_full = true +ls_func_split_full = true +nl_max = 3 +nl_after_func_proto = 0 +nl_after_func_proto_group = 0 +nl_after_func_body = 3 +nl_after_func_body_one_liner = 2 +nl_before_block_comment = 0 +nl_before_c_comment = 0 +nl_before_cpp_comment = 0 +nl_after_multiline_comment = false +nl_before_access_spec = 1 +nl_after_access_spec = 0 +eat_blanks_after_open_brace = true +eat_blanks_before_close_brace = true +mod_full_brace_do = add +mod_full_brace_for = add +mod_full_brace_function = ignore +mod_full_brace_if = add +mod_full_brace_nl = 0 +mod_full_brace_while = add +mod_paren_on_return = ignore +mod_pawn_semicolon = false +mod_full_paren_if_bool = false +mod_remove_extra_semicolon = false +cmt_width = 80 +cmt_c_group = false +cmt_c_nl_start = false +cmt_c_nl_end = false +cmt_cpp_group = false +cmt_cpp_nl_start = false +cmt_cpp_nl_end = false +cmt_cpp_to_c = false +cmt_star_cont = false +cmt_sp_before_star_cont = 0 +cmt_sp_after_star_cont = 0 +cmt_insert_file_header = "" +cmt_insert_func_header = "" +cmt_insert_class_header = "" +pp_indent = ignore +pp_indent_at_level = false +pp_space = ignore +pp_space_count = 0 +pp_indent_region = 0 +pp_region_indent_code = false +pp_indent_if = 0 +pp_if_indent_code = false +pp_define_at_level = false diff --git a/tests/config/sf.3266678.cfg b/tests/config/sf.3266678.cfg index 76e506fc75..3fa1a4d0d4 100644 --- a/tests/config/sf.3266678.cfg +++ b/tests/config/sf.3266678.cfg @@ -1,6 +1,6 @@ -sp_before_byref = remove # ignore/add/remove/force -sp_before_unnamed_byref = remove # ignore/add/remove/force -sp_after_byref = add # ignore/add/remove/force -sp_after_byref_func = add # ignore/add/remove/force -sp_before_byref_func = remove # ignore/add/remove/force -sp_after_type = force # ignore/add/remove/force +sp_before_byref = remove # ignore/add/remove/force +sp_before_unnamed_byref = remove # ignore/add/remove/force +sp_after_byref = add # ignore/add/remove/force +sp_after_byref_func = add # ignore/add/remove/force +sp_before_byref_func = remove # ignore/add/remove/force +sp_after_type = force # ignore/add/remove/force diff --git a/tests/config/sf.3315874.cfg b/tests/config/sf.3315874.cfg index 14ac73be91..fca83baf76 100644 --- a/tests/config/sf.3315874.cfg +++ b/tests/config/sf.3315874.cfg @@ -1,100 +1,100 @@ # # The type of line endings -newlines = lf # auto/lf/crlf/cr +newlines = lf # auto/lf/crlf/cr -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 1 # new tab size +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 1 # new tab size indent_columns = 4 -indent_label = 2 # pos: absolute col, neg: relative column -indent_align_string = False # align broken strings +indent_label = 2 # pos: absolute col, neg: relative column +indent_align_string = False # align broken strings indent_brace = 0 # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. indent_switch_case = indent_columns -nl_enum_brace = force # "enum {" vs "enum \n {" -nl_union_brace = force # "union {" vs "union \n {" -nl_struct_brace = force # "struct {" vs "struct \n {" -nl_do_brace = force # "do {" vs "do \n {" -nl_if_brace = force # "if () {" vs "if () \n {" -nl_for_brace = force # "for () {" vs "for () \n {" -nl_else_brace = force # "else {" vs "else \n {" -nl_while_brace = force # "while () {" vs "while () \n {" -nl_switch_brace = force # "switch () {" vs "switch () \n {" +nl_enum_brace = force # "enum {" vs "enum \n {" +nl_union_brace = force # "union {" vs "union \n {" +nl_struct_brace = force # "struct {" vs "struct \n {" +nl_do_brace = force # "do {" vs "do \n {" +nl_if_brace = force # "if () {" vs "if () \n {" +nl_for_brace = force # "for () {" vs "for () \n {" +nl_else_brace = force # "else {" vs "else \n {" +nl_while_brace = force # "while () {" vs "while () \n {" +nl_switch_brace = force # "switch () {" vs "switch () \n {" # nl_before_case = 1 -nl_fcall_brace = force # "foo() {" vs "foo()\n{" -nl_fdef_brace = force # "int foo() {" vs "int foo()\n{" +nl_fcall_brace = force # "foo() {" vs "foo()\n{" +nl_fdef_brace = force # "int foo() {" vs "int foo()\n{" nl_after_return = TRUE nl_brace_while = force nl_brace_else = force nl_squeeze_ifdef = TRUE # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # false/true # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # ignore/add/remove/force # Add or remove newline after each ',' in a function definition -nl_func_def_args = force # ignore/add/remove/force +nl_func_def_args = force # ignore/add/remove/force # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # ignore/add/remove/force # Add or remove newline after '(' in a function definition -nl_func_def_start = force # ignore/add/remove/force +nl_func_def_start = force # ignore/add/remove/force # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 3 # number +nl_after_func_body = 3 # number # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 3 # number +nl_after_func_body_one_liner = 3 # number # The number of blank lines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # number # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 1 # number +nl_after_func_proto = 1 # number # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # number # The maximum consecutive newlines -nl_max = 2 # number +nl_max = 2 # number # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # false/true # Whether to force a newline after a multi-line comment. -nl_after_multiline_comment = true # false/true +nl_after_multiline_comment = true # false/true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = true # false/true +nl_after_brace_open = true # false/true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = true # false/true +nl_after_brace_open_cmt = true # false/true # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. -nl_after_brace_close = true # false/true +nl_after_brace_close = true # false/true # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 0 # number +nl_before_block_comment = 0 # number # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # number # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # number # Whether to force a newline after a multi-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # false/true # The minimum number of newlines after a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. @@ -117,21 +117,21 @@ nl_after_multiline_comment = false # false/true # mod_paren_on_return = add # "return 1;" vs "return (1);" - mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" - mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" - mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" - mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" +mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" +mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" +mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" +mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" sp_before_semi = remove -sp_paren_paren = force # space between (( and )) -sp_return_paren = force # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = force # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_paren_paren = force # space between (( and )) +sp_return_paren = force # "return (1);" vs "return(1);" +sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" +sp_before_sparen = force # "if (" vs "if(" +sp_after_sparen = force # "if () {" vs "if (){" +sp_after_cast = force # "(int) a" vs "(int)a" +sp_inside_braces = force # "{ 1 }" vs "{1}" +sp_inside_braces_struct = force # "{ 1 }" vs "{1}" +sp_inside_braces_enum = force # "{ 1 }" vs "{1}" sp_inside_paren = force sp_inside_fparen = force sp_inside_sparen = force @@ -142,56 +142,56 @@ sp_bool = force sp_compare = force sp_assign = force sp_after_comma = force -sp_func_def_paren = force # "int foo (){" vs "int foo(){" -sp_func_call_paren = force # "foo (" vs "foo(" -sp_func_proto_paren = force # "int foo ();" vs "int foo();" +sp_func_def_paren = force # "int foo (){" vs "int foo(){" +sp_func_call_paren = force # "foo (" vs "foo(" +sp_func_proto_paren = force # "int foo ();" vs "int foo();" # Add or remove space between type and word. Default=Force -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # ignore/add/remove/force # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # ignore/add/remove/force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # ignore/add/remove/force # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # ignore/add/remove/force # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = ignore # ignore/add/remove/force +sp_after_ptr_star_func = ignore # ignore/add/remove/force # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = ignore # ignore/add/remove/force +sp_before_ptr_star_func = ignore # ignore/add/remove/force # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = remove # ignore/add/remove/force +sp_before_unnamed_ptr_star = remove # ignore/add/remove/force # Add or remove space before a reference sign '&' -sp_before_byref = force # ignore/add/remove/force +sp_before_byref = force # ignore/add/remove/force # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force +sp_before_unnamed_byref = ignore # ignore/add/remove/force # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = remove # ignore/add/remove/force +sp_after_byref = remove # ignore/add/remove/force # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = ignore # ignore/add/remove/force +sp_after_byref_func = ignore # ignore/add/remove/force # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = ignore # ignore/add/remove/force +sp_before_byref_func = ignore # ignore/add/remove/force # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = remove # ignore/add/remove/force +sp_after_operator_sym = remove # ignore/add/remove/force @@ -199,8 +199,8 @@ sp_after_operator_sym = remove # ignore/add/remove/force -align_with_tabs = FALSE # use tabs to align -align_on_tabstop = FALSE # align on tabstops +align_with_tabs = FALSE # use tabs to align +align_on_tabstop = FALSE # align on tabstops align_enum_equ_span = 4 align_nl_cont = TRUE align_var_def_span = 2 @@ -209,59 +209,59 @@ align_var_def_inline = TRUE # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 0 # number +align_var_def_star_style = 0 # number # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 1 # number +align_var_def_star_style = 1 # number # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 1 # number +align_var_def_amp_style = 1 # number align_var_def_colon = TRUE align_assign_span = 100000 # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 # number align_struct_init_span = 3 align_var_struct_span = 3 align_right_cmt_span = 15 # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. This has to be > 0 to do anything. -align_right_cmt_gap = 1 # number +align_right_cmt_gap = 1 # number align_pp_define_span = 3 align_pp_define_gap = 4 -align_number_right = TRUE +align_number_right = TRUE align_typedef_span = 5 align_typedef_gap = 3 align_func_params = true # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = true # false/true +align_same_func_call_params = true # false/true # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 100 # number +align_func_proto_span = 100 # number # Minimum gap between the return type and the function name. -align_func_proto_gap = 5 # number +align_func_proto_gap = 5 # number # Align function protos on the 'operator' keyword instead of what follows -align_on_operator = true # false/true +align_on_operator = true # false/true # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # false/true # The gap for aligning struct/union member definitions -align_var_struct_gap = 14 # number +align_var_struct_gap = 14 # number @@ -274,34 +274,34 @@ eat_blanks_after_open_brace = TRUE # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # number # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # number # Set the comment reflow mode (default: 0) # 0: no reflowing (apart from the line wrapping due to cmt_width) # 1: no touching at all # 2: full reflow -cmt_reflow_mode = 0 # number +cmt_reflow_mode = 0 # number # If false, disable all multi-line comment changes, including cmt_width. keyword substitution, and leading chars. # Default is true. -cmt_indent_multi = false # false/true +cmt_indent_multi = false # false/true # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # false/true # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = true # false/true +cmt_c_nl_start = true # false/true # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = true # false/true +cmt_c_nl_end = true # false/true # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # false/true # @@ -309,26 +309,26 @@ indent_col1_comment = false # false/true # # The position of arithmetic operators in wrapped expressions -pos_arith = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_arith = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of assignment in wrapped expressions. # Do not affect '=' followed by '{' -pos_assign = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_assign = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of boolean operators in wrapped expressions -pos_bool = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_bool = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of comparison operators in wrapped expressions -pos_compare = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_compare = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of conditional (b ? t : f) operators in wrapped expressions -pos_conditional = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_conditional = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of the comma in wrapped expressions -pos_comma = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_comma = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of the comma in the constructor initialization list -pos_class_comma = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_comma = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of colons between constructor and member initialization -pos_class_colon = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_colon = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force diff --git a/tests/config/sf537.cfg b/tests/config/sf537.cfg index b7be172170..1c1c7f0f26 100644 --- a/tests/config/sf537.cfg +++ b/tests/config/sf537.cfg @@ -1,111 +1,111 @@ -tok_split_gte=false -utf8_byte=false -utf8_force=false -indent_cmt_with_tabs=false -indent_align_string=false -indent_braces=false -indent_braces_no_func=false -indent_braces_no_class=false -indent_braces_no_struct=false -indent_brace_parent=false -indent_namespace=false -indent_extern=false -indent_class=false -indent_class_colon=false -indent_else_if=false -indent_var_def_cont=false -indent_func_call_param=false -indent_func_def_param=false -indent_func_proto_param=false -indent_func_class_param=false -indent_func_ctor_var_param=false -indent_template_param=false -indent_func_param_double=false -indent_relative_single_line_comments=false -indent_col1_comment=false -indent_access_spec_body=false -indent_paren_nl=false -indent_comma_paren=false -indent_bool_paren=false -indent_first_bool_expr=false -indent_square_nl=false -indent_preserve_sql=false -indent_align_assign=true -sp_balance_nested_parens=false -align_keep_tabs=false -align_with_tabs=false -align_on_tabstop=false -align_number_right=false -align_func_params=false -align_same_func_call_params=false -align_var_def_colon=false -align_var_def_attribute=false -align_var_def_inline=false -align_right_cmt_mix=false -align_on_operator=false -align_mix_var_proto=false -align_single_line_func=false -align_single_line_brace=false -align_nl_cont=false -align_left_shift=true -align_oc_decl_colon=false -nl_collapse_empty_body=false -nl_assign_leave_one_liners=false -nl_class_leave_one_liners=false -nl_enum_leave_one_liners=false -nl_getset_leave_one_liners=false -nl_func_leave_one_liners=false -nl_if_leave_one_liners=false -nl_multi_line_cond=false -nl_multi_line_define=false -nl_before_case=false -nl_after_case=false -nl_after_return=false -nl_after_semicolon=false -nl_after_brace_open=false -nl_after_brace_open_cmt=false -nl_after_vbrace_open=false -nl_after_vbrace_open_empty=false -nl_after_brace_close=false -nl_after_vbrace_close=false -nl_define_macro=false -nl_squeeze_ifdef=false -nl_ds_struct_enum_cmt=false -nl_ds_struct_enum_close_brace=false -nl_create_if_one_liner=false -nl_create_for_one_liner=false -nl_create_while_one_liner=false -ls_for_split_full=false -ls_func_split_full=false -nl_after_multiline_comment=false -eat_blanks_after_open_brace=false -eat_blanks_before_close_brace=false -mod_full_brace_if_chain=false -mod_pawn_semicolon=false -mod_full_paren_if_bool=false -mod_remove_extra_semicolon=false -mod_sort_import=false -mod_sort_using=false -mod_sort_include=false -mod_move_case_break=false -mod_remove_empty_return=false -cmt_indent_multi=true -cmt_c_group=false -cmt_c_nl_start=false -cmt_c_nl_end=false -cmt_cpp_group=false -cmt_cpp_nl_start=false -cmt_cpp_nl_end=false -cmt_cpp_to_c=false -cmt_star_cont=false -cmt_multi_check_last=true -cmt_insert_before_preproc=false -pp_indent_at_level=false -pp_region_indent_code=false -pp_if_indent_code=false -pp_define_at_level=false -indent_columns=2 -indent_with_tabs=0 -sp_arith=remove -sp_assign=remove -sp_before_ptr_star=add +tok_split_gte = false +utf8_byte = false +utf8_force = false +indent_cmt_with_tabs = false +indent_align_string = false +indent_braces = false +indent_braces_no_func = false +indent_braces_no_class = false +indent_braces_no_struct = false +indent_brace_parent = false +indent_namespace = false +indent_extern = false +indent_class = false +indent_class_colon = false +indent_else_if = false +indent_var_def_cont = false +indent_func_call_param = false +indent_func_def_param = false +indent_func_proto_param = false +indent_func_class_param = false +indent_func_ctor_var_param = false +indent_template_param = false +indent_func_param_double = false +indent_relative_single_line_comments = false +indent_col1_comment = false +indent_access_spec_body = false +indent_paren_nl = false +indent_comma_paren = false +indent_bool_paren = false +indent_first_bool_expr = false +indent_square_nl = false +indent_preserve_sql = false +indent_align_assign = true +sp_balance_nested_parens = false +align_keep_tabs = false +align_with_tabs = false +align_on_tabstop = false +align_number_right = false +align_func_params = false +align_same_func_call_params = false +align_var_def_colon = false +align_var_def_attribute = false +align_var_def_inline = false +align_right_cmt_mix = false +align_on_operator = false +align_mix_var_proto = false +align_single_line_func = false +align_single_line_brace = false +align_nl_cont = false +align_left_shift = true +align_oc_decl_colon = false +nl_collapse_empty_body = false +nl_assign_leave_one_liners = false +nl_class_leave_one_liners = false +nl_enum_leave_one_liners = false +nl_getset_leave_one_liners = false +nl_func_leave_one_liners = false +nl_if_leave_one_liners = false +nl_multi_line_cond = false +nl_multi_line_define = false +nl_before_case = false +nl_after_case = false +nl_after_return = false +nl_after_semicolon = false +nl_after_brace_open = false +nl_after_brace_open_cmt = false +nl_after_vbrace_open = false +nl_after_vbrace_open_empty = false +nl_after_brace_close = false +nl_after_vbrace_close = false +nl_define_macro = false +nl_squeeze_ifdef = false +nl_ds_struct_enum_cmt = false +nl_ds_struct_enum_close_brace = false +nl_create_if_one_liner = false +nl_create_for_one_liner = false +nl_create_while_one_liner = false +ls_for_split_full = false +ls_func_split_full = false +nl_after_multiline_comment = false +eat_blanks_after_open_brace = false +eat_blanks_before_close_brace = false +mod_full_brace_if_chain = false +mod_pawn_semicolon = false +mod_full_paren_if_bool = false +mod_remove_extra_semicolon = false +mod_sort_import = false +mod_sort_using = false +mod_sort_include = false +mod_move_case_break = false +mod_remove_empty_return = false +cmt_indent_multi = true +cmt_c_group = false +cmt_c_nl_start = false +cmt_c_nl_end = false +cmt_cpp_group = false +cmt_cpp_nl_start = false +cmt_cpp_nl_end = false +cmt_cpp_to_c = false +cmt_star_cont = false +cmt_multi_check_last = true +cmt_insert_before_preproc = false +pp_indent_at_level = false +pp_region_indent_code = false +pp_if_indent_code = false +pp_define_at_level = false +indent_columns = 2 +indent_with_tabs = 0 +sp_arith = remove +sp_assign = remove +sp_before_ptr_star = add diff --git a/tests/config/sf538.cfg b/tests/config/sf538.cfg index 6a18e66116..555807b3d7 100644 --- a/tests/config/sf538.cfg +++ b/tests/config/sf538.cfg @@ -1,112 +1,112 @@ -tok_split_gte=false -utf8_byte=false -utf8_force=false -indent_cmt_with_tabs=false -indent_align_string=false -indent_braces=false -indent_braces_no_func=false -indent_braces_no_class=false -indent_braces_no_struct=false -indent_brace_parent=false -indent_namespace=false -indent_extern=false -indent_class=false -indent_class_colon=false -indent_else_if=false -indent_var_def_cont=false -indent_func_call_param=false -indent_func_def_param=false -indent_func_proto_param=false -indent_func_class_param=false -indent_func_ctor_var_param=false -indent_template_param=false -indent_func_param_double=false -indent_relative_single_line_comments=false -indent_col1_comment=false -indent_access_spec_body=false -indent_paren_nl=false -indent_comma_paren=false -indent_bool_paren=false -indent_first_bool_expr=false -indent_square_nl=false -indent_preserve_sql=false -indent_align_assign=true -sp_balance_nested_parens=false -align_keep_tabs=false -align_with_tabs=false -align_on_tabstop=false -align_number_right=false -align_func_params=false -align_same_func_call_params=false -align_var_def_colon=false -align_var_def_attribute=false -align_var_def_inline=false -align_right_cmt_mix=false -align_on_operator=false -align_mix_var_proto=false -align_single_line_func=false -align_single_line_brace=false -align_nl_cont=false -align_left_shift=true -align_oc_decl_colon=false -nl_collapse_empty_body=false -nl_assign_leave_one_liners=false -nl_class_leave_one_liners=false -nl_enum_leave_one_liners=false -nl_getset_leave_one_liners=false -nl_func_leave_one_liners=false -nl_if_leave_one_liners=false -nl_multi_line_cond=false -nl_multi_line_define=false -nl_before_case=false -nl_after_case=false -nl_after_return=false -nl_after_semicolon=false -nl_after_brace_open=false -nl_after_brace_open_cmt=false -nl_after_vbrace_open=false -nl_after_vbrace_open_empty=false -nl_after_brace_close=false -nl_after_vbrace_close=false -nl_define_macro=false -nl_squeeze_ifdef=false -nl_ds_struct_enum_cmt=false -nl_ds_struct_enum_close_brace=false -nl_create_if_one_liner=false -nl_create_for_one_liner=false -nl_create_while_one_liner=false -ls_for_split_full=false -ls_func_split_full=false -nl_after_multiline_comment=false -eat_blanks_after_open_brace=false -eat_blanks_before_close_brace=false -mod_full_brace_if_chain=false -mod_pawn_semicolon=false -mod_full_paren_if_bool=false -mod_remove_extra_semicolon=false -mod_sort_import=false -mod_sort_using=false -mod_sort_include=false -mod_move_case_break=false -mod_remove_empty_return=false -cmt_indent_multi=true -cmt_c_group=false -cmt_c_nl_start=false -cmt_c_nl_end=false -cmt_cpp_group=false -cmt_cpp_nl_start=false -cmt_cpp_nl_end=false -cmt_cpp_to_c=false -cmt_star_cont=false -cmt_multi_check_last=true -cmt_insert_before_preproc=false -pp_indent_at_level=false -pp_region_indent_code=false -pp_if_indent_code=false -pp_define_at_level=false -indent_columns=2 -indent_with_tabs=0 -sp_arith=remove -sp_assign=remove -sp_special_semi=force -sp_before_semi = force +tok_split_gte = false +utf8_byte = false +utf8_force = false +indent_cmt_with_tabs = false +indent_align_string = false +indent_braces = false +indent_braces_no_func = false +indent_braces_no_class = false +indent_braces_no_struct = false +indent_brace_parent = false +indent_namespace = false +indent_extern = false +indent_class = false +indent_class_colon = false +indent_else_if = false +indent_var_def_cont = false +indent_func_call_param = false +indent_func_def_param = false +indent_func_proto_param = false +indent_func_class_param = false +indent_func_ctor_var_param = false +indent_template_param = false +indent_func_param_double = false +indent_relative_single_line_comments = false +indent_col1_comment = false +indent_access_spec_body = false +indent_paren_nl = false +indent_comma_paren = false +indent_bool_paren = false +indent_first_bool_expr = false +indent_square_nl = false +indent_preserve_sql = false +indent_align_assign = true +sp_balance_nested_parens = false +align_keep_tabs = false +align_with_tabs = false +align_on_tabstop = false +align_number_right = false +align_func_params = false +align_same_func_call_params = false +align_var_def_colon = false +align_var_def_attribute = false +align_var_def_inline = false +align_right_cmt_mix = false +align_on_operator = false +align_mix_var_proto = false +align_single_line_func = false +align_single_line_brace = false +align_nl_cont = false +align_left_shift = true +align_oc_decl_colon = false +nl_collapse_empty_body = false +nl_assign_leave_one_liners = false +nl_class_leave_one_liners = false +nl_enum_leave_one_liners = false +nl_getset_leave_one_liners = false +nl_func_leave_one_liners = false +nl_if_leave_one_liners = false +nl_multi_line_cond = false +nl_multi_line_define = false +nl_before_case = false +nl_after_case = false +nl_after_return = false +nl_after_semicolon = false +nl_after_brace_open = false +nl_after_brace_open_cmt = false +nl_after_vbrace_open = false +nl_after_vbrace_open_empty = false +nl_after_brace_close = false +nl_after_vbrace_close = false +nl_define_macro = false +nl_squeeze_ifdef = false +nl_ds_struct_enum_cmt = false +nl_ds_struct_enum_close_brace = false +nl_create_if_one_liner = false +nl_create_for_one_liner = false +nl_create_while_one_liner = false +ls_for_split_full = false +ls_func_split_full = false +nl_after_multiline_comment = false +eat_blanks_after_open_brace = false +eat_blanks_before_close_brace = false +mod_full_brace_if_chain = false +mod_pawn_semicolon = false +mod_full_paren_if_bool = false +mod_remove_extra_semicolon = false +mod_sort_import = false +mod_sort_using = false +mod_sort_include = false +mod_move_case_break = false +mod_remove_empty_return = false +cmt_indent_multi = true +cmt_c_group = false +cmt_c_nl_start = false +cmt_c_nl_end = false +cmt_cpp_group = false +cmt_cpp_nl_start = false +cmt_cpp_nl_end = false +cmt_cpp_to_c = false +cmt_star_cont = false +cmt_multi_check_last = true +cmt_insert_before_preproc = false +pp_indent_at_level = false +pp_region_indent_code = false +pp_if_indent_code = false +pp_define_at_level = false +indent_columns = 2 +indent_with_tabs = 0 +sp_arith = remove +sp_assign = remove +sp_special_semi = force +sp_before_semi = force diff --git a/tests/config/sf557.cfg b/tests/config/sf557.cfg index 06687e9569..08f263df78 100644 --- a/tests/config/sf557.cfg +++ b/tests/config/sf557.cfg @@ -1,2 +1,2 @@ -include ben.cfg -align_func_params = true +include ben.cfg +align_func_params = true diff --git a/tests/config/sf562.cfg b/tests/config/sf562.cfg index ba06b17e0c..4d2bd3090f 100644 --- a/tests/config/sf562.cfg +++ b/tests/config/sf562.cfg @@ -22,173 +22,173 @@ ## sp_inside_braces=remove -indent_align_string=false -indent_braces=false -indent_braces_no_func=false -indent_brace_parent=false -indent_namespace=false -indent_extern=false -indent_class=true -indent_class_colon=true -indent_else_if=false -indent_func_call_param=false -indent_func_def_param=false -indent_func_proto_param=false -indent_func_class_param=false -indent_func_ctor_var_param=false -indent_template_param=false -indent_func_param_double=false -indent_relative_single_line_comments=false -indent_col1_comment=false -indent_access_spec_body=false -indent_paren_nl=false -indent_comma_paren=false -indent_bool_paren=false -indent_square_nl=false -indent_preserve_sql=false -indent_align_assign=true -sp_balance_nested_parens=false -align_keep_tabs=false -align_with_tabs=false -align_on_tabstop=false -align_number_right=false -align_func_params=false -align_same_func_call_params=false -align_var_def_colon=false -align_var_def_attribute=false -align_var_def_inline=false -align_right_cmt_mix=false -align_on_operator=false -align_mix_var_proto=false -align_single_line_func=false -align_single_line_brace=false -align_nl_cont=false -align_left_shift=true -nl_collapse_empty_body=false -nl_assign_leave_one_liners=false -nl_class_leave_one_liners=false -nl_enum_leave_one_liners=true -nl_getset_leave_one_liners=false -nl_func_leave_one_liners=true -nl_if_leave_one_liners=false -nl_multi_line_cond=false -nl_multi_line_define=false -nl_before_case=false -nl_after_case=true -nl_after_return=false -nl_after_semicolon=true -nl_after_brace_open=true -nl_after_brace_open_cmt=false -nl_after_vbrace_open=true -nl_after_brace_close=true -nl_define_macro=false -nl_squeeze_ifdef=true -nl_ds_struct_enum_cmt=false -nl_ds_struct_enum_close_brace=false -nl_create_if_one_liner=false -nl_create_for_one_liner=false -nl_create_while_one_liner=false -ls_for_split_full=false -ls_func_split_full=false -nl_after_multiline_comment=false -eat_blanks_after_open_brace=true -eat_blanks_before_close_brace=true -mod_pawn_semicolon=false -mod_full_paren_if_bool=false -mod_remove_extra_semicolon=true -mod_sort_import=false -mod_sort_using=false -mod_sort_include=false -mod_move_case_break=false -mod_remove_empty_return=false -cmt_indent_multi=false -cmt_c_group=false -cmt_c_nl_start=false -cmt_c_nl_end=false -cmt_cpp_group=false -cmt_cpp_nl_start=false -cmt_cpp_nl_end=false -cmt_cpp_to_c=false -cmt_star_cont=false -cmt_multi_check_last=false -cmt_insert_before_preproc=false -pp_indent_at_level=false -pp_region_indent_code=false -pp_if_indent_code=false -pp_define_at_level=false -input_tab_size=8 -output_tab_size=8 -indent_columns=4 -indent_var_def_blk=0 -indent_label=2 -nl_end_of_file_min=1 -newlines=auto -indent_with_tabs=0 -sp_arith=force -sp_assign=force -sp_enum_assign=force -sp_bool=force -sp_compare=force -sp_inside_paren=remove -sp_paren_paren=remove -sp_before_ptr_star=force -sp_between_ptr_star = remove -sp_after_ptr_star=remove -sp_before_byref=force -sp_after_byref=remove -sp_before_sparen=force -sp_inside_sparen=remove -sp_after_sparen=force -sp_before_semi=remove -sp_after_comma=force -sp_after_cast=remove -sp_sizeof_paren=remove -sp_inside_braces_enum=remove -sp_inside_braces_struct=remove -sp_inside_braces=remove -sp_func_proto_paren=remove -sp_func_def_paren=remove -sp_inside_fparen=remove -sp_fparen_brace=force -sp_func_call_paren=remove -sp_return_paren=remove -sp_else_brace=force -sp_brace_else=force -nl_start_of_file=remove -nl_end_of_file=force -nl_fcall_brace=remove -nl_enum_brace=remove -nl_struct_brace=remove -nl_union_brace=remove -nl_if_brace=remove -nl_brace_else=remove -nl_else_brace=remove -nl_else_if=remove -nl_brace_finally=remove -nl_finally_brace=remove -nl_try_brace=remove -nl_getset_brace=remove -nl_for_brace=remove -nl_catch_brace=remove -nl_brace_catch=remove -nl_while_brace=remove -nl_do_brace=remove -nl_brace_while=remove -nl_switch_brace=remove -nl_namespace_brace=remove -nl_template_class=force -nl_class_brace=remove -nl_func_scope_name=remove -nl_func_paren=remove -nl_func_decl_end=remove -nl_fdef_brace=remove -nl_return_expr=remove -pos_assign=trail -pos_comma=trail -pos_class_comma=trail -pos_class_colon=lead -mod_full_brace_do=add -mod_paren_on_return=remove +indent_align_string = false +indent_braces = false +indent_braces_no_func = false +indent_brace_parent = false +indent_namespace = false +indent_extern = false +indent_class = true +indent_class_colon = true +indent_else_if = false +indent_func_call_param = false +indent_func_def_param = false +indent_func_proto_param = false +indent_func_class_param = false +indent_func_ctor_var_param = false +indent_template_param = false +indent_func_param_double = false +indent_relative_single_line_comments = false +indent_col1_comment = false +indent_access_spec_body = false +indent_paren_nl = false +indent_comma_paren = false +indent_bool_paren = false +indent_square_nl = false +indent_preserve_sql = false +indent_align_assign = true +sp_balance_nested_parens = false +align_keep_tabs = false +align_with_tabs = false +align_on_tabstop = false +align_number_right = false +align_func_params = false +align_same_func_call_params = false +align_var_def_colon = false +align_var_def_attribute = false +align_var_def_inline = false +align_right_cmt_mix = false +align_on_operator = false +align_mix_var_proto = false +align_single_line_func = false +align_single_line_brace = false +align_nl_cont = false +align_left_shift = true +nl_collapse_empty_body = false +nl_assign_leave_one_liners = false +nl_class_leave_one_liners = false +nl_enum_leave_one_liners = true +nl_getset_leave_one_liners = false +nl_func_leave_one_liners = true +nl_if_leave_one_liners = false +nl_multi_line_cond = false +nl_multi_line_define = false +nl_before_case = false +nl_after_case = true +nl_after_return = false +nl_after_semicolon = true +nl_after_brace_open = true +nl_after_brace_open_cmt = false +nl_after_vbrace_open = true +nl_after_brace_close = true +nl_define_macro = false +nl_squeeze_ifdef = true +nl_ds_struct_enum_cmt = false +nl_ds_struct_enum_close_brace = false +nl_create_if_one_liner = false +nl_create_for_one_liner = false +nl_create_while_one_liner = false +ls_for_split_full = false +ls_func_split_full = false +nl_after_multiline_comment = false +eat_blanks_after_open_brace = true +eat_blanks_before_close_brace = true +mod_pawn_semicolon = false +mod_full_paren_if_bool = false +mod_remove_extra_semicolon = true +mod_sort_import = false +mod_sort_using = false +mod_sort_include = false +mod_move_case_break = false +mod_remove_empty_return = false +cmt_indent_multi = false +cmt_c_group = false +cmt_c_nl_start = false +cmt_c_nl_end = false +cmt_cpp_group = false +cmt_cpp_nl_start = false +cmt_cpp_nl_end = false +cmt_cpp_to_c = false +cmt_star_cont = false +cmt_multi_check_last = false +cmt_insert_before_preproc = false +pp_indent_at_level = false +pp_region_indent_code = false +pp_if_indent_code = false +pp_define_at_level = false +input_tab_size = 8 +output_tab_size = 8 +indent_columns = 4 +indent_var_def_blk = 0 +indent_label = 2 +nl_end_of_file_min = 1 +newlines = auto +indent_with_tabs = 0 +sp_arith = force +sp_assign = force +sp_enum_assign = force +sp_bool = force +sp_compare = force +sp_inside_paren = remove +sp_paren_paren = remove +sp_before_ptr_star = force +sp_between_ptr_star = remove +sp_after_ptr_star = remove +sp_before_byref = force +sp_after_byref = remove +sp_before_sparen = force +sp_inside_sparen = remove +sp_after_sparen = force +sp_before_semi = remove +sp_after_comma = force +sp_after_cast = remove +sp_sizeof_paren = remove +sp_inside_braces_enum = remove +sp_inside_braces_struct = remove +sp_inside_braces = remove +sp_func_proto_paren = remove +sp_func_def_paren = remove +sp_inside_fparen = remove +sp_fparen_brace = force +sp_func_call_paren = remove +sp_return_paren = remove +sp_else_brace = force +sp_brace_else = force +nl_start_of_file = remove +nl_end_of_file = force +nl_fcall_brace = remove +nl_enum_brace = remove +nl_struct_brace = remove +nl_union_brace = remove +nl_if_brace = remove +nl_brace_else = remove +nl_else_brace = remove +nl_else_if = remove +nl_brace_finally = remove +nl_finally_brace = remove +nl_try_brace = remove +nl_getset_brace = remove +nl_for_brace = remove +nl_catch_brace = remove +nl_brace_catch = remove +nl_while_brace = remove +nl_do_brace = remove +nl_brace_while = remove +nl_switch_brace = remove +nl_namespace_brace = remove +nl_template_class = force +nl_class_brace = remove +nl_func_scope_name = remove +nl_func_paren = remove +nl_func_decl_end = remove +nl_fdef_brace = remove +nl_return_expr = remove +pos_assign = trail +pos_comma = trail +pos_class_comma = trail +pos_class_colon = lead +mod_full_brace_do = add +mod_paren_on_return = remove -sp_before_semi_for_empty = remove -sp_after_semi_for_empty = remove +sp_before_semi_for_empty = remove +sp_after_semi_for_empty = remove diff --git a/tests/config/sf567.cfg b/tests/config/sf567.cfg index d1496108f0..fd0b519881 100644 --- a/tests/config/sf567.cfg +++ b/tests/config/sf567.cfg @@ -1 +1 @@ -align_same_func_call_params = true +align_same_func_call_params = true diff --git a/tests/config/sf574.cfg b/tests/config/sf574.cfg index 8c7b5502a9..37e78a1d17 100644 --- a/tests/config/sf574.cfg +++ b/tests/config/sf574.cfg @@ -5,33 +5,33 @@ # # The type of line endings -newlines = auto # auto/lf/crlf/cr +newlines = auto # auto/lf/crlf/cr # The original size of tabs in the input -input_tab_size = 4 # number +input_tab_size = 4 # number # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 4 # number +output_tab_size = 4 # number # The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # number # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # number # Allow interpreting '>=' and '>>=' as part of a template in 'void f(list>=val);'. # If true (default), 'assert(x<0 && y>=3)' will be broken. # Improvements to template detection may make this option obsolete. -tok_split_gte = false # false/true +tok_split_gte = false # false/true # Control what to do with the UTF-8 BOM (recommend 'remove') -utf8_bom = ignore # ignore/add/remove/force +utf8_bom = ignore # ignore/add/remove/force # If the file contains bytes with values between 128 and 255, but is not UTF-8, then output as UTF-8 -utf8_byte = false # false/true +utf8_byte = false # false/true # Force the output encoding to UTF-8 -utf8_force = false # false/true +utf8_force = false # false/true # # Indenting @@ -39,1590 +39,1590 @@ utf8_force = false # false/true # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 4 # number +indent_columns = 4 # number # The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents. # For FreeBSD, this is set to 4. Negative value is absolute and not increased for each ( level -indent_continue = 0 # number +indent_continue = 0 # number # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs to brace level, align with spaces # 2=indent and align with tabs, using spaces when not on a tabstop -indent_with_tabs = 0 # number +indent_with_tabs = 0 # number # Comments that are not a brace level are indented with tabs on a tabstop. # Requires indent_with_tabs=2. If false, will use spaces. -indent_cmt_with_tabs = false # false/true +indent_cmt_with_tabs = false # false/true # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # false/true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # number # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # number # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # false/true # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # false/true # Disabled indenting class braces if indent_braces is true -indent_braces_no_class = false # false/true +indent_braces_no_class = false # false/true # Disabled indenting struct braces if indent_braces is true -indent_braces_no_struct = false # false/true +indent_braces_no_struct = false # false/true # Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # false/true # Whether the 'namespace' body is indented -indent_namespace = true # false/true +indent_namespace = true # false/true # The number of spaces to indent a namespace block -indent_namespace_level = 0 # number +indent_namespace_level = 0 # number # If the body of the namespace is longer than this number, it won't be indented. # Requires indent_namespace=true. Default=0 (no limit) -indent_namespace_limit = 0 # number +indent_namespace_limit = 0 # number # Whether the 'extern "C"' body is indented -indent_extern = false # false/true +indent_extern = false # false/true # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # false/true # Whether to indent the stuff after a leading base class colon -indent_class_colon = false # false/true +indent_class_colon = false # false/true # Whether to indent the stuff after a leading class initializer colon -indent_constr_colon = false # false/true +indent_constr_colon = false # false/true # Virtual indent from the ':' for member initializers. Default is 2 -indent_ctor_init_leading = 2 # number +indent_ctor_init_leading = 2 # number # Additional indenting for constructor initializer list -indent_ctor_init = 0 # number +indent_ctor_init = 0 # number # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level -indent_else_if = false # false/true +indent_else_if = false # false/true # Amount to indent variable declarations after a open brace. neg=relative, pos=absolute -indent_var_def_blk = 0 # number +indent_var_def_blk = 0 # number # Indent continued variable declarations instead of aligning. -indent_var_def_cont = false # false/true +indent_var_def_cont = false # false/true # True: force indentation of function definition to start in column 1 # False: use the default behavior -indent_func_def_force_col1 = false # false/true +indent_func_def_force_col1 = false # false/true # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = true # false/true +indent_func_call_param = true # false/true # Same as indent_func_call_param, but for function defs -indent_func_def_param = true # false/true +indent_func_def_param = true # false/true # Same as indent_func_call_param, but for function protos -indent_func_proto_param = true # false/true +indent_func_proto_param = true # false/true # Same as indent_func_call_param, but for class declarations -indent_func_class_param = true # false/true +indent_func_class_param = true # false/true # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = true # false/true +indent_func_ctor_var_param = true # false/true # Same as indent_func_call_param, but for templates -indent_template_param = true # false/true +indent_template_param = true # false/true # Double the indent for indent_func_xxx_param options -indent_func_param_double = true # false/true +indent_func_param_double = true # false/true # Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 8 # number +indent_func_const = 8 # number # Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 8 # number +indent_func_throw = 8 # number # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 8 # number +indent_member = 8 # number # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # number # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = false # false/true +indent_relative_single_line_comments = false # false/true # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 4 # number +indent_switch_case = 4 # number # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # number # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 0 # number +indent_case_brace = 0 # number # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # false/true # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = -2 # number +indent_label = -2 # number # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = -2 # number +indent_access_spec = -2 # number # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # false/true # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # false/true # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 0 # number +indent_paren_close = 0 # number # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # false/true # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # false/true # If 'indent_bool_paren' is true, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones -indent_first_bool_expr = false # false/true +indent_first_bool_expr = false # false/true # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # false/true # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # false/true # Align continued statements at the '='. Default=True # If FALSE or the '=' is followed by a newline, the next line is indent one tab. -indent_align_assign = false # false/true +indent_align_assign = false # false/true # Indent OC blocks at brace level instead of usual rules. -indent_oc_block = false # false/true +indent_oc_block = false # false/true # Indent OC blocks in a message relative to the parameter name. # 0=use indent_oc_block rules, 1+=spaces to indent -indent_oc_block_msg = 0 # number +indent_oc_block_msg = 0 # number # Minimum indent for subsequent parameters -indent_oc_msg_colon = 0 # number +indent_oc_msg_colon = 0 # number # If true, prioritize aligning with initial colon (and stripping spaces from lines, if necessary). # Default is true. -indent_oc_msg_prioritize_first_colon = true # false/true +indent_oc_msg_prioritize_first_colon = true # false/true # If indent_oc_block_msg and this option are on, blocks will be indented the way that Xcode does by default (from keyword if the parameter is on its own line; otherwise, from the previous indentation level). -indent_oc_block_msg_xcode_style = false # false/true +indent_oc_block_msg_xcode_style = false # false/true # If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is relative to a msg keyword. -indent_oc_block_msg_from_keyword = false # false/true +indent_oc_block_msg_from_keyword = false # false/true # If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is relative to a msg colon. -indent_oc_block_msg_from_colon = false # false/true +indent_oc_block_msg_from_colon = false # false/true # If indent_oc_block_msg and this option are on, blocks will be indented from where the block caret is. -indent_oc_block_msg_from_caret = false # false/true +indent_oc_block_msg_from_caret = false # false/true # If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is. -indent_oc_block_msg_from_brace = false # false/true +indent_oc_block_msg_from_brace = false # false/true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # ignore/add/remove/force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # ignore/add/remove/force # Add or remove space around '=' in C++11 lambda capture specifications. Overrides sp_assign -sp_cpp_lambda_assign = ignore # ignore/add/remove/force +sp_cpp_lambda_assign = ignore # ignore/add/remove/force # Add or remove space after the capture specification in C++11 lambda. -sp_cpp_lambda_paren = ignore # ignore/add/remove/force +sp_cpp_lambda_paren = ignore # ignore/add/remove/force # Add or remove space around assignment operator '=' in a prototype -sp_assign_default = force # ignore/add/remove/force +sp_assign_default = force # ignore/add/remove/force # Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. -sp_before_assign = force # ignore/add/remove/force +sp_before_assign = force # ignore/add/remove/force # Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. -sp_after_assign = force # ignore/add/remove/force +sp_after_assign = force # ignore/add/remove/force # Add or remove space around assignment '=' in enum -sp_enum_assign = force # ignore/add/remove/force +sp_enum_assign = force # ignore/add/remove/force # Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_before_assign = force # ignore/add/remove/force +sp_enum_before_assign = force # ignore/add/remove/force # Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_after_assign = force # ignore/add/remove/force +sp_enum_after_assign = force # ignore/add/remove/force # Add or remove space around preprocessor '##' concatenation operator. Default=Add -sp_pp_concat = force # ignore/add/remove/force +sp_pp_concat = force # ignore/add/remove/force # Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator. -sp_pp_stringify = force # ignore/add/remove/force +sp_pp_stringify = force # ignore/add/remove/force # Add or remove space before preprocessor '#' stringify operator as in '#define x(y) L#y'. -sp_before_pp_stringify = ignore # ignore/add/remove/force +sp_before_pp_stringify = ignore # ignore/add/remove/force # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # ignore/add/remove/force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # ignore/add/remove/force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # ignore/add/remove/force # Add or remove space between nested parens: '((' vs ') )' -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # ignore/add/remove/force # Add or remove space between back-to-back parens: ')(' vs ') (' -sp_cparen_oparen = ignore # ignore/add/remove/force +sp_cparen_oparen = ignore # ignore/add/remove/force # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # false/true # Add or remove space between ')' and '{' -sp_paren_brace = force # ignore/add/remove/force +sp_paren_brace = force # ignore/add/remove/force # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # ignore/add/remove/force # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force +sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # ignore/add/remove/force # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # ignore/add/remove/force # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = remove # ignore/add/remove/force +sp_after_ptr_star_func = remove # ignore/add/remove/force # Add or remove space after a pointer star '*', if followed by an open paren (function types). -sp_ptr_star_paren = remove # ignore/add/remove/force +sp_ptr_star_paren = remove # ignore/add/remove/force # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = force # ignore/add/remove/force +sp_before_ptr_star_func = force # ignore/add/remove/force # Add or remove space before a reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # ignore/add/remove/force # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = remove # ignore/add/remove/force +sp_before_unnamed_byref = remove # ignore/add/remove/force # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = force # ignore/add/remove/force +sp_after_byref = force # ignore/add/remove/force # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = force # ignore/add/remove/force +sp_after_byref_func = force # ignore/add/remove/force # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = remove # ignore/add/remove/force +sp_before_byref_func = remove # ignore/add/remove/force # Add or remove space between type and word. Default=Force -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # ignore/add/remove/force # Add or remove space before the paren in the D constructs 'template Foo(' and 'class Foo('. -sp_before_template_paren = ignore # ignore/add/remove/force +sp_before_template_paren = ignore # ignore/add/remove/force # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. -sp_template_angle = remove # ignore/add/remove/force +sp_template_angle = remove # ignore/add/remove/force # Add or remove space before '<>' -sp_before_angle = remove # ignore/add/remove/force +sp_before_angle = remove # ignore/add/remove/force # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # ignore/add/remove/force # Add or remove space after '<>' -sp_after_angle = ignore # ignore/add/remove/force +sp_after_angle = ignore # ignore/add/remove/force # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = remove # ignore/add/remove/force -sp_angle_paren_empty = remove +sp_angle_paren = remove # ignore/add/remove/force +sp_angle_paren_empty = remove # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = force # ignore/add/remove/force +sp_angle_word = force # ignore/add/remove/force # Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add -sp_angle_shift = force # ignore/add/remove/force +sp_angle_shift = force # ignore/add/remove/force # Permit removal of the space between '>>' in 'foo >' (C++11 only). Default=False # sp_angle_shift cannot remove the space without this option. -sp_permit_cpp11_shift = false # false/true +sp_permit_cpp11_shift = false # false/true # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # ignore/add/remove/force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # ignore/add/remove/force # Add or remove space before if-condition ')'. Overrides sp_inside_sparen. -sp_inside_sparen_close = remove # ignore/add/remove/force +sp_inside_sparen_close = remove # ignore/add/remove/force # Add or remove space after if-condition '('. Overrides sp_inside_sparen. -sp_inside_sparen_open = ignore # ignore/add/remove/force +sp_inside_sparen_open = ignore # ignore/add/remove/force # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # ignore/add/remove/force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = force # ignore/add/remove/force +sp_sparen_brace = force # ignore/add/remove/force # Add or remove space between 'invariant' and '(' in the D language. -sp_invariant_paren = ignore # ignore/add/remove/force +sp_invariant_paren = ignore # ignore/add/remove/force # Add or remove space after the ')' in 'invariant (C) c' in the D language. -sp_after_invariant_paren = ignore # ignore/add/remove/force +sp_after_invariant_paren = ignore # ignore/add/remove/force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = force # ignore/add/remove/force +sp_special_semi = force # ignore/add/remove/force # Add or remove space before ';'. Default=Remove -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # ignore/add/remove/force # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = remove # ignore/add/remove/force +sp_before_semi_for = remove # ignore/add/remove/force # Add or remove space before a semicolon of an empty part of a for statement. -sp_before_semi_for_empty = force # ignore/add/remove/force +sp_before_semi_for_empty = force # ignore/add/remove/force # Add or remove space after ';', except when followed by a comment. Default=Add -sp_after_semi = force # ignore/add/remove/force +sp_after_semi = force # ignore/add/remove/force # Add or remove space after ';' in non-empty 'for' statements. Default=Force -sp_after_semi_for = force # ignore/add/remove/force +sp_after_semi_for = force # ignore/add/remove/force # Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; ). -sp_after_semi_for_empty = force # ignore/add/remove/force +sp_after_semi_for_empty = force # ignore/add/remove/force # Add or remove space before '[' (except '[]') -sp_before_square = remove # ignore/add/remove/force +sp_before_square = remove # ignore/add/remove/force # Add or remove space before '[]' -sp_before_squares = remove # ignore/add/remove/force +sp_before_squares = remove # ignore/add/remove/force # Add or remove space inside a non-empty '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # ignore/add/remove/force # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # ignore/add/remove/force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # ignore/add/remove/force # Add or remove space between an open paren and comma: '(,' vs '( ,' -sp_paren_comma = force # ignore/add/remove/force +sp_paren_comma = force # ignore/add/remove/force # Add or remove space before the variadic '...' when preceded by a non-punctuator -sp_before_ellipsis = remove # ignore/add/remove/force +sp_before_ellipsis = remove # ignore/add/remove/force # Add or remove space after class ':' -sp_after_class_colon = force # ignore/add/remove/force +sp_after_class_colon = force # ignore/add/remove/force # Add or remove space before class ':' -sp_before_class_colon = force # ignore/add/remove/force +sp_before_class_colon = force # ignore/add/remove/force # Add or remove space after class constructor ':' -sp_after_constr_colon = ignore # ignore/add/remove/force +sp_after_constr_colon = ignore # ignore/add/remove/force # Add or remove space before class constructor ':' -sp_before_constr_colon = ignore # ignore/add/remove/force +sp_before_constr_colon = ignore # ignore/add/remove/force # Add or remove space before case ':'. Default=Remove -sp_before_case_colon = remove # ignore/add/remove/force +sp_before_case_colon = remove # ignore/add/remove/force # Add or remove space between 'operator' and operator sign -sp_after_operator = remove # ignore/add/remove/force +sp_after_operator = remove # ignore/add/remove/force # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = remove # ignore/add/remove/force +sp_after_operator_sym = remove # ignore/add/remove/force # Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # ignore/add/remove/force # Add or remove spaces inside cast parens -sp_inside_paren_cast = remove # ignore/add/remove/force +sp_inside_paren_cast = remove # ignore/add/remove/force # Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = remove # ignore/add/remove/force +sp_cpp_cast_paren = remove # ignore/add/remove/force # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # ignore/add/remove/force # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # ignore/add/remove/force # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = force # ignore/add/remove/force +sp_inside_braces_enum = force # ignore/add/remove/force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = ignore # ignore/add/remove/force +sp_inside_braces_struct = ignore # ignore/add/remove/force # Add or remove space inside '{' and '}' -sp_inside_braces = force # ignore/add/remove/force +sp_inside_braces = force # ignore/add/remove/force # Add or remove space inside '{}' -sp_inside_braces_empty = remove # ignore/add/remove/force +sp_inside_braces_empty = remove # ignore/add/remove/force # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = force # ignore/add/remove/force +sp_type_func = force # ignore/add/remove/force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # ignore/add/remove/force # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # ignore/add/remove/force # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # ignore/add/remove/force # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # ignore/add/remove/force # Add or remove space inside the first parens in the function type: 'void (*x)(...)' -sp_inside_tparen = remove # ignore/add/remove/force +sp_inside_tparen = remove # ignore/add/remove/force # Add or remove between the parens in the function type: 'void (*x)(...)' -sp_after_tparen_close = remove # ignore/add/remove/force +sp_after_tparen_close = remove # ignore/add/remove/force # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = remove # ignore/add/remove/force +sp_square_fparen = remove # ignore/add/remove/force # Add or remove space between ')' and '{' of function -sp_fparen_brace = force # ignore/add/remove/force +sp_fparen_brace = force # ignore/add/remove/force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # ignore/add/remove/force # Add or remove space between function name and '()' on function calls without parameters. # If set to 'ignore' (the default), sp_func_call_paren is used. -sp_func_call_paren_empty = remove # ignore/add/remove/force +sp_func_call_paren_empty = remove # ignore/add/remove/force # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = ignore # ignore/add/remove/force +sp_func_call_user_paren = ignore # ignore/add/remove/force # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # ignore/add/remove/force # Add or remove space between 'return' and '(' -sp_return_paren = remove # ignore/add/remove/force +sp_return_paren = remove # ignore/add/remove/force # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = remove # ignore/add/remove/force +sp_attribute_paren = remove # ignore/add/remove/force # Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = remove # ignore/add/remove/force +sp_defined_paren = remove # ignore/add/remove/force # Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = force # ignore/add/remove/force +sp_throw_paren = force # ignore/add/remove/force # Add or remove space between 'throw' and anything other than '(' as in '@throw [...];' -sp_after_throw = force # ignore/add/remove/force +sp_after_throw = force # ignore/add/remove/force # Add or remove space between 'catch' and '(' in 'catch (something) { }' # If set to ignore, sp_before_sparen is used. -sp_catch_paren = force # ignore/add/remove/force +sp_catch_paren = force # ignore/add/remove/force # Add or remove space between 'version' and '(' in 'version (something) { }' (D language) # If set to ignore, sp_before_sparen is used. -sp_version_paren = ignore # ignore/add/remove/force +sp_version_paren = ignore # ignore/add/remove/force # Add or remove space between 'scope' and '(' in 'scope (something) { }' (D language) # If set to ignore, sp_before_sparen is used. -sp_scope_paren = ignore # ignore/add/remove/force +sp_scope_paren = ignore # ignore/add/remove/force # Add or remove space between macro and value -sp_macro = force # ignore/add/remove/force +sp_macro = force # ignore/add/remove/force # Add or remove space between macro function ')' and value -sp_macro_func = force # ignore/add/remove/force +sp_macro_func = force # ignore/add/remove/force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = force # ignore/add/remove/force +sp_else_brace = force # ignore/add/remove/force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = force # ignore/add/remove/force +sp_brace_else = force # ignore/add/remove/force # Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = force # ignore/add/remove/force +sp_brace_typedef = force # ignore/add/remove/force # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = force # ignore/add/remove/force +sp_catch_brace = force # ignore/add/remove/force # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = force # ignore/add/remove/force +sp_brace_catch = force # ignore/add/remove/force # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = force # ignore/add/remove/force +sp_finally_brace = force # ignore/add/remove/force # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = force # ignore/add/remove/force +sp_brace_finally = force # ignore/add/remove/force # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = force # ignore/add/remove/force +sp_try_brace = force # ignore/add/remove/force # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = force # ignore/add/remove/force +sp_getset_brace = force # ignore/add/remove/force # Add or remove space between a variable and '{' for C++ uniform initialization -sp_word_brace = force # ignore/add/remove/force +sp_word_brace = force # ignore/add/remove/force # Add or remove space between a variable and '{' for a namespace -sp_word_brace_ns = force # ignore/add/remove/force +sp_word_brace_ns = force # ignore/add/remove/force # Add or remove space before the '::' operator -sp_before_dc = remove # ignore/add/remove/force +sp_before_dc = remove # ignore/add/remove/force # Add or remove space after the '::' operator -sp_after_dc = remove # ignore/add/remove/force +sp_after_dc = remove # ignore/add/remove/force # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # ignore/add/remove/force # Add or remove space after the '!' (not) operator. Default=Remove -sp_not = remove # ignore/add/remove/force +sp_not = remove # ignore/add/remove/force # Add or remove space after the '~' (invert) operator. Default=Remove -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # ignore/add/remove/force # Add or remove space after the '&' (address-of) operator. Default=Remove # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # ignore/add/remove/force # Add or remove space around the '.' or '->' operators. Default=Remove -sp_member = remove # ignore/add/remove/force +sp_member = remove # ignore/add/remove/force # Add or remove space after the '*' (dereference) operator. Default=Remove # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # ignore/add/remove/force # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # ignore/add/remove/force # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # ignore/add/remove/force # Add or remove space before a backslash-newline at the end of a line. Default=Add -sp_before_nl_cont = force # ignore/add/remove/force +sp_before_nl_cont = force # ignore/add/remove/force # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force +sp_after_oc_scope = ignore # ignore/add/remove/force # Add or remove space after the colon in message specs # '-(int) f:(int) x;' vs '-(int) f: (int) x;' -sp_after_oc_colon = ignore # ignore/add/remove/force +sp_after_oc_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in message specs # '-(int) f: (int) x;' vs '-(int) f : (int) x;' -sp_before_oc_colon = ignore # ignore/add/remove/force +sp_before_oc_colon = ignore # ignore/add/remove/force # Add or remove space after the colon in immutable dictionary expression # 'NSDictionary *test = @{@"foo" :@"bar"};' -sp_after_oc_dict_colon = ignore # ignore/add/remove/force +sp_after_oc_dict_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in immutable dictionary expression # 'NSDictionary *test = @{@"foo" :@"bar"};' -sp_before_oc_dict_colon = ignore # ignore/add/remove/force +sp_before_oc_dict_colon = ignore # ignore/add/remove/force # Add or remove space after the colon in message specs # '[object setValue:1];' vs '[object setValue: 1];' -sp_after_send_oc_colon = ignore # ignore/add/remove/force +sp_after_send_oc_colon = ignore # ignore/add/remove/force # Add or remove space before the colon in message specs # '[object setValue:1];' vs '[object setValue :1];' -sp_before_send_oc_colon = ignore # ignore/add/remove/force +sp_before_send_oc_colon = ignore # ignore/add/remove/force # Add or remove space after the (type) in message specs # '-(int)f: (int) x;' vs '-(int)f: (int)x;' -sp_after_oc_type = ignore # ignore/add/remove/force +sp_after_oc_type = ignore # ignore/add/remove/force # Add or remove space after the first (type) in message specs # '-(int) f:(int)x;' vs '-(int)f:(int)x;' -sp_after_oc_return_type = ignore # ignore/add/remove/force +sp_after_oc_return_type = ignore # ignore/add/remove/force # Add or remove space between '@selector' and '(' # '@selector(msgName)' vs '@selector (msgName)' # Also applies to @protocol() constructs -sp_after_oc_at_sel = ignore # ignore/add/remove/force +sp_after_oc_at_sel = ignore # ignore/add/remove/force # Add or remove space between '@selector(x)' and the following word # '@selector(foo) a:' vs '@selector(foo)a:' -sp_after_oc_at_sel_parens = ignore # ignore/add/remove/force +sp_after_oc_at_sel_parens = ignore # ignore/add/remove/force # Add or remove space inside '@selector' parens # '@selector(foo)' vs '@selector( foo )' # Also applies to @protocol() constructs -sp_inside_oc_at_sel_parens = ignore # ignore/add/remove/force +sp_inside_oc_at_sel_parens = ignore # ignore/add/remove/force # Add or remove space before a block pointer caret # '^int (int arg){...}' vs. ' ^int (int arg){...}' -sp_before_oc_block_caret = ignore # ignore/add/remove/force +sp_before_oc_block_caret = ignore # ignore/add/remove/force # Add or remove space after a block pointer caret # '^int (int arg){...}' vs. '^ int (int arg){...}' -sp_after_oc_block_caret = ignore # ignore/add/remove/force +sp_after_oc_block_caret = ignore # ignore/add/remove/force # Add or remove space between the receiver and selector in a message. # '[receiver selector ...]' -sp_after_oc_msg_receiver = ignore # ignore/add/remove/force +sp_after_oc_msg_receiver = ignore # ignore/add/remove/force # Add or remove space after @property. -sp_after_oc_property = ignore # ignore/add/remove/force +sp_after_oc_property = ignore # ignore/add/remove/force # Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = force # ignore/add/remove/force +sp_cond_colon = force # ignore/add/remove/force # Add or remove space before the ':' in 'b ? t : f'. Overrides sp_cond_colon. -sp_cond_colon_before = force # ignore/add/remove/force +sp_cond_colon_before = force # ignore/add/remove/force # Add or remove space after the ':' in 'b ? t : f'. Overrides sp_cond_colon. -sp_cond_colon_after = force # ignore/add/remove/force +sp_cond_colon_after = force # ignore/add/remove/force # Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = force # ignore/add/remove/force +sp_cond_question = force # ignore/add/remove/force # Add or remove space before the '?' in 'b ? t : f'. Overrides sp_cond_question. -sp_cond_question_before = force # ignore/add/remove/force +sp_cond_question_before = force # ignore/add/remove/force # Add or remove space after the '?' in 'b ? t : f'. Overrides sp_cond_question. -sp_cond_question_after = force # ignore/add/remove/force +sp_cond_question_after = force # ignore/add/remove/force # In the abbreviated ternary form (a ?: b), add/remove space between ? and :.'. Overrides all other sp_cond_* options. -sp_cond_ternary_short = force # ignore/add/remove/force +sp_cond_ternary_short = force # ignore/add/remove/force # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = force # ignore/add/remove/force +sp_case_label = force # ignore/add/remove/force # Control the space around the D '..' operator. -sp_range = ignore # ignore/add/remove/force +sp_range = ignore # ignore/add/remove/force # Control the spacing after ':' in 'for (TYPE VAR : EXPR)' (Java) -sp_after_for_colon = ignore # ignore/add/remove/force +sp_after_for_colon = ignore # ignore/add/remove/force # Control the spacing before ':' in 'for (TYPE VAR : EXPR)' (Java) -sp_before_for_colon = ignore # ignore/add/remove/force +sp_before_for_colon = ignore # ignore/add/remove/force # Control the spacing in 'extern (C)' (D) -sp_extern_paren = ignore # ignore/add/remove/force +sp_extern_paren = ignore # ignore/add/remove/force # Control the space after the opening of a C++ comment '// A' vs '//A' -sp_cmt_cpp_start = ignore # ignore/add/remove/force +sp_cmt_cpp_start = ignore # ignore/add/remove/force # Controls the spaces between #else or #endif and a trailing comment -sp_endif_cmt = force # ignore/add/remove/force +sp_endif_cmt = force # ignore/add/remove/force # Controls the spaces after 'new', 'delete', and 'delete[]' -sp_after_new = force # ignore/add/remove/force +sp_after_new = force # ignore/add/remove/force # Controls the spaces before a trailing or embedded comment -sp_before_tr_emb_cmt = force # ignore/add/remove/force +sp_before_tr_emb_cmt = force # ignore/add/remove/force # Number of spaces before a trailing or embedded comment -sp_num_before_tr_emb_cmt = 4 # number +sp_num_before_tr_emb_cmt = 4 # number # Control space between a Java annotation and the open paren. -sp_annotation_paren = ignore # ignore/add/remove/force +sp_annotation_paren = ignore # ignore/add/remove/force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # false/true # Whether to use tabs for aligning -align_with_tabs = false # false/true +align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # false/true # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # false/true # Whether to keep whitespace not required for alignment. -align_keep_extra_space = false # false/true +align_keep_extra_space = false # false/true # Align variable definitions in prototypes and functions -align_func_params = false # false/true +align_func_params = false # false/true # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = false # false/true +align_same_func_call_params = false # false/true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 0 # number +align_var_def_span = 0 # number # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 2 # number +align_var_def_star_style = 2 # number # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # number # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # number # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # number # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # false/true # Whether to align any attribute after the variable name -align_var_def_attribute = false # false/true +align_var_def_attribute = false # false/true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = false # false/true +align_var_def_inline = false # false/true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 0 # number +align_assign_span = 0 # number # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 # number # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 0 # number +align_enum_equ_span = 0 # number # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # number # The span for aligning struct/union (0=don't align) -align_var_struct_span = 0 # number +align_var_struct_span = 0 # number # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # number # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # number # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 0 # number +align_struct_init_span = 0 # number # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number +align_typedef_gap = 0 # number # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 0 # number +align_typedef_span = 0 # number # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # number # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typedef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 2 # number +align_typedef_star_style = 2 # number # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typedef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # number # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 4 # number +align_right_cmt_span = 4 # number # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # false/true # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. This has to be > 0 to do anything. -align_right_cmt_gap = 0 # number +align_right_cmt_gap = 0 # number # Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore) -align_right_cmt_at_col = 0 # number +align_right_cmt_at_col = 0 # number # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # number # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # number # Align function protos on the 'operator' keyword instead of what follows -align_on_operator = false # false/true +align_on_operator = false # false/true # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # false/true # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true +align_single_line_func = false # false/true # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # false/true # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # number # The span for aligning ObjC msg spec (0=don't align) -align_oc_msg_spec_span = 0 # number +align_oc_msg_spec_span = 0 # number # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = false # false/true +align_nl_cont = false # false/true # # Align macro functions and variables together -align_pp_define_together = true # false/true +align_pp_define_together = true # false/true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 4 # number +align_pp_define_gap = 4 # number # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 4 # number +align_pp_define_span = 4 # number # Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = true # false/true +align_left_shift = true # false/true # Span for aligning parameters in an Obj-C message call on the ':' (0=don't align) -align_oc_msg_colon_span = 0 # number +align_oc_msg_colon_span = 0 # number # If true, always align with the first parameter, even if it is too short. -align_oc_msg_colon_first = false # false/true +align_oc_msg_colon_first = false # false/true # Aligning parameters in an Obj-C '+' or '-' declaration on the ':' -align_oc_decl_colon = false # false/true +align_oc_decl_colon = false # false/true # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # false/true # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = false # false/true +nl_assign_leave_one_liners = false # false/true # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = true # false/true +nl_class_leave_one_liners = true # false/true # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = true # false/true +nl_enum_leave_one_liners = true # false/true # Don't split one-line get or set functions -nl_getset_leave_one_liners = true # false/true +nl_getset_leave_one_liners = true # false/true # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = true # false/true +nl_func_leave_one_liners = true # false/true # Don't split one-line C++11 lambdas - '[]() { return 0; }' -nl_cpp_lambda_leave_one_liners = true # false/true +nl_cpp_lambda_leave_one_liners = true # false/true # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # false/true # Don't split one-line OC messages -nl_oc_msg_leave_one_liner = false # false/true +nl_oc_msg_leave_one_liner = false # false/true # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # ignore/add/remove/force # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # number # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # ignore/add/remove/force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 2 # number +nl_end_of_file_min = 2 # number # Add or remove newline between '=' and '{' -nl_assign_brace = ignore # ignore/add/remove/force +nl_assign_brace = ignore # ignore/add/remove/force # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # ignore/add/remove/force # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # ignore/add/remove/force # The number of blank lines after a block of variable definitions at the top of a function body # 0 = No change (default) -nl_func_var_def_blk = 0 # number +nl_func_var_def_blk = 0 # number # The number of newlines before a block of typedefs # 0 = No change (default) -nl_typedef_blk_start = 0 # number +nl_typedef_blk_start = 0 # number # The number of newlines after a block of typedefs # 0 = No change (default) -nl_typedef_blk_end = 0 # number +nl_typedef_blk_end = 0 # number # The maximum consecutive newlines within a block of typedefs # 0 = No change (default) -nl_typedef_blk_in = 0 # number +nl_typedef_blk_in = 0 # number # The number of newlines before a block of variable definitions not at the top of a function body # 0 = No change (default) -nl_var_def_blk_start = 0 # number +nl_var_def_blk_start = 0 # number # The number of newlines after a block of variable definitions not at the top of a function body # 0 = No change (default) -nl_var_def_blk_end = 0 # number +nl_var_def_blk_end = 0 # number # The maximum consecutive newlines within a block of variable definitions # 0 = No change (default) -nl_var_def_blk_in = 0 # number +nl_var_def_blk_in = 0 # number # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = remove # ignore/add/remove/force +nl_fcall_brace = remove # ignore/add/remove/force # Add or remove newline between 'enum' and '{' -nl_enum_brace = remove # ignore/add/remove/force +nl_enum_brace = remove # ignore/add/remove/force # Add or remove newline between 'struct and '{' -nl_struct_brace = force # ignore/add/remove/force +nl_struct_brace = force # ignore/add/remove/force # Add or remove newline between 'union' and '{' -nl_union_brace = force # ignore/add/remove/force +nl_union_brace = force # ignore/add/remove/force # Add or remove newline between 'if' and '{' -nl_if_brace = remove # ignore/add/remove/force +nl_if_brace = remove # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = force # ignore/add/remove/force +nl_brace_else = force # ignore/add/remove/force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = ignore # ignore/add/remove/force +nl_elseif_brace = ignore # ignore/add/remove/force # Add or remove newline between 'else' and '{' -nl_else_brace = remove # ignore/add/remove/force +nl_else_brace = remove # ignore/add/remove/force # Add or remove newline between 'else' and 'if' -nl_else_if = remove # ignore/add/remove/force +nl_else_if = remove # ignore/add/remove/force # Add or remove newline between '}' and 'finally' -nl_brace_finally = force # ignore/add/remove/force +nl_brace_finally = force # ignore/add/remove/force # Add or remove newline between 'finally' and '{' -nl_finally_brace = remove # ignore/add/remove/force +nl_finally_brace = remove # ignore/add/remove/force # Add or remove newline between 'try' and '{' -nl_try_brace = remove # ignore/add/remove/force +nl_try_brace = remove # ignore/add/remove/force # Add or remove newline between get/set and '{' -nl_getset_brace = ignore # ignore/add/remove/force +nl_getset_brace = ignore # ignore/add/remove/force # Add or remove newline between 'for' and '{' -nl_for_brace = remove # ignore/add/remove/force +nl_for_brace = remove # ignore/add/remove/force # Add or remove newline between 'catch' and '{' -nl_catch_brace = remove # ignore/add/remove/force +nl_catch_brace = remove # ignore/add/remove/force # Add or remove newline between '}' and 'catch' -nl_brace_catch = force # ignore/add/remove/force +nl_brace_catch = force # ignore/add/remove/force # Add or remove newline between '}' and ']' -nl_brace_square = ignore # ignore/add/remove/force +nl_brace_square = ignore # ignore/add/remove/force # Add or remove newline between '}' and ')' in a function invocation -nl_brace_fparen = ignore # ignore/add/remove/force +nl_brace_fparen = ignore # ignore/add/remove/force # Add or remove newline between 'while' and '{' -nl_while_brace = remove # ignore/add/remove/force +nl_while_brace = remove # ignore/add/remove/force # Add or remove newline between 'scope (x)' and '{' (D) -nl_scope_brace = ignore # ignore/add/remove/force +nl_scope_brace = ignore # ignore/add/remove/force # Add or remove newline between 'unittest' and '{' (D) -nl_unittest_brace = ignore # ignore/add/remove/force +nl_unittest_brace = ignore # ignore/add/remove/force # Add or remove newline between 'version (x)' and '{' (D) -nl_version_brace = ignore # ignore/add/remove/force +nl_version_brace = ignore # ignore/add/remove/force # Add or remove newline between 'using' and '{' -nl_using_brace = remove # ignore/add/remove/force +nl_using_brace = remove # ignore/add/remove/force # Add or remove newline between two open or close braces. # Due to general newline/brace handling, REMOVE may not work. -nl_brace_brace = force # ignore/add/remove/force +nl_brace_brace = force # ignore/add/remove/force # Add or remove newline between 'do' and '{' -nl_do_brace = remove # ignore/add/remove/force +nl_do_brace = remove # ignore/add/remove/force # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # ignore/add/remove/force # Add or remove newline between 'switch' and '{' -nl_switch_brace = remove # ignore/add/remove/force +nl_switch_brace = remove # ignore/add/remove/force # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = true # false/true +nl_multi_line_cond = true # false/true # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = false # false/true +nl_multi_line_define = false # false/true # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # false/true # Add or remove newline between ')' and 'throw' -nl_before_throw = force # ignore/add/remove/force +nl_before_throw = force # ignore/add/remove/force # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # false/true # Add or remove a newline between a case ':' and '{'. Overrides nl_after_case. -nl_case_colon_brace = remove # ignore/add/remove/force +nl_case_colon_brace = remove # ignore/add/remove/force # Newline between namespace and { -nl_namespace_brace = force # ignore/add/remove/force +nl_namespace_brace = force # ignore/add/remove/force # Add or remove newline between 'template<>' and whatever follows. -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # ignore/add/remove/force # Add or remove newline between 'class' and '{' -nl_class_brace = force # ignore/add/remove/force +nl_class_brace = force # ignore/add/remove/force # Add or remove newline after each ',' in the class base list -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # ignore/add/remove/force # Add or remove newline after each ',' in the constructor member initialization -nl_constr_init_args = ignore # ignore/add/remove/force +nl_constr_init_args = ignore # ignore/add/remove/force # Add or remove newline between return type and function name in a function definition -nl_func_type_name = remove # ignore/add/remove/force +nl_func_type_name = remove # ignore/add/remove/force # Add or remove newline between return type and function name inside a class {} # Uses nl_func_type_name or nl_func_proto_type_name if set to ignore. -nl_func_type_name_class = remove # ignore/add/remove/force +nl_func_type_name_class = remove # ignore/add/remove/force # Add or remove newline between function scope and name in a definition # Controls the newline after '::' in 'void A::f() { }' -nl_func_scope_name = remove # ignore/add/remove/force +nl_func_scope_name = remove # ignore/add/remove/force # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = remove # ignore/add/remove/force +nl_func_proto_type_name = remove # ignore/add/remove/force # Add or remove newline between a function name and the opening '(' -nl_func_paren = remove # ignore/add/remove/force +nl_func_paren = remove # ignore/add/remove/force # Add or remove newline between a function name and the opening '(' in the definition -nl_func_def_paren = remove # ignore/add/remove/force +nl_func_def_paren = remove # ignore/add/remove/force # Add or remove newline after '(' in a function declaration -nl_func_decl_start = remove # ignore/add/remove/force +nl_func_decl_start = remove # ignore/add/remove/force # Add or remove newline after '(' in a function definition -nl_func_def_start = remove # ignore/add/remove/force +nl_func_def_start = remove # ignore/add/remove/force # Overrides nl_func_decl_start when there is only one parameter. -nl_func_decl_start_single = ignore # ignore/add/remove/force +nl_func_decl_start_single = ignore # ignore/add/remove/force # Overrides nl_func_def_start when there is only one parameter. -nl_func_def_start_single = ignore # ignore/add/remove/force +nl_func_def_start_single = ignore # ignore/add/remove/force # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # ignore/add/remove/force # Add or remove newline after each ',' in a function definition -nl_func_def_args = ignore # ignore/add/remove/force +nl_func_def_args = ignore # ignore/add/remove/force # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = remove # ignore/add/remove/force +nl_func_decl_end = remove # ignore/add/remove/force # Add or remove newline before the ')' in a function definition -nl_func_def_end = remove # ignore/add/remove/force +nl_func_def_end = remove # ignore/add/remove/force # Overrides nl_func_decl_end when there is only one parameter. -nl_func_decl_end_single = ignore # ignore/add/remove/force +nl_func_decl_end_single = ignore # ignore/add/remove/force # Overrides nl_func_def_end when there is only one parameter. -nl_func_def_end_single = ignore # ignore/add/remove/force +nl_func_def_end_single = ignore # ignore/add/remove/force # Add or remove newline between '()' in a function declaration. -nl_func_decl_empty = remove # ignore/add/remove/force +nl_func_decl_empty = remove # ignore/add/remove/force # Add or remove newline between '()' in a function definition. -nl_func_def_empty = remove # ignore/add/remove/force +nl_func_def_empty = remove # ignore/add/remove/force # Whether to put each OC message parameter on a separate line # See nl_oc_msg_leave_one_liner -nl_oc_msg_args = false # false/true +nl_oc_msg_args = false # false/true # Add or remove newline between function signature and '{' -nl_fdef_brace = force # ignore/add/remove/force +nl_fdef_brace = force # ignore/add/remove/force # Add or remove newline between C++11 lambda signature and '{' -nl_cpp_ldef_brace = remove # ignore/add/remove/force +nl_cpp_ldef_brace = remove # ignore/add/remove/force # Add or remove a newline between the return keyword and return expression. -nl_return_expr = remove # ignore/add/remove/force +nl_return_expr = remove # ignore/add/remove/force # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # false/true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = true # false/true +nl_after_brace_open = true # false/true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true +nl_after_brace_open_cmt = false # false/true # Whether to put a newline after a virtual brace open with a non-empty body. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = true # false/true +nl_after_vbrace_open = true # false/true # Whether to put a newline after a virtual brace open with an empty body. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open_empty = true # false/true +nl_after_vbrace_open_empty = true # false/true # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. -nl_after_brace_close = false # false/true +nl_after_brace_close = false # false/true # Whether to put a newline after a virtual brace close. # Would add a newline before return in: 'if (foo) a++; return;' -nl_after_vbrace_close = true # false/true +nl_after_vbrace_close = true # false/true # Control the newline between the close brace and 'b' in: 'struct { int a; } b;' # Affects enums, unions, and structures. If set to ignore, uses nl_after_brace_close -nl_brace_struct_var = remove # ignore/add/remove/force +nl_brace_struct_var = remove # ignore/add/remove/force # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # false/true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true +nl_squeeze_ifdef = false # false/true # Add or remove blank line before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # ignore/add/remove/force # Add or remove blank line after 'if' statement -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # ignore/add/remove/force # Add or remove blank line before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # ignore/add/remove/force # Add or remove blank line after 'for' statement -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # ignore/add/remove/force # Add or remove blank line before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # ignore/add/remove/force # Add or remove blank line after 'while' statement -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # ignore/add/remove/force # Add or remove blank line before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # ignore/add/remove/force # Add or remove blank line after 'switch' statement -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # ignore/add/remove/force # Add or remove blank line before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # ignore/add/remove/force # Add or remove blank line after 'do/while' statement -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # ignore/add/remove/force # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # false/true # Whether to double-space before the close brace of a struct/union/enum # (lower priority than 'eat_blanks_before_close_brace') -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # false/true # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_class_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # ignore/add/remove/force # Add or remove a newline around a class constructor colon. # Related to pos_constr_colon, nl_constr_init_args, and pos_constr_comma. -nl_constr_colon = ignore # ignore/add/remove/force +nl_constr_colon = ignore # ignore/add/remove/force # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # false/true # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # false/true # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # false/true # # Positioning options # # The position of arithmetic operators in wrapped expressions -pos_arith = lead # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_arith = lead # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of assignment in wrapped expressions. # Do not affect '=' followed by '{' -pos_assign = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_assign = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of boolean operators in wrapped expressions -pos_bool = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_bool = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of comparison operators in wrapped expressions -pos_compare = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_compare = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of conditional (b ? t : f) operators in wrapped expressions -pos_conditional = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_conditional = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of the comma in wrapped expressions -pos_comma = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_comma = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of the comma in the class base list -pos_class_comma = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_comma = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of the comma in the constructor initialization list -pos_constr_comma = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_constr_comma = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of colons between class and base class list -pos_class_colon = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_colon = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of colons between constructor and member initialization -pos_constr_colon = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_constr_colon = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # number # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true +ls_for_split_full = false # false/true # Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true +ls_func_split_full = false # false/true # Whether to split lines as close to code_width as possible and ignore some groupings -ls_code_width = false # false/true +ls_code_width = false # false/true # # Blank line options # # The maximum consecutive newlines -nl_max = 2 # number +nl_max = 2 # number # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # number # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 1 # number +nl_after_func_proto_group = 1 # number # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # number # The number of newlines after '}' of a multi-line function body in a class declaration -nl_after_func_body_class = 0 # number +nl_after_func_body_class = 0 # number # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 0 # number +nl_after_func_body_one_liner = 0 # number # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 1 # number +nl_before_block_comment = 1 # number # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 1 # number +nl_before_c_comment = 1 # number # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 1 # number +nl_before_cpp_comment = 1 # number # Whether to force a newline after a multi-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # false/true # The number of newlines after '}' or ';' of a struct/enum/union definition -nl_after_struct = 0 # number +nl_after_struct = 0 # number # The number of newlines after '}' or ';' of a class definition -nl_after_class = 1 # number +nl_after_class = 1 # number # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 2 # number +nl_before_access_spec = 2 # number # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # number # The number of newlines between a function def and the function comment. # 0 = No change. -nl_comment_func_def = 0 # number +nl_comment_func_def = 0 # number # The number of newlines after a try-catch-finally block that isn't followed by a brace close. # 0 = No change. -nl_after_try_catch_finally = 1 # number +nl_after_try_catch_finally = 1 # number # The number of newlines before and after a property, indexer or event decl. # 0 = No change. -nl_around_cs_property = 0 # number +nl_around_cs_property = 0 # number # The number of newlines between the get/set/add/remove handlers in C#. # 0 = No change. -nl_between_get_set = 0 # number +nl_between_get_set = 0 # number # Add or remove newline between C# property and the '{' -nl_property_brace = ignore # ignore/add/remove/force +nl_property_brace = ignore # ignore/add/remove/force # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # false/true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # false/true # How aggressively to remove extra newlines not in preproc. # 0: No change # 1: Remove most newlines not handled by other config # 2: Remove all newlines and reformat completely by config -nl_remove_extra_newlines = 0 # number +nl_remove_extra_newlines = 0 # number # Whether to put a blank line before 'return' statements, unless after an open brace. -nl_before_return = false # false/true +nl_before_return = false # false/true # Whether to put a blank line after 'return' statements, unless followed by a close brace. -nl_after_return = false # false/true +nl_after_return = false # false/true # Whether to put a newline after a Java annotation statement. # Only affects annotations that are after a newline. -nl_after_annotation = ignore # ignore/add/remove/force +nl_after_annotation = ignore # ignore/add/remove/force # Controls the newline between two annotations. -nl_between_annotation = ignore # ignore/add/remove/force +nl_between_annotation = ignore # ignore/add/remove/force # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = ignore # ignore/add/remove/force +mod_full_brace_do = ignore # ignore/add/remove/force # Add or remove braces on single-line 'for' statement -mod_full_brace_for = ignore # ignore/add/remove/force +mod_full_brace_for = ignore # ignore/add/remove/force # Add or remove braces on single-line function definitions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # ignore/add/remove/force # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = ignore # ignore/add/remove/force +mod_full_brace_if = ignore # ignore/add/remove/force # Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if. # If any must be braced, they are all braced. If all can be unbraced, then the braces are removed. -mod_full_brace_if_chain = true # false/true +mod_full_brace_if_chain = true # false/true # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 2 # number +mod_full_brace_nl = 2 # number # Add or remove braces on single-line 'while' statement -mod_full_brace_while = ignore # ignore/add/remove/force +mod_full_brace_while = ignore # ignore/add/remove/force # Add or remove braces on single-line 'using ()' statement -mod_full_brace_using = ignore # ignore/add/remove/force +mod_full_brace_using = ignore # ignore/add/remove/force # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = remove # ignore/add/remove/force +mod_paren_on_return = remove # ignore/add/remove/force # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # false/true # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = true # false/true +mod_full_paren_if_bool = true # false/true # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = false # false/true +mod_remove_extra_semicolon = false # false/true # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 0 # number +mod_add_long_function_closebrace_comment = 0 # number # If a namespace body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_namespace_closebrace_comment = 0 # number +mod_add_long_namespace_closebrace_comment = 0 # number # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number +mod_add_long_switch_closebrace_comment = 0 # number # If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after # the #endif, a comment will be added. -mod_add_long_ifdef_endif_comment = 1 # number +mod_add_long_ifdef_endif_comment = 1 # number # If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after # the #else, a comment will be added. -mod_add_long_ifdef_else_comment = 1 # number +mod_add_long_ifdef_else_comment = 1 # number # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # false/true # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # false/true # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # false/true # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = false # false/true +mod_move_case_break = false # false/true # Will add or remove the braces around a fully braced case statement. # Will only remove the braces if there are no variable declarations in the block. -mod_case_brace = ignore # ignore/add/remove/force +mod_case_brace = ignore # ignore/add/remove/force # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = true # false/true +mod_remove_empty_return = true # false/true # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # number # Set the comment reflow mode (default: 0) # 0: no reflowing (apart from the line wrapping due to cmt_width) # 1: no touching at all # 2: full reflow -cmt_reflow_mode = 0 # number +cmt_reflow_mode = 0 # number # If false, disable all multi-line comment changes, including cmt_width. keyword substitution, and leading chars. # Default is true. -cmt_indent_multi = true # false/true +cmt_indent_multi = true # false/true # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # false/true # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # false/true # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # false/true # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # false/true # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # false/true # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # false/true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # number # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # number # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true # false/true # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # string # The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_footer = "" # string +cmt_insert_file_footer = "" # string # The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment. # Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # string # The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment. # Will substitute $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # string # The filename that contains text to insert before a Obj-C message specification if the method isn't preceded with a C/C++ comment. # Will substitute $(message) with the function name and $(javaparam) with the javadoc @param and @return stuff. -cmt_insert_oc_msg_header = "" # string +cmt_insert_oc_msg_header = "" # string # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_oc_msg_header, cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true +cmt_insert_before_preproc = false # false/true # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # ignore/add/remove/force # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # false/true # If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. -pp_indent_count = 1 # number +pp_indent_count = 1 # number # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # ignore/add/remove/force # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # number # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # number # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # false/true # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # number # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true +pp_if_indent_code = false # false/true # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # false/true # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/sf583.cfg b/tests/config/sf583.cfg index 6a9f2d2510..0b71bc60ee 100644 --- a/tests/config/sf583.cfg +++ b/tests/config/sf583.cfg @@ -1 +1 @@ -mod_remove_extra_semicolon = true +mod_remove_extra_semicolon = true diff --git a/tests/config/sf593.cfg b/tests/config/sf593.cfg index 50a1b8e8c4..6a1b03171a 100644 --- a/tests/config/sf593.cfg +++ b/tests/config/sf593.cfg @@ -1,3 +1,3 @@ -indent_continue = 8 # number -code_width = 90 # number +indent_continue = 8 # number +code_width = 90 # number diff --git a/tests/config/sf607.cfg b/tests/config/sf607.cfg index 09fd86f545..c5a78686b3 100644 --- a/tests/config/sf607.cfg +++ b/tests/config/sf607.cfg @@ -1,2 +1,2 @@ -nl_getset_brace=force -nl_property_brace=force +nl_getset_brace = force +nl_property_brace = force diff --git a/tests/config/sf628.cfg b/tests/config/sf628.cfg index f653851c0b..0b71bc60ee 100644 --- a/tests/config/sf628.cfg +++ b/tests/config/sf628.cfg @@ -1 +1 @@ -mod_remove_extra_semicolon=true +mod_remove_extra_semicolon = true diff --git a/tests/config/sim.cfg b/tests/config/sim.cfg index 7896e39013..7a92b25046 100644 --- a/tests/config/sim.cfg +++ b/tests/config/sim.cfg @@ -5,19 +5,19 @@ # # The type of line endings -newlines = lf # auto/lf/crlf/cr +newlines = lf # auto/lf/crlf/cr # The original size of tabs in the input -input_tab_size = 2 # number +input_tab_size = 2 # number # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 2 # number +output_tab_size = 2 # number # The ascii value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # number # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # number # # Indenting @@ -25,647 +25,647 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 2 # number +indent_columns = 2 # number # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # number # Whether to indent strings broken by '\' so that they line up -indent_align_string = false # false/true +indent_align_string = false # false/true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # number # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # number # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # false/true # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # false/true # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # false/true # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # false/true # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # false/true # Whether to indent the stuff after a leading class colon -indent_class_colon = true # false/true +indent_class_colon = true # false/true # Whether to indent continued function call parameters one indent level (true) or aligns instead of indent (false) -indent_func_call_param = true # false/true +indent_func_call_param = true # false/true # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 0 # number +indent_member = 0 # number # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # number # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 2 # number +indent_switch_case = 2 # number # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # number # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 0 # number +indent_case_brace = 0 # number # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # false/true # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = -2 # number +indent_label = -2 # number # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # number # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # false/true # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # false/true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # ignore/add/remove/force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # ignore/add/remove/force # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # ignore/add/remove/force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # ignore/add/remove/force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # ignore/add/remove/force # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # ignore/add/remove/force # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # false/true # Add or remove space between ')' and '{' -sp_paren_brace = force # ignore/add/remove/force +sp_paren_brace = force # ignore/add/remove/force # Add or remove space before pointer star '*' -sp_before_ptr_star = remove # ignore/add/remove/force +sp_before_ptr_star = remove # ignore/add/remove/force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # ignore/add/remove/force # Add or remove space after pointer star '*' -sp_after_ptr_star = force # ignore/add/remove/force +sp_after_ptr_star = force # ignore/add/remove/force # Add or remove space before reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # ignore/add/remove/force # Add or remove space after reference sign '&' -sp_after_byref = force # ignore/add/remove/force +sp_after_byref = force # ignore/add/remove/force # Add or remove space before '<>' -sp_before_angle = remove # ignore/add/remove/force +sp_before_angle = remove # ignore/add/remove/force # Add or remove space after '<>' -sp_after_angle = remove # ignore/add/remove/force +sp_after_angle = remove # ignore/add/remove/force # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = ignore # ignore/add/remove/force +sp_angle_paren = ignore # ignore/add/remove/force # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = ignore # ignore/add/remove/force +sp_angle_word = ignore # ignore/add/remove/force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # ignore/add/remove/force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # ignore/add/remove/force # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # ignore/add/remove/force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = force # ignore/add/remove/force +sp_sparen_brace = force # ignore/add/remove/force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = force # ignore/add/remove/force +sp_special_semi = force # ignore/add/remove/force # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # ignore/add/remove/force # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = ignore # ignore/add/remove/force +sp_before_semi_for = ignore # ignore/add/remove/force # Add or remove space before a semicolon of an empty part of a for statement. -sp_before_semi_for_empty = ignore # ignore/add/remove/force +sp_before_semi_for_empty = ignore # ignore/add/remove/force # Add or remove space before '[' (except '[]') -sp_before_square = remove # ignore/add/remove/force +sp_before_square = remove # ignore/add/remove/force # Add or remove space before '[]' -sp_before_squares = remove # ignore/add/remove/force +sp_before_squares = remove # ignore/add/remove/force # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # ignore/add/remove/force # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # ignore/add/remove/force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # ignore/add/remove/force # Add or remove space between 'operator' and operator sign -sp_after_operator = remove # ignore/add/remove/force +sp_after_operator = remove # ignore/add/remove/force # Add or remove space after cast -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # ignore/add/remove/force # Add or remove spaces inside cast parens -sp_inside_paren_cast = ignore # ignore/add/remove/force +sp_inside_paren_cast = ignore # ignore/add/remove/force # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # ignore/add/remove/force # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # ignore/add/remove/force # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = remove # ignore/add/remove/force +sp_inside_braces_enum = remove # ignore/add/remove/force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = remove # ignore/add/remove/force +sp_inside_braces_struct = remove # ignore/add/remove/force # Add or remove space inside '{' and '}' -sp_inside_braces = remove # ignore/add/remove/force +sp_inside_braces = remove # ignore/add/remove/force # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # ignore/add/remove/force # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = ignore # ignore/add/remove/force +sp_type_func = ignore # ignore/add/remove/force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # ignore/add/remove/force # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # ignore/add/remove/force # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # ignore/add/remove/force # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # ignore/add/remove/force # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # ignore/add/remove/force # Add or remove space between ')' and '{' of function -sp_fparen_brace = force # ignore/add/remove/force +sp_fparen_brace = force # ignore/add/remove/force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # ignore/add/remove/force # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # ignore/add/remove/force # Add or remove space between 'return' and '(' -sp_return_paren = force # ignore/add/remove/force +sp_return_paren = force # ignore/add/remove/force # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # ignore/add/remove/force # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # ignore/add/remove/force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = force # ignore/add/remove/force +sp_else_brace = force # ignore/add/remove/force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = force # ignore/add/remove/force +sp_brace_else = force # ignore/add/remove/force # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # ignore/add/remove/force # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # ignore/add/remove/force # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # ignore/add/remove/force # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # ignore/add/remove/force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # false/true # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # false/true # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # false/true # Align variable definitions in prototypes and functions -align_func_params = false # false/true +align_func_params = false # false/true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 0 # number +align_var_def_span = 0 # number # How to align the star in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_star_style = 2 # number +align_var_def_star_style = 2 # number # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # number # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # false/true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = false # false/true +align_var_def_inline = false # false/true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 0 # number +align_assign_span = 0 # number # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 # number # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 0 # number +align_enum_equ_span = 0 # number # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # number # The span for aligning struct/union (0=don't align) -align_var_struct_span = 0 # number +align_var_struct_span = 0 # number # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 0 # number +align_struct_init_span = 0 # number # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number +align_typedef_gap = 0 # number # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 0 # number +align_typedef_span = 0 # number # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # number # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 0 # number +align_right_cmt_span = 0 # number # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # number # Whether to align macros wrapped with a backslash and a newline -align_nl_cont = true # false/true +align_nl_cont = true # false/true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 1 # number +align_pp_define_gap = 1 # number # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 0 # number +align_pp_define_span = 0 # number # # Newline adding and removing options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # number # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = true # false/true +nl_collapse_empty_body = true # false/true # Don't touch one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = false # false/true +nl_assign_leave_one_liners = false # false/true # Don't touch one-line function bodies inside a class xx { } body -nl_class_leave_one_liners = false # false/true +nl_class_leave_one_liners = false # false/true # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # ignore/add/remove/force # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # number # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # ignore/add/remove/force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # number # Add or remove newline between '=' and '{' -nl_assign_brace = remove # ignore/add/remove/force +nl_assign_brace = remove # ignore/add/remove/force # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 0 # number +nl_func_var_def_blk = 0 # number # Add or remove newline between function call and '(' -nl_fcall_brace = remove # ignore/add/remove/force +nl_fcall_brace = remove # ignore/add/remove/force # Add or remove newline between 'enum' and '{' -nl_enum_brace = remove # ignore/add/remove/force +nl_enum_brace = remove # ignore/add/remove/force # Add or remove newline between 'struct and '{' -nl_struct_brace = remove # ignore/add/remove/force +nl_struct_brace = remove # ignore/add/remove/force # Add or remove newline between 'union' and '{' -nl_union_brace = remove # ignore/add/remove/force +nl_union_brace = remove # ignore/add/remove/force # Add or remove newline between 'if' and '{' -nl_if_brace = remove # ignore/add/remove/force +nl_if_brace = remove # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = remove # ignore/add/remove/force +nl_brace_else = remove # ignore/add/remove/force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = remove # ignore/add/remove/force +nl_elseif_brace = remove # ignore/add/remove/force # Add or remove newline between 'else' and '{' -nl_else_brace = remove # ignore/add/remove/force +nl_else_brace = remove # ignore/add/remove/force # Add or remove newline between '}' and 'finally' -nl_brace_finally = ignore # ignore/add/remove/force +nl_brace_finally = ignore # ignore/add/remove/force # Add or remove newline between 'finally' and '{' -nl_finally_brace = ignore # ignore/add/remove/force +nl_finally_brace = ignore # ignore/add/remove/force # Add or remove newline between 'try' and '{' -nl_try_brace = ignore # ignore/add/remove/force +nl_try_brace = ignore # ignore/add/remove/force # Add or remove newline between get/set and '{' -nl_getset_brace = ignore # ignore/add/remove/force +nl_getset_brace = ignore # ignore/add/remove/force # Add or remove newline between 'for' and '{' -nl_for_brace = remove # ignore/add/remove/force +nl_for_brace = remove # ignore/add/remove/force # Add or remove newline between 'catch' and '{' -nl_catch_brace = ignore # ignore/add/remove/force +nl_catch_brace = ignore # ignore/add/remove/force # Add or remove newline between '}' and 'catch' -nl_brace_catch = ignore # ignore/add/remove/force +nl_brace_catch = ignore # ignore/add/remove/force # Add or remove newline between 'while' and '{' -nl_while_brace = remove # ignore/add/remove/force +nl_while_brace = remove # ignore/add/remove/force # Add or remove newline between 'do' and '{' -nl_do_brace = remove # ignore/add/remove/force +nl_do_brace = remove # ignore/add/remove/force # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # ignore/add/remove/force # Add or remove newline between 'switch' and '{' -nl_switch_brace = remove # ignore/add/remove/force +nl_switch_brace = remove # ignore/add/remove/force # Add or remove newline when condition spans two or more lines -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # false/true # Whether to put a newline before 'case' statement -nl_before_case = false # false/true +nl_before_case = false # false/true # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # false/true # Newline between namespace and { -nl_namespace_brace = remove # ignore/add/remove/force +nl_namespace_brace = remove # ignore/add/remove/force # Add or remove newline between 'template<>' and 'class' -nl_template_class = force # ignore/add/remove/force +nl_template_class = force # ignore/add/remove/force # Add or remove newline between 'class' and '{' -nl_class_brace = force # ignore/add/remove/force +nl_class_brace = force # ignore/add/remove/force # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = force # ignore/add/remove/force +nl_class_init_args = force # ignore/add/remove/force # Add or remove newline between return type and function name in definition -nl_func_type_name = remove # ignore/add/remove/force +nl_func_type_name = remove # ignore/add/remove/force # Add or remove newline after '(' in a function declaration -nl_func_decl_start = remove # ignore/add/remove/force +nl_func_decl_start = remove # ignore/add/remove/force # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = remove # ignore/add/remove/force +nl_func_decl_args = remove # ignore/add/remove/force # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = remove # ignore/add/remove/force +nl_func_decl_end = remove # ignore/add/remove/force # Add or remove newline between function signature and '{' -nl_fdef_brace = force # ignore/add/remove/force +nl_fdef_brace = force # ignore/add/remove/force # Whether to put a newline after 'return' statement -nl_after_return = false # false/true +nl_after_return = false # false/true # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = false # false/true +nl_after_semicolon = false # false/true # Whether to put a newline after brace open -nl_after_brace_open = true # false/true +nl_after_brace_open = true # false/true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # false/true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true +nl_squeeze_ifdef = false # false/true # Add or remove newline before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # ignore/add/remove/force # Add or remove newline after 'if' -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # ignore/add/remove/force # Add or remove newline before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # ignore/add/remove/force # Add or remove newline after 'for' -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # ignore/add/remove/force # Add or remove newline before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # ignore/add/remove/force # Add or remove newline after 'while' -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # ignore/add/remove/force # Add or remove newline before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # ignore/add/remove/force # Add or remove newline after 'switch' -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # ignore/add/remove/force # Add or remove newline before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # ignore/add/remove/force # Add or remove newline after 'do' -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # ignore/add/remove/force # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # false/true # Add or remove a newline around a class colon. Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = force # ignore/add/remove/force +nl_class_colon = force # ignore/add/remove/force # # Positioning options # # The position of boolean operators in wrapped expressions -pos_bool = ignore # ignore/lead/trail +pos_bool = ignore # ignore/lead/trail # The position of the comma in wrapped expressions -pos_comma = trail # ignore/lead/trail -pos_class_comma = trail +pos_comma = trail # ignore/lead/trail +pos_class_comma = trail # The position of colons between constructor and member initialization -pos_class_colon = trail # ignore/lead/trail +pos_class_colon = trail # ignore/lead/trail # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true +ls_for_split_full = false # false/true # Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true +ls_func_split_full = false # false/true # # Blank line options # # The maximum consecutive newlines -nl_max = 3 # number +nl_max = 3 # number # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 1 # number +nl_after_func_proto = 1 # number # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # number # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # number # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 0 # number +nl_after_func_body_one_liner = 0 # number # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # number # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # number # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # number # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # false/true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = false # false/true +eat_blanks_before_close_brace = false # false/true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = ignore # ignore/add/remove/force +mod_full_brace_do = ignore # ignore/add/remove/force # Add or remove braces on single-line 'for' statement -mod_full_brace_for = ignore # ignore/add/remove/force +mod_full_brace_for = ignore # ignore/add/remove/force # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # ignore/add/remove/force # Add or remove braces on single-line 'if' statement -mod_full_brace_if = ignore # ignore/add/remove/force +mod_full_brace_if = ignore # ignore/add/remove/force # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # number # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # ignore/add/remove/force # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = remove # ignore/add/remove/force +mod_paren_on_return = remove # ignore/add/remove/force # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = true # false/true +mod_pawn_semicolon = true # false/true # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = false # false/true +mod_full_paren_if_bool = false # false/true # # Comment modifications # # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # false/true # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # false/true # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # false/true # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # false/true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # number # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # number # # Preprocessor options # # Add or remove indent of preprocessor directives -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # ignore/add/remove/force # Add or remove space between # and, say, define -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # ignore/add/remove/force # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/sort_imports.cfg b/tests/config/sort_imports.cfg index 3bbd3dd851..2f96d7afd7 100644 --- a/tests/config/sort_imports.cfg +++ b/tests/config/sort_imports.cfg @@ -1,5 +1,5 @@ -mod_sort_import = true -mod_sort_include = true -mod_sort_using = true +mod_sort_import = true +mod_sort_include = true +mod_sort_using = true diff --git a/tests/config/sort_using_categ.cfg b/tests/config/sort_using_categ.cfg index bdbb8c0cad..74608f23ca 100644 --- a/tests/config/sort_using_categ.cfg +++ b/tests/config/sort_using_categ.cfg @@ -1,5 +1,5 @@ -mod_sort_using = true +mod_sort_using = true -include_category_0 = System -include_category_1 = .* +include_category_0 = System +include_category_1 = .* diff --git a/tests/config/sp-for-semi.cfg b/tests/config/sp-for-semi.cfg index 9855599178..dc06be0fc1 100644 --- a/tests/config/sp-for-semi.cfg +++ b/tests/config/sp-for-semi.cfg @@ -1,8 +1,8 @@ -sp_before_semi = remove -sp_before_semi_for = remove -sp_before_semi_for_empty = force -sp_after_semi_for_empty = ignore +sp_before_semi = remove +sp_before_semi_for = remove +sp_before_semi_for_empty = force +sp_after_semi_for_empty = ignore diff --git a/tests/config/sp_after_cast.cfg b/tests/config/sp_after_cast.cfg index efe36a74f4..b5b780ce15 100644 --- a/tests/config/sp_after_cast.cfg +++ b/tests/config/sp_after_cast.cfg @@ -1,195 +1,195 @@ -newlines = auto -input_tab_size = 8 -output_tab_size = 3 -string_escape_char = 92 -indent_columns = 3 -indent_with_tabs = 0 -indent_align_string = false -indent_xml_string = 0 -indent_brace = 0 -indent_braces = false -indent_braces_no_func = false -indent_brace_parent = false -indent_namespace = false -indent_class = true -indent_class_colon = false -indent_func_call_param = false -indent_member = 3 -indent_sing_line_comments = 0 -indent_switch_case = 0 -indent_case_brace = 0 -indent_col1_comment = false -indent_label = 2 -indent_access_spec = 2 -indent_paren_nl = false -indent_square_nl = false -sp_arith = force -sp_assign = force -sp_bool = force -sp_compare = force -sp_inside_paren = remove -sp_inside_paren_cast = remove -sp_paren_paren = remove -sp_balance_nested_parens = false -sp_paren_brace = ignore -sp_before_ptr_star = force -sp_between_ptr_star = remove -sp_after_ptr_star = remove -sp_before_byref = remove -sp_after_byref = ignore -sp_before_angle = remove -sp_after_angle = force -sp_angle_paren = remove -sp_angle_paren_empty = remove -sp_angle_word = force -sp_before_sparen = force -sp_inside_sparen = remove -sp_after_sparen = force -sp_sparen_brace = ignore -sp_special_semi = ignore -sp_before_semi = remove -sp_before_semi_for = ignore -sp_before_square = ignore -sp_before_squares = ignore -sp_inside_square = remove -sp_after_comma = force -sp_before_comma = remove -sp_after_operator = ignore -sp_after_cast = force -sp_sizeof_paren = remove -sp_after_tag = ignore -sp_inside_braces_enum = force -sp_inside_braces_struct = force -sp_inside_braces = force -sp_inside_angle = remove -sp_type_func = ignore -sp_func_proto_paren = remove -sp_func_def_paren = remove -sp_inside_fparens = ignore -sp_inside_fparen = remove -sp_square_fparen = ignore -sp_fparen_brace = ignore -sp_func_call_paren = remove -sp_func_class_paren = ignore -sp_return_paren = remove -sp_macro = ignore -sp_macro_func = ignore -sp_else_brace = ignore -sp_brace_else = ignore -sp_catch_brace = ignore -sp_brace_catch = ignore -sp_finally_brace = ignore -sp_brace_finally = ignore -sp_try_brace = ignore -sp_getset_brace = ignore -align_keep_tabs = false -align_with_tabs = false -align_on_tabstop = false -align_number_right = true -align_func_params = true -align_var_def_span = 2 -align_var_def_star_style = 1 -align_var_def_thresh = 0 -align_var_def_colon = true -align_var_def_inline = true -align_assign_span = 1 -align_assign_thresh = 0 -align_enum_equ_span = 4 -align_enum_equ_thresh = 0 -align_var_struct_span = 3 -align_struct_init_span = 3 -align_typedef_gap = 3 -align_typedef_span = 5 -align_typedef_star_style = 0 -align_right_cmt_span = 3 -align_func_proto_span = 0 -align_nl_cont = true -align_pp_define_gap = 4 -align_pp_define_span = 3 -code_width = 0 -nl_collapse_empty_body = false -nl_class_leave_one_liners = true -nl_start_of_file = ignore -nl_start_of_file_min = 0 -nl_end_of_file = ignore -nl_end_of_file_min = 0 -nl_assign_brace = add -nl_func_var_def_blk = 1 -nl_fcall_brace = add -nl_enum_brace = add -nl_struct_brace = add -nl_union_brace = add -nl_if_brace = add -nl_brace_else = add -nl_elseif_brace = ignore -nl_else_brace = add -nl_brace_finally = ignore -nl_finally_brace = add -nl_try_brace = add -nl_getset_brace = ignore -nl_for_brace = add -nl_catch_brace = add -nl_brace_catch = ignore -nl_while_brace = add -nl_do_brace = add -nl_brace_while = remove -nl_switch_brace = add -nl_before_case = true -nl_after_case = false -nl_namespace_brace = ignore -nl_template_class = ignore -nl_class_brace = ignore -nl_class_init_args = ignore -nl_func_type_name = ignore -nl_func_decl_start = ignore -nl_func_decl_args = ignore -nl_func_decl_end = ignore -nl_fdef_brace = add -nl_after_return = true -nl_after_semicolon = false -nl_after_brace_open = false -nl_define_macro = false -nl_squeeze_ifdef = true -nl_before_if = ignore -nl_after_if = ignore -nl_before_for = ignore -nl_after_for = ignore -nl_before_while = ignore -nl_after_while = ignore -nl_before_switch = ignore -nl_after_switch = ignore -nl_before_do = ignore -nl_after_do = ignore -nl_ds_struct_enum_cmt = false -pos_bool = ignore -pos_class_colon = ignore -ls_for_split_full = false -ls_func_split_full = false -nl_max = 0 -nl_after_func_proto = 0 -nl_after_func_proto_group = 0 -nl_after_func_body = 0 -nl_after_func_body_one_liner = 0 -nl_before_block_comment = 0 -nl_before_c_comment = 0 -nl_before_cpp_comment = 0 -eat_blanks_after_open_brace = true -eat_blanks_before_close_brace = true -mod_full_brace_do = add -mod_full_brace_for = add -mod_full_brace_function = ignore -mod_full_brace_if = add -mod_full_brace_nl = 0 -mod_full_brace_while = add -mod_paren_on_return = add -mod_pawn_semicolon = false -mod_full_paren_if_bool = false -cmt_cpp_group = false -cmt_cpp_nl_start = false -cmt_cpp_nl_end = false -cmt_cpp_to_c = false -cmt_star_cont = true -cmt_sp_before_star_cont = 0 -cmt_sp_after_star_cont = 0 -pp_indent = ignore -pp_space = ignore +newlines = auto +input_tab_size = 8 +output_tab_size = 3 +string_escape_char = 92 +indent_columns = 3 +indent_with_tabs = 0 +indent_align_string = false +indent_xml_string = 0 +indent_brace = 0 +indent_braces = false +indent_braces_no_func = false +indent_brace_parent = false +indent_namespace = false +indent_class = true +indent_class_colon = false +indent_func_call_param = false +indent_member = 3 +indent_sing_line_comments = 0 +indent_switch_case = 0 +indent_case_brace = 0 +indent_col1_comment = false +indent_label = 2 +indent_access_spec = 2 +indent_paren_nl = false +indent_square_nl = false +sp_arith = force +sp_assign = force +sp_bool = force +sp_compare = force +sp_inside_paren = remove +sp_inside_paren_cast = remove +sp_paren_paren = remove +sp_balance_nested_parens = false +sp_paren_brace = ignore +sp_before_ptr_star = force +sp_between_ptr_star = remove +sp_after_ptr_star = remove +sp_before_byref = remove +sp_after_byref = ignore +sp_before_angle = remove +sp_after_angle = force +sp_angle_paren = remove +sp_angle_paren_empty = remove +sp_angle_word = force +sp_before_sparen = force +sp_inside_sparen = remove +sp_after_sparen = force +sp_sparen_brace = ignore +sp_special_semi = ignore +sp_before_semi = remove +sp_before_semi_for = ignore +sp_before_square = ignore +sp_before_squares = ignore +sp_inside_square = remove +sp_after_comma = force +sp_before_comma = remove +sp_after_operator = ignore +sp_after_cast = force +sp_sizeof_paren = remove +sp_after_tag = ignore +sp_inside_braces_enum = force +sp_inside_braces_struct = force +sp_inside_braces = force +sp_inside_angle = remove +sp_type_func = ignore +sp_func_proto_paren = remove +sp_func_def_paren = remove +sp_inside_fparens = ignore +sp_inside_fparen = remove +sp_square_fparen = ignore +sp_fparen_brace = ignore +sp_func_call_paren = remove +sp_func_class_paren = ignore +sp_return_paren = remove +sp_macro = ignore +sp_macro_func = ignore +sp_else_brace = ignore +sp_brace_else = ignore +sp_catch_brace = ignore +sp_brace_catch = ignore +sp_finally_brace = ignore +sp_brace_finally = ignore +sp_try_brace = ignore +sp_getset_brace = ignore +align_keep_tabs = false +align_with_tabs = false +align_on_tabstop = false +align_number_right = true +align_func_params = true +align_var_def_span = 2 +align_var_def_star_style = 1 +align_var_def_thresh = 0 +align_var_def_colon = true +align_var_def_inline = true +align_assign_span = 1 +align_assign_thresh = 0 +align_enum_equ_span = 4 +align_enum_equ_thresh = 0 +align_var_struct_span = 3 +align_struct_init_span = 3 +align_typedef_gap = 3 +align_typedef_span = 5 +align_typedef_star_style = 0 +align_right_cmt_span = 3 +align_func_proto_span = 0 +align_nl_cont = true +align_pp_define_gap = 4 +align_pp_define_span = 3 +code_width = 0 +nl_collapse_empty_body = false +nl_class_leave_one_liners = true +nl_start_of_file = ignore +nl_start_of_file_min = 0 +nl_end_of_file = ignore +nl_end_of_file_min = 0 +nl_assign_brace = add +nl_func_var_def_blk = 1 +nl_fcall_brace = add +nl_enum_brace = add +nl_struct_brace = add +nl_union_brace = add +nl_if_brace = add +nl_brace_else = add +nl_elseif_brace = ignore +nl_else_brace = add +nl_brace_finally = ignore +nl_finally_brace = add +nl_try_brace = add +nl_getset_brace = ignore +nl_for_brace = add +nl_catch_brace = add +nl_brace_catch = ignore +nl_while_brace = add +nl_do_brace = add +nl_brace_while = remove +nl_switch_brace = add +nl_before_case = true +nl_after_case = false +nl_namespace_brace = ignore +nl_template_class = ignore +nl_class_brace = ignore +nl_class_init_args = ignore +nl_func_type_name = ignore +nl_func_decl_start = ignore +nl_func_decl_args = ignore +nl_func_decl_end = ignore +nl_fdef_brace = add +nl_after_return = true +nl_after_semicolon = false +nl_after_brace_open = false +nl_define_macro = false +nl_squeeze_ifdef = true +nl_before_if = ignore +nl_after_if = ignore +nl_before_for = ignore +nl_after_for = ignore +nl_before_while = ignore +nl_after_while = ignore +nl_before_switch = ignore +nl_after_switch = ignore +nl_before_do = ignore +nl_after_do = ignore +nl_ds_struct_enum_cmt = false +pos_bool = ignore +pos_class_colon = ignore +ls_for_split_full = false +ls_func_split_full = false +nl_max = 0 +nl_after_func_proto = 0 +nl_after_func_proto_group = 0 +nl_after_func_body = 0 +nl_after_func_body_one_liner = 0 +nl_before_block_comment = 0 +nl_before_c_comment = 0 +nl_before_cpp_comment = 0 +eat_blanks_after_open_brace = true +eat_blanks_before_close_brace = true +mod_full_brace_do = add +mod_full_brace_for = add +mod_full_brace_function = ignore +mod_full_brace_if = add +mod_full_brace_nl = 0 +mod_full_brace_while = add +mod_paren_on_return = add +mod_pawn_semicolon = false +mod_full_paren_if_bool = false +cmt_cpp_group = false +cmt_cpp_nl_start = false +cmt_cpp_nl_end = false +cmt_cpp_to_c = false +cmt_star_cont = true +cmt_sp_before_star_cont = 0 +cmt_sp_after_star_cont = 0 +pp_indent = ignore +pp_space = ignore diff --git a/tests/config/sp_after_oc_at_sel_add.cfg b/tests/config/sp_after_oc_at_sel_add.cfg index 0ad5b370d2..3ec8afe252 100644 --- a/tests/config/sp_after_oc_at_sel_add.cfg +++ b/tests/config/sp_after_oc_at_sel_add.cfg @@ -1,9 +1,9 @@ -include "obj-c.cfg" +include "obj-c.cfg" -output_tab_size = 4 # new tab size -indent_columns = output_tab_size +output_tab_size = 4 # new tab size +indent_columns = output_tab_size -sp_after_oc_at_sel = add -sp_after_oc_at_sel_parens = add -sp_inside_square = remove +sp_after_oc_at_sel = add +sp_after_oc_at_sel_parens = add +sp_inside_square = remove diff --git a/tests/config/sp_after_oc_at_sel_force.cfg b/tests/config/sp_after_oc_at_sel_force.cfg index cbc2f969dd..81ac3a06a2 100644 --- a/tests/config/sp_after_oc_at_sel_force.cfg +++ b/tests/config/sp_after_oc_at_sel_force.cfg @@ -1,8 +1,8 @@ -include "obj-c.cfg" +include "obj-c.cfg" -output_tab_size = 4 # new tab size -indent_columns = output_tab_size +output_tab_size = 4 # new tab size +indent_columns = output_tab_size -sp_after_oc_at_sel = force -sp_after_oc_at_sel_parens = force -sp_inside_square = remove +sp_after_oc_at_sel = force +sp_after_oc_at_sel_parens = force +sp_inside_square = remove diff --git a/tests/config/sp_after_oc_at_sel_remove.cfg b/tests/config/sp_after_oc_at_sel_remove.cfg index 046b138ad3..44c9078791 100644 --- a/tests/config/sp_after_oc_at_sel_remove.cfg +++ b/tests/config/sp_after_oc_at_sel_remove.cfg @@ -1,8 +1,8 @@ -include "obj-c.cfg" +include "obj-c.cfg" -output_tab_size = 4 # new tab size -indent_columns = output_tab_size +output_tab_size = 4 # new tab size +indent_columns = output_tab_size -sp_after_oc_at_sel = remove -sp_after_oc_at_sel_parens = remove -sp_inside_square = remove +sp_after_oc_at_sel = remove +sp_after_oc_at_sel_parens = remove +sp_inside_square = remove diff --git a/tests/config/sp_after_oc_block_caret_add.cfg b/tests/config/sp_after_oc_block_caret_add.cfg index 99885e6c31..7a133dc2bb 100644 --- a/tests/config/sp_after_oc_block_caret_add.cfg +++ b/tests/config/sp_after_oc_block_caret_add.cfg @@ -1,6 +1,6 @@ -include "obj-c.cfg" +include "obj-c.cfg" -output_tab_size = 4 # new tab size -indent_columns = output_tab_size +output_tab_size = 4 # new tab size +indent_columns = output_tab_size -sp_after_oc_block_caret = add +sp_after_oc_block_caret = add diff --git a/tests/config/sp_after_oc_block_caret_force.cfg b/tests/config/sp_after_oc_block_caret_force.cfg index ef0537250f..6fc1ccd906 100644 --- a/tests/config/sp_after_oc_block_caret_force.cfg +++ b/tests/config/sp_after_oc_block_caret_force.cfg @@ -1,7 +1,7 @@ -include "obj-c.cfg" +include "obj-c.cfg" -output_tab_size = 4 # new tab size -indent_columns = output_tab_size +output_tab_size = 4 # new tab size +indent_columns = output_tab_size -sp_after_oc_block_caret = force +sp_after_oc_block_caret = force diff --git a/tests/config/sp_after_oc_block_caret_remove.cfg b/tests/config/sp_after_oc_block_caret_remove.cfg index 50ed817fa3..3c7dba8941 100644 --- a/tests/config/sp_after_oc_block_caret_remove.cfg +++ b/tests/config/sp_after_oc_block_caret_remove.cfg @@ -1,6 +1,6 @@ -include "obj-c.cfg" +include "obj-c.cfg" -output_tab_size = 4 # new tab size -indent_columns = output_tab_size +output_tab_size = 4 # new tab size +indent_columns = output_tab_size -sp_after_oc_block_caret = remove +sp_after_oc_block_caret = remove diff --git a/tests/config/sp_after_oc_return_type_add.cfg b/tests/config/sp_after_oc_return_type_add.cfg index 2301fe78c3..8432d3c525 100644 --- a/tests/config/sp_after_oc_return_type_add.cfg +++ b/tests/config/sp_after_oc_return_type_add.cfg @@ -1,7 +1,7 @@ -include "obj-c.cfg" +include "obj-c.cfg" -output_tab_size = 4 # new tab size -indent_columns = output_tab_size +output_tab_size = 4 # new tab size +indent_columns = output_tab_size -sp_after_oc_return_type = add -nl_fdef_brace = force +sp_after_oc_return_type = add +nl_fdef_brace = force diff --git a/tests/config/sp_after_oc_return_type_force.cfg b/tests/config/sp_after_oc_return_type_force.cfg index deb79e0536..8a5834b71d 100644 --- a/tests/config/sp_after_oc_return_type_force.cfg +++ b/tests/config/sp_after_oc_return_type_force.cfg @@ -1,7 +1,7 @@ -include "obj-c.cfg" +include "obj-c.cfg" -output_tab_size = 4 # new tab size -indent_columns = output_tab_size +output_tab_size = 4 # new tab size +indent_columns = output_tab_size -sp_after_oc_return_type = force -nl_fdef_brace = force +sp_after_oc_return_type = force +nl_fdef_brace = force diff --git a/tests/config/sp_after_oc_return_type_remove.cfg b/tests/config/sp_after_oc_return_type_remove.cfg index 56767ea1f0..166ff5d50c 100644 --- a/tests/config/sp_after_oc_return_type_remove.cfg +++ b/tests/config/sp_after_oc_return_type_remove.cfg @@ -1,7 +1,7 @@ -include "obj-c.cfg" +include "obj-c.cfg" -output_tab_size = 4 # new tab size -indent_columns = output_tab_size +output_tab_size = 4 # new tab size +indent_columns = output_tab_size -sp_after_oc_return_type = remove -nl_fdef_brace = force +sp_after_oc_return_type = remove +nl_fdef_brace = force diff --git a/tests/config/sp_after_sparen.cfg b/tests/config/sp_after_sparen.cfg index 3a108bd745..838f663f0d 100644 --- a/tests/config/sp_after_sparen.cfg +++ b/tests/config/sp_after_sparen.cfg @@ -1,4 +1,4 @@ # test for bug # 637 -indent_with_tabs = 0 -sp_after_sparen = force -sp_before_semi = force +indent_with_tabs = 0 +sp_after_sparen = force +sp_before_semi = force diff --git a/tests/config/sp_after_throw_force.cfg b/tests/config/sp_after_throw_force.cfg index 806d30713c..3c9c55cec7 100644 --- a/tests/config/sp_after_throw_force.cfg +++ b/tests/config/sp_after_throw_force.cfg @@ -1,3 +1,3 @@ -include "obj-c.cfg" +include "obj-c.cfg" -sp_after_throw = force +sp_after_throw = force diff --git a/tests/config/sp_after_throw_remove.cfg b/tests/config/sp_after_throw_remove.cfg index af7f9c2fa1..0c3ee8103a 100644 --- a/tests/config/sp_after_throw_remove.cfg +++ b/tests/config/sp_after_throw_remove.cfg @@ -1,3 +1,3 @@ -include "obj-c.cfg" +include "obj-c.cfg" -sp_after_throw = remove +sp_after_throw = remove diff --git a/tests/config/sp_after_type_brace_init_lst_open-f.cfg b/tests/config/sp_after_type_brace_init_lst_open-f.cfg index e44b0ca8de..41c5a42535 100644 --- a/tests/config/sp_after_type_brace_init_lst_open-f.cfg +++ b/tests/config/sp_after_type_brace_init_lst_open-f.cfg @@ -1 +1 @@ -sp_after_type_brace_init_lst_open = force \ No newline at end of file +sp_after_type_brace_init_lst_open = force diff --git a/tests/config/sp_after_type_brace_init_lst_open-r.cfg b/tests/config/sp_after_type_brace_init_lst_open-r.cfg index 5f099e68a7..90af55fe72 100644 --- a/tests/config/sp_after_type_brace_init_lst_open-r.cfg +++ b/tests/config/sp_after_type_brace_init_lst_open-r.cfg @@ -1 +1 @@ -sp_after_type_brace_init_lst_open = remove \ No newline at end of file +sp_after_type_brace_init_lst_open = remove diff --git a/tests/config/sp_angle_paren.cfg b/tests/config/sp_angle_paren.cfg index 7a40e17441..6486a5bd03 100644 --- a/tests/config/sp_angle_paren.cfg +++ b/tests/config/sp_angle_paren.cfg @@ -1,2 +1,2 @@ -sp_angle_paren = force -sp_angle_paren_empty = force +sp_angle_paren = force +sp_angle_paren_empty = force diff --git a/tests/config/sp_angle_paren_empty.cfg b/tests/config/sp_angle_paren_empty.cfg index 64331104e1..a9ac271458 100644 --- a/tests/config/sp_angle_paren_empty.cfg +++ b/tests/config/sp_angle_paren_empty.cfg @@ -1,3 +1,3 @@ -include "sp_angle_paren.cfg" +include "sp_angle_paren.cfg" -sp_angle_paren_empty = remove +sp_angle_paren_empty = remove diff --git a/tests/config/sp_arith_additive-f.cfg b/tests/config/sp_arith_additive-f.cfg index 8e6f05854d..165d893759 100644 --- a/tests/config/sp_arith_additive-f.cfg +++ b/tests/config/sp_arith_additive-f.cfg @@ -1,3 +1,3 @@ # sp_arith_additive overwrites sp_arith sp_arith = remove -sp_arith_additive = force \ No newline at end of file +sp_arith_additive = force diff --git a/tests/config/sp_arith_additive-r.cfg b/tests/config/sp_arith_additive-r.cfg index e01e86f704..8d5a3e7338 100644 --- a/tests/config/sp_arith_additive-r.cfg +++ b/tests/config/sp_arith_additive-r.cfg @@ -1,3 +1,3 @@ # sp_arith_additive overwrites sp_arith sp_arith = force -sp_arith_additive = remove \ No newline at end of file +sp_arith_additive = remove diff --git a/tests/config/sp_balance_nested_parens.cfg b/tests/config/sp_balance_nested_parens.cfg index 0aac5b651f..6ad94fff46 100644 --- a/tests/config/sp_balance_nested_parens.cfg +++ b/tests/config/sp_balance_nested_parens.cfg @@ -1,2 +1,2 @@ -indent_with_tabs = 0 -sp_balance_nested_parens = true +indent_with_tabs = 0 +sp_balance_nested_parens = true diff --git a/tests/config/sp_before_after_oc_block_caret_remove.cfg b/tests/config/sp_before_after_oc_block_caret_remove.cfg index 07365193ce..c1e7984e75 100644 --- a/tests/config/sp_before_after_oc_block_caret_remove.cfg +++ b/tests/config/sp_before_after_oc_block_caret_remove.cfg @@ -1,7 +1,7 @@ -include "obj-c.cfg" +include "obj-c.cfg" -output_tab_size = 4 # new tab size -indent_columns = output_tab_size +output_tab_size = 4 # new tab size +indent_columns = output_tab_size -sp_before_oc_block_caret = remove -sp_after_oc_block_caret = remove +sp_before_oc_block_caret = remove +sp_after_oc_block_caret = remove diff --git a/tests/config/sp_before_byref-r.cfg b/tests/config/sp_before_byref-r.cfg index ec722cb03e..4625456fbc 100644 --- a/tests/config/sp_before_byref-r.cfg +++ b/tests/config/sp_before_byref-r.cfg @@ -1 +1 @@ -sp_before_byref = remove \ No newline at end of file +sp_before_byref = remove diff --git a/tests/config/sp_before_ellipsis-f.cfg b/tests/config/sp_before_ellipsis-f.cfg index 944b30ef10..9049b93668 100644 --- a/tests/config/sp_before_ellipsis-f.cfg +++ b/tests/config/sp_before_ellipsis-f.cfg @@ -1,7 +1,7 @@ -sp_before_ellipsis = force -sp_inside_paren = remove -sp_inside_fparen = remove -sp_inside_sparen = remove -sp_after_comma = force +sp_before_ellipsis = force +sp_inside_paren = remove +sp_inside_fparen = remove +sp_inside_sparen = remove +sp_after_comma = force diff --git a/tests/config/sp_before_ellipsis-r.cfg b/tests/config/sp_before_ellipsis-r.cfg index b916b131d2..48f24ba012 100644 --- a/tests/config/sp_before_ellipsis-r.cfg +++ b/tests/config/sp_before_ellipsis-r.cfg @@ -1,6 +1,6 @@ -sp_before_ellipsis = remove -sp_inside_paren = force -sp_inside_fparen = force -sp_inside_sparen = force -sp_after_comma = force -sp_paren_paren = force +sp_before_ellipsis = remove +sp_inside_paren = force +sp_inside_fparen = force +sp_inside_sparen = force +sp_after_comma = force +sp_paren_paren = force diff --git a/tests/config/sp_before_oc_block_caret_add.cfg b/tests/config/sp_before_oc_block_caret_add.cfg index f73b2101d4..ceb14610b8 100644 --- a/tests/config/sp_before_oc_block_caret_add.cfg +++ b/tests/config/sp_before_oc_block_caret_add.cfg @@ -1,7 +1,7 @@ -include "obj-c.cfg" +include "obj-c.cfg" -output_tab_size = 4 # new tab size -indent_columns = output_tab_size +output_tab_size = 4 # new tab size +indent_columns = output_tab_size -sp_before_oc_block_caret = add +sp_before_oc_block_caret = add diff --git a/tests/config/sp_before_oc_block_caret_force.cfg b/tests/config/sp_before_oc_block_caret_force.cfg index 5fc84a0c02..2d70d61f07 100644 --- a/tests/config/sp_before_oc_block_caret_force.cfg +++ b/tests/config/sp_before_oc_block_caret_force.cfg @@ -1,8 +1,8 @@ -include "obj-c.cfg" +include "obj-c.cfg" -output_tab_size = 4 # new tab size -indent_columns = output_tab_size +output_tab_size = 4 # new tab size +indent_columns = output_tab_size -sp_before_oc_block_caret = force +sp_before_oc_block_caret = force -indent_oc_block = false +indent_oc_block = false diff --git a/tests/config/sp_before_oc_block_caret_remove.cfg b/tests/config/sp_before_oc_block_caret_remove.cfg index 1c91951431..b5d7b7bd0f 100644 --- a/tests/config/sp_before_oc_block_caret_remove.cfg +++ b/tests/config/sp_before_oc_block_caret_remove.cfg @@ -1,7 +1,7 @@ -include "obj-c.cfg" +include "obj-c.cfg" -output_tab_size = 4 # new tab size -indent_columns = output_tab_size +output_tab_size = 4 # new tab size +indent_columns = output_tab_size -sp_before_oc_block_caret = remove +sp_before_oc_block_caret = remove diff --git a/tests/config/sp_before_ptr_star-r.cfg b/tests/config/sp_before_ptr_star-r.cfg index ac07af87b1..9d08d739cf 100644 --- a/tests/config/sp_before_ptr_star-r.cfg +++ b/tests/config/sp_before_ptr_star-r.cfg @@ -1,3 +1,3 @@ # https://github.com/uncrustify/uncrustify/issues/1112#issuecomment-295247085 # CT_STAR -> CT_PTR_TYPE in: CT_PRIVATE_COLON CT_DC_MEMBER CT_WORD CT_STAR -sp_before_ptr_star = remove \ No newline at end of file +sp_before_ptr_star = remove diff --git a/tests/config/sp_before_tr_emb_cmt-a.cfg b/tests/config/sp_before_tr_emb_cmt-a.cfg index 6c18eb6e73..852b613649 100644 --- a/tests/config/sp_before_tr_emb_cmt-a.cfg +++ b/tests/config/sp_before_tr_emb_cmt-a.cfg @@ -4,24 +4,24 @@ # # The type of line endings -newlines = auto # auto/lf/crlf/cr +newlines = auto # auto/lf/crlf/cr # The original size of tabs in the input -input_tab_size = 8 # number +input_tab_size = 8 # number # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 8 # number +output_tab_size = 8 # number # The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # number # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # number # Allow interpreting '>=' and '>>=' as part of a template in 'void f(list>=val);'. # If true (default), 'assert(x<0 && y>=3)' will be broken. # Improvements to template detection may make this option obsolete. -tok_split_gte = false # false/true +tok_split_gte = false # false/true # # Indenting @@ -29,1221 +29,1221 @@ tok_split_gte = false # false/true # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 2 # number +indent_columns = 2 # number # The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents. # For FreeBSD, this is set to 4. -indent_continue = 0 # number +indent_continue = 0 # number # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs to brace level, align with spaces # 2=indent and align with tabs, using spaces when not on a tabstop -indent_with_tabs = 0 # number +indent_with_tabs = 0 # number # Comments that are not a brace level are indented with tabs on a tabstop. # Requires indent_with_tabs=2. If false, will use spaces. -indent_cmt_with_tabs = false # false/true +indent_cmt_with_tabs = false # false/true # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # false/true # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # number # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # false/true # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # false/true # Disabled indenting class braces if indent_braces is true -indent_braces_no_class = false # false/true +indent_braces_no_class = false # false/true # Disabled indenting struct braces if indent_braces is true -indent_braces_no_struct = false # false/true +indent_braces_no_struct = false # false/true # Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # false/true # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # false/true # The number of spaces to indent a namespace block -indent_namespace_level = 0 # number +indent_namespace_level = 0 # number # If the body of the namespace is longer than this number, it won't be indented. # Requires indent_namespace=true. Default=0 (no limit) -indent_namespace_limit = 0 # number +indent_namespace_limit = 0 # number # Whether the 'extern "C"' body is indented -indent_extern = false # false/true +indent_extern = false # false/true # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # false/true # Whether to indent the stuff after a leading class colon -indent_class_colon = true # false/true +indent_class_colon = true # false/true # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level -indent_else_if = false # false/true +indent_else_if = false # false/true # Amount to indent variable declarations after a open brace. neg=relative, pos=absolute -indent_var_def_blk = 0 # number +indent_var_def_blk = 0 # number # Indent continued variable declarations instead of aligning. -indent_var_def_cont = true # false/true +indent_var_def_cont = true # false/true # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = true # false/true +indent_func_call_param = true # false/true # Same as indent_func_call_param, but for function defs -indent_func_def_param = true # false/true +indent_func_def_param = true # false/true # Same as indent_func_call_param, but for function protos -indent_func_proto_param = true # false/true +indent_func_proto_param = true # false/true # Same as indent_func_call_param, but for class declarations -indent_func_class_param = true # false/true +indent_func_class_param = true # false/true # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = true # false/true +indent_func_ctor_var_param = true # false/true # Same as indent_func_call_param, but for templates -indent_template_param = true # false/true +indent_template_param = true # false/true # Double the indent for indent_func_xxx_param options -indent_func_param_double = true # false/true +indent_func_param_double = true # false/true # Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 0 # number +indent_func_const = 0 # number # Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 0 # number +indent_func_throw = 0 # number # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 2 # number +indent_member = 2 # number # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # number # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = true # false/true +indent_relative_single_line_comments = true # false/true # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 2 # number +indent_switch_case = 2 # number # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # number # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 2 # number +indent_case_brace = 2 # number # Whether to indent comments found in first column -indent_col1_comment = true # false/true +indent_col1_comment = true # false/true # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 2 # number +indent_label = 2 # number # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 2 # number +indent_access_spec = 2 # number # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # false/true # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # false/true # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 0 # number +indent_paren_close = 0 # number # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # false/true # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # false/true # If 'indent_bool_paren' is true, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones -indent_first_bool_expr = false # false/true +indent_first_bool_expr = false # false/true # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # false/true # Align continued statements at the '='. Default=True # If FALSE or the '=' is followed by a newline, the next line is indent one tab. -indent_align_assign = false # false/true +indent_align_assign = false # false/true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = ignore # ignore/add/remove/force +sp_arith = ignore # ignore/add/remove/force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # ignore/add/remove/force # Add or remove space around assignment operator '=' in a prototype -sp_assign_default = remove # ignore/add/remove/force +sp_assign_default = remove # ignore/add/remove/force # Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. -sp_before_assign = ignore # ignore/add/remove/force +sp_before_assign = ignore # ignore/add/remove/force # Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. -sp_after_assign = ignore # ignore/add/remove/force +sp_after_assign = ignore # ignore/add/remove/force # Add or remove space around assignment '=' in enum -sp_enum_assign = force # ignore/add/remove/force +sp_enum_assign = force # ignore/add/remove/force # Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_before_assign = ignore # ignore/add/remove/force +sp_enum_before_assign = ignore # ignore/add/remove/force # Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_after_assign = ignore # ignore/add/remove/force +sp_enum_after_assign = ignore # ignore/add/remove/force # Add or remove space around preprocessor '##' concatenation operator. Default=Add -sp_pp_concat = add # ignore/add/remove/force +sp_pp_concat = add # ignore/add/remove/force # Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator. Default=Add -sp_pp_stringify = add # ignore/add/remove/force +sp_pp_stringify = add # ignore/add/remove/force # Add or remove space around boolean operators '&&' and '||' -sp_bool = add # ignore/add/remove/force +sp_bool = add # ignore/add/remove/force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = add # ignore/add/remove/force +sp_compare = add # ignore/add/remove/force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # ignore/add/remove/force # Add or remove space between nested parens -sp_paren_paren = ignore # ignore/add/remove/force +sp_paren_paren = ignore # ignore/add/remove/force # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # false/true # Add or remove space between ')' and '{' -sp_paren_brace = remove # ignore/add/remove/force +sp_paren_brace = remove # ignore/add/remove/force # Add or remove space before pointer star '*' -sp_before_ptr_star = remove # ignore/add/remove/force +sp_before_ptr_star = remove # ignore/add/remove/force # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force +sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # ignore/add/remove/force # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = add # ignore/add/remove/force +sp_after_ptr_star = add # ignore/add/remove/force # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = add # ignore/add/remove/force +sp_after_ptr_star_func = add # ignore/add/remove/force # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = remove # ignore/add/remove/force +sp_before_ptr_star_func = remove # ignore/add/remove/force # Add or remove space before a reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # ignore/add/remove/force # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force +sp_before_unnamed_byref = ignore # ignore/add/remove/force # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = add # ignore/add/remove/force +sp_after_byref = add # ignore/add/remove/force # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = add # ignore/add/remove/force +sp_after_byref_func = add # ignore/add/remove/force # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = remove # ignore/add/remove/force +sp_before_byref_func = remove # ignore/add/remove/force # Add or remove space between type and word. Default=Force -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # ignore/add/remove/force # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. -sp_template_angle = force # ignore/add/remove/force +sp_template_angle = force # ignore/add/remove/force # Add or remove space before '<>' -sp_before_angle = ignore # ignore/add/remove/force +sp_before_angle = ignore # ignore/add/remove/force # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # ignore/add/remove/force # Add or remove space after '<>' -sp_after_angle = ignore # ignore/add/remove/force +sp_after_angle = ignore # ignore/add/remove/force # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = ignore # ignore/add/remove/force +sp_angle_paren = ignore # ignore/add/remove/force # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = force # ignore/add/remove/force +sp_angle_word = force # ignore/add/remove/force # Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add -sp_angle_shift = add # ignore/add/remove/force +sp_angle_shift = add # ignore/add/remove/force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = add # ignore/add/remove/force +sp_before_sparen = add # ignore/add/remove/force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # ignore/add/remove/force # Add or remove space before if-condition ')'. Overrides sp_inside_sparen. -sp_inside_sparen_close = ignore # ignore/add/remove/force +sp_inside_sparen_close = ignore # ignore/add/remove/force # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # ignore/add/remove/force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = force # ignore/add/remove/force +sp_sparen_brace = force # ignore/add/remove/force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # ignore/add/remove/force # Add or remove space before ';'. Default=Remove -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # ignore/add/remove/force # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = ignore # ignore/add/remove/force +sp_before_semi_for = ignore # ignore/add/remove/force # Add or remove space before a semicolon of an empty part of a for statement. -sp_before_semi_for_empty = add # ignore/add/remove/force +sp_before_semi_for_empty = add # ignore/add/remove/force # Add or remove space after ';', except when followed by a comment. Default=Add -sp_after_semi = ignore # ignore/add/remove/force +sp_after_semi = ignore # ignore/add/remove/force # Add or remove space after ';' in non-empty 'for' statements. Default=Force -sp_after_semi_for = force # ignore/add/remove/force +sp_after_semi_for = force # ignore/add/remove/force # Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; ). -sp_after_semi_for_empty = ignore # ignore/add/remove/force +sp_after_semi_for_empty = ignore # ignore/add/remove/force # Add space before trailing comment, e.g., do_something(); // trailing comment -sp_before_tr_emb_cmt = add +sp_before_tr_emb_cmt = add # Number of spaces before trailing comment, e.g., do_something(); // trailing comment -sp_num_before_tr_emb_cmt = 2 +sp_num_before_tr_emb_cmt = 2 # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # ignore/add/remove/force # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # ignore/add/remove/force # Add or remove space inside '[' and ']' -sp_inside_square = ignore # ignore/add/remove/force +sp_inside_square = ignore # ignore/add/remove/force # Add or remove space after ',' -sp_after_comma = add # ignore/add/remove/force +sp_after_comma = add # ignore/add/remove/force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # ignore/add/remove/force # Add or remove space between an open paren and comma: '(,' vs '( ,' -sp_paren_comma = force # ignore/add/remove/force +sp_paren_comma = force # ignore/add/remove/force # Add or remove space before the variadic '...' when preceded by a non-punctuator -sp_before_ellipsis = ignore # ignore/add/remove/force +sp_before_ellipsis = ignore # ignore/add/remove/force # Add or remove space after class ':' -sp_after_class_colon = add # ignore/add/remove/force +sp_after_class_colon = add # ignore/add/remove/force # Add or remove space before class ':' -sp_before_class_colon = add # ignore/add/remove/force +sp_before_class_colon = add # ignore/add/remove/force # Add or remove space before case ':'. Default=Remove -sp_before_case_colon = remove # ignore/add/remove/force +sp_before_case_colon = remove # ignore/add/remove/force # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # ignore/add/remove/force # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = remove # ignore/add/remove/force +sp_after_operator_sym = remove # ignore/add/remove/force # Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = ignore # ignore/add/remove/force +sp_after_cast = ignore # ignore/add/remove/force # Add or remove spaces inside cast parens -sp_inside_paren_cast = remove # ignore/add/remove/force +sp_inside_paren_cast = remove # ignore/add/remove/force # Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = remove # ignore/add/remove/force +sp_cpp_cast_paren = remove # ignore/add/remove/force # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # ignore/add/remove/force # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = ignore # ignore/add/remove/force +sp_inside_braces_enum = ignore # ignore/add/remove/force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = ignore # ignore/add/remove/force +sp_inside_braces_struct = ignore # ignore/add/remove/force # Add or remove space inside '{' and '}' -sp_inside_braces = ignore # ignore/add/remove/force +sp_inside_braces = ignore # ignore/add/remove/force # Add or remove space inside '{}' -sp_inside_braces_empty = remove # ignore/add/remove/force +sp_inside_braces_empty = remove # ignore/add/remove/force # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = ignore # ignore/add/remove/force +sp_type_func = ignore # ignore/add/remove/force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # ignore/add/remove/force # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # ignore/add/remove/force # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # ignore/add/remove/force # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # ignore/add/remove/force # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # ignore/add/remove/force # Add or remove space between ')' and '{' of function -sp_fparen_brace = force # ignore/add/remove/force +sp_fparen_brace = force # ignore/add/remove/force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = ignore # ignore/add/remove/force +sp_func_call_paren = ignore # ignore/add/remove/force # Add or remove space between function name and '()' on function calls without parameters. # If set to 'ignore' (the default), sp_func_call_paren is used. -sp_func_call_paren_empty = ignore # ignore/add/remove/force +sp_func_call_paren_empty = ignore # ignore/add/remove/force # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = ignore # ignore/add/remove/force +sp_func_call_user_paren = ignore # ignore/add/remove/force # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # ignore/add/remove/force # Add or remove space between 'return' and '(' -sp_return_paren = add # ignore/add/remove/force +sp_return_paren = add # ignore/add/remove/force # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # ignore/add/remove/force # Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = ignore # ignore/add/remove/force +sp_defined_paren = ignore # ignore/add/remove/force # Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = ignore # ignore/add/remove/force +sp_throw_paren = ignore # ignore/add/remove/force # Add or remove space between 'catch' and '(' in 'catch (something) { }' # If set to ignore, sp_before_sparen is used. -sp_catch_paren = ignore # ignore/add/remove/force +sp_catch_paren = ignore # ignore/add/remove/force # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # ignore/add/remove/force # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # ignore/add/remove/force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = add # ignore/add/remove/force +sp_else_brace = add # ignore/add/remove/force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = add # ignore/add/remove/force +sp_brace_else = add # ignore/add/remove/force # Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = add # ignore/add/remove/force +sp_brace_typedef = add # ignore/add/remove/force # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = add # ignore/add/remove/force +sp_catch_brace = add # ignore/add/remove/force # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = add # ignore/add/remove/force +sp_brace_catch = add # ignore/add/remove/force # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = add # ignore/add/remove/force +sp_finally_brace = add # ignore/add/remove/force # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = add # ignore/add/remove/force +sp_brace_finally = add # ignore/add/remove/force # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = add # ignore/add/remove/force +sp_try_brace = add # ignore/add/remove/force # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # ignore/add/remove/force # Add or remove space before the '::' operator -sp_before_dc = remove # ignore/add/remove/force +sp_before_dc = remove # ignore/add/remove/force # Add or remove space after the '::' operator -sp_after_dc = remove # ignore/add/remove/force +sp_after_dc = remove # ignore/add/remove/force # Add or remove space after the '!' (not) operator. Default=Remove -sp_not = remove # ignore/add/remove/force +sp_not = remove # ignore/add/remove/force # Add or remove space after the '~' (invert) operator. Default=Remove -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # ignore/add/remove/force # Add or remove space after the '&' (address-of) operator. Default=Remove # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # ignore/add/remove/force # Add or remove space around the '.' or '->' operators. Default=Remove -sp_member = remove # ignore/add/remove/force +sp_member = remove # ignore/add/remove/force # Add or remove space after the '*' (dereference) operator. Default=Remove # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # ignore/add/remove/force # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # ignore/add/remove/force # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # ignore/add/remove/force # Add or remove space before a backslash-newline at the end of a line. Default=Add -sp_before_nl_cont = add # ignore/add/remove/force +sp_before_nl_cont = add # ignore/add/remove/force # Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = add # ignore/add/remove/force +sp_cond_colon = add # ignore/add/remove/force # Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = add # ignore/add/remove/force +sp_cond_question = add # ignore/add/remove/force # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = ignore # ignore/add/remove/force +sp_case_label = ignore # ignore/add/remove/force # Control the space after the opening of a C++ comment '// A' vs '//A' -sp_cmt_cpp_start = add # ignore/add/remove/force +sp_cmt_cpp_start = add # ignore/add/remove/force # Controls the spaces between #else or #endif and a trailing comment -sp_endif_cmt = ignore # ignore/add/remove/force +sp_endif_cmt = ignore # ignore/add/remove/force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # false/true # Whether to use tabs for aligning -align_with_tabs = false # false/true +align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # false/true # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # false/true # Align variable definitions in prototypes and functions -align_func_params = false # false/true +align_func_params = false # false/true # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = false # false/true +align_same_func_call_params = false # false/true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 0 # number +align_var_def_span = 0 # number # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 0 # number +align_var_def_star_style = 0 # number # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # number # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # number # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # number # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # false/true # Whether to align any attribute after the variable name -align_var_def_attribute = false # false/true +align_var_def_attribute = false # false/true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = false # false/true +align_var_def_inline = false # false/true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 0 # number +align_assign_span = 0 # number # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 # number # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 0 # number +align_enum_equ_span = 0 # number # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # number # The span for aligning struct/union (0=don't align) -align_var_struct_span = 0 # number +align_var_struct_span = 0 # number # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # number # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # number # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 0 # number +align_struct_init_span = 0 # number # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number +align_typedef_gap = 0 # number # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 0 # number +align_typedef_span = 0 # number # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # number # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typedef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # number # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typedef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # number # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 0 # number +align_right_cmt_span = 0 # number # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # false/true # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. This has to be > 0 to do anything. -align_right_cmt_gap = 0 # number +align_right_cmt_gap = 0 # number # Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore) -align_right_cmt_at_col = 0 # number +align_right_cmt_at_col = 0 # number # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # number # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # number # Align function protos on the 'operator' keyword instead of what follows -align_on_operator = false # false/true +align_on_operator = false # false/true # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # false/true # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true +align_single_line_func = false # false/true # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # false/true # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # number # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = false # false/true +align_nl_cont = false # false/true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 0 # number +align_pp_define_gap = 0 # number # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 0 # number +align_pp_define_span = 0 # number # Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = true # false/true +align_left_shift = true # false/true # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = true # false/true +nl_collapse_empty_body = true # false/true # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = true # false/true +nl_assign_leave_one_liners = true # false/true # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = true # false/true +nl_class_leave_one_liners = true # false/true # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = true # false/true +nl_enum_leave_one_liners = true # false/true # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # false/true # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # false/true # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # false/true # Add or remove newlines at the start of the file -nl_start_of_file = ignore # ignore/add/remove/force +nl_start_of_file = ignore # ignore/add/remove/force # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # number # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # ignore/add/remove/force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # number # Add or remove newline between '=' and '{' -nl_assign_brace = remove # ignore/add/remove/force +nl_assign_brace = remove # ignore/add/remove/force # The number of blank lines after a block of variable definitions -nl_func_var_def_blk = 0 # number +nl_func_var_def_blk = 0 # number # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = remove # ignore/add/remove/force +nl_fcall_brace = remove # ignore/add/remove/force # Add or remove newline between 'enum' and '{' -nl_enum_brace = remove # ignore/add/remove/force +nl_enum_brace = remove # ignore/add/remove/force # Add or remove newline between 'struct and '{' -nl_struct_brace = remove # ignore/add/remove/force +nl_struct_brace = remove # ignore/add/remove/force # Add or remove newline between 'union' and '{' -nl_union_brace = remove # ignore/add/remove/force +nl_union_brace = remove # ignore/add/remove/force # Add or remove newline between 'if' and '{' -nl_if_brace = remove # ignore/add/remove/force +nl_if_brace = remove # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = remove # ignore/add/remove/force +nl_brace_else = remove # ignore/add/remove/force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = remove # ignore/add/remove/force +nl_elseif_brace = remove # ignore/add/remove/force # Add or remove newline between 'else' and '{' -nl_else_brace = remove # ignore/add/remove/force +nl_else_brace = remove # ignore/add/remove/force # Add or remove newline between 'else' and 'if' -nl_else_if = remove # ignore/add/remove/force +nl_else_if = remove # ignore/add/remove/force # Add or remove newline between '}' and 'finally' -nl_brace_finally = remove # ignore/add/remove/force +nl_brace_finally = remove # ignore/add/remove/force # Add or remove newline between 'finally' and '{' -nl_finally_brace = remove # ignore/add/remove/force +nl_finally_brace = remove # ignore/add/remove/force # Add or remove newline between 'try' and '{' -nl_try_brace = remove # ignore/add/remove/force +nl_try_brace = remove # ignore/add/remove/force # Add or remove newline between get/set and '{' -nl_getset_brace = ignore # ignore/add/remove/force +nl_getset_brace = ignore # ignore/add/remove/force # Add or remove newline between 'for' and '{' -nl_for_brace = remove # ignore/add/remove/force +nl_for_brace = remove # ignore/add/remove/force # Add or remove newline between 'catch' and '{' -nl_catch_brace = remove # ignore/add/remove/force +nl_catch_brace = remove # ignore/add/remove/force # Add or remove newline between '}' and 'catch' -nl_brace_catch = remove # ignore/add/remove/force +nl_brace_catch = remove # ignore/add/remove/force # Add or remove newline between 'while' and '{' -nl_while_brace = remove # ignore/add/remove/force +nl_while_brace = remove # ignore/add/remove/force # Add or remove newline between 'using' and '{' -nl_using_brace = remove # ignore/add/remove/force +nl_using_brace = remove # ignore/add/remove/force # Add or remove newline between two open or close braces. # Due to general newline/brace handling, REMOVE may not work. -nl_brace_brace = ignore # ignore/add/remove/force +nl_brace_brace = ignore # ignore/add/remove/force # Add or remove newline between 'do' and '{' -nl_do_brace = remove # ignore/add/remove/force +nl_do_brace = remove # ignore/add/remove/force # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # ignore/add/remove/force # Add or remove newline between 'switch' and '{' -nl_switch_brace = remove # ignore/add/remove/force +nl_switch_brace = remove # ignore/add/remove/force # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = true # false/true +nl_multi_line_cond = true # false/true # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = false # false/true +nl_multi_line_define = false # false/true # Whether to put a newline before 'case' statement -nl_before_case = false # false/true +nl_before_case = false # false/true # Add or remove newline between ')' and 'throw' -nl_before_throw = ignore # ignore/add/remove/force +nl_before_throw = ignore # ignore/add/remove/force # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # false/true # Newline between namespace and { -nl_namespace_brace = remove # ignore/add/remove/force +nl_namespace_brace = remove # ignore/add/remove/force # Add or remove newline between 'template<>' and whatever follows. -nl_template_class = force # ignore/add/remove/force +nl_template_class = force # ignore/add/remove/force # Add or remove newline between 'class' and '{' -nl_class_brace = remove # ignore/add/remove/force +nl_class_brace = remove # ignore/add/remove/force # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = add # ignore/add/remove/force +nl_class_init_args = add # ignore/add/remove/force # Add or remove newline between return type and function name in a function definition -nl_func_type_name = remove # ignore/add/remove/force +nl_func_type_name = remove # ignore/add/remove/force # Add or remove newline between return type and function name inside a class {} # Uses nl_func_type_name or nl_func_proto_type_name if set to ignore. -nl_func_type_name_class = remove # ignore/add/remove/force +nl_func_type_name_class = remove # ignore/add/remove/force # Add or remove newline between function scope and name in a definition # Controls the newline after '::' in 'void A::f() { }' -nl_func_scope_name = remove # ignore/add/remove/force +nl_func_scope_name = remove # ignore/add/remove/force # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = remove # ignore/add/remove/force +nl_func_proto_type_name = remove # ignore/add/remove/force # Add or remove newline between a function name and the opening '(' -nl_func_paren = remove # ignore/add/remove/force +nl_func_paren = remove # ignore/add/remove/force # Add or remove newline between a function name and the opening '(' in the definition -nl_func_def_paren = remove # ignore/add/remove/force +nl_func_def_paren = remove # ignore/add/remove/force # Add or remove newline after '(' in a function declaration -nl_func_decl_start = add # ignore/add/remove/force +nl_func_decl_start = add # ignore/add/remove/force # Add or remove newline after '(' in a function definition -nl_func_def_start = add # ignore/add/remove/force +nl_func_def_start = add # ignore/add/remove/force # Overrides nl_func_decl_start when there is only one parameter. -nl_func_decl_start_single = remove # ignore/add/remove/force +nl_func_decl_start_single = remove # ignore/add/remove/force # Overrides nl_func_def_start when there is only one parameter. -nl_func_def_start_single = remove # ignore/add/remove/force +nl_func_def_start_single = remove # ignore/add/remove/force # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = add # ignore/add/remove/force +nl_func_decl_args = add # ignore/add/remove/force # Add or remove newline after each ',' in a function definition -nl_func_def_args = add # ignore/add/remove/force +nl_func_def_args = add # ignore/add/remove/force # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = remove # ignore/add/remove/force +nl_func_decl_end = remove # ignore/add/remove/force # Add or remove newline before the ')' in a function definition -nl_func_def_end = remove # ignore/add/remove/force +nl_func_def_end = remove # ignore/add/remove/force # Overrides nl_func_decl_end when there is only one parameter. -nl_func_decl_end_single = remove # ignore/add/remove/force +nl_func_decl_end_single = remove # ignore/add/remove/force # Overrides nl_func_def_end when there is only one parameter. -nl_func_def_end_single = remove # ignore/add/remove/force +nl_func_def_end_single = remove # ignore/add/remove/force # Add or remove newline between '()' in a function declaration. -nl_func_decl_empty = remove # ignore/add/remove/force +nl_func_decl_empty = remove # ignore/add/remove/force # Add or remove newline between '()' in a function definition. -nl_func_def_empty = remove # ignore/add/remove/force +nl_func_def_empty = remove # ignore/add/remove/force # Add or remove newline between function signature and '{' -nl_fdef_brace = remove # ignore/add/remove/force +nl_fdef_brace = remove # ignore/add/remove/force # Whether to put a newline after 'return' statement -nl_after_return = false # false/true +nl_after_return = false # false/true # Add or remove a newline between the return keyword and return expression. -nl_return_expr = ignore # ignore/add/remove/force +nl_return_expr = ignore # ignore/add/remove/force # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # false/true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = false # false/true +nl_after_brace_open = false # false/true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true +nl_after_brace_open_cmt = false # false/true # Whether to put a newline after a virtual brace open with a non-empty body. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = true # false/true +nl_after_vbrace_open = true # false/true # Whether to put a newline after a virtual brace open with an empty body. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open_empty = true # false/true +nl_after_vbrace_open_empty = true # false/true # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. -nl_after_brace_close = true # false/true +nl_after_brace_close = true # false/true # Whether to put a newline after a virtual brace close. # Would add a newline before return in: 'if (foo) a++; return;' -nl_after_vbrace_close = true # false/true +nl_after_vbrace_close = true # false/true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # false/true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true +nl_squeeze_ifdef = false # false/true # Add or remove blank line before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # ignore/add/remove/force # Add or remove blank line after 'if' statement -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # ignore/add/remove/force # Add or remove blank line before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # ignore/add/remove/force # Add or remove blank line after 'for' statement -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # ignore/add/remove/force # Add or remove blank line before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # ignore/add/remove/force # Add or remove blank line after 'while' statement -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # ignore/add/remove/force # Add or remove blank line before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # ignore/add/remove/force # Add or remove blank line after 'switch' statement -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # ignore/add/remove/force # Add or remove blank line before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # ignore/add/remove/force # Add or remove blank line after 'do/while' statement -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # ignore/add/remove/force # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # false/true # Whether to double-space before the close brace of a struct/union/enum # (lower priority than 'eat_blanks_before_close_brace') -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # false/true # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # ignore/add/remove/force # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # false/true # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # false/true # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # false/true # # Positioning options # # The position of arithmetic operators in wrapped expressions -pos_arith = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_arith = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of assignment in wrapped expressions. # Do not affect '=' followed by '{' -pos_assign = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_assign = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of boolean operators in wrapped expressions -pos_bool = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_bool = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of comparison operators in wrapped expressions -pos_compare = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_compare = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of conditional (b ? t : f) operators in wrapped expressions -pos_conditional = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_conditional = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of the comma in wrapped expressions -pos_comma = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_comma = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of the comma in the constructor initialization list -pos_class_comma = trail_force # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_comma = trail_force # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of colons between constructor and member initialization -pos_class_colon = lead # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_colon = lead # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 120 # number +code_width = 120 # number # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = true # false/true +ls_for_split_full = true # false/true # Whether to fully split long function protos/calls at commas -ls_func_split_full = true # false/true +ls_func_split_full = true # false/true # # Blank line options # # The maximum consecutive newlines -nl_max = 3 # number +nl_max = 3 # number # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 2 # number +nl_after_func_proto = 2 # number # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # number # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # number # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 2 # number +nl_after_func_body_one_liner = 2 # number # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 0 # number +nl_before_block_comment = 0 # number # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # number # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # number # Whether to force a newline after a multi-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # false/true # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 2 # number +nl_before_access_spec = 2 # number # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 1 # number +nl_after_access_spec = 1 # number # The number of newlines between a function def and the function comment. # 0 = No change. -nl_comment_func_def = 0 # number +nl_comment_func_def = 0 # number # The number of newlines after a try-catch-finally block that isn't followed by a brace close. # 0 = No change. -nl_after_try_catch_finally = 2 # number +nl_after_try_catch_finally = 2 # number # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # false/true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # false/true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = ignore # ignore/add/remove/force +mod_full_brace_do = ignore # ignore/add/remove/force # Add or remove braces on single-line 'for' statement -mod_full_brace_for = ignore # ignore/add/remove/force +mod_full_brace_for = ignore # ignore/add/remove/force # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = ignore # ignore/add/remove/force +mod_full_brace_if = ignore # ignore/add/remove/force # Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if. # If any must be braced, they are all braced. If all can be unbraced, then the braces are removed. -mod_full_brace_if_chain = true # false/true +mod_full_brace_if_chain = true # false/true # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # number # Add or remove braces on single-line 'while' statement -mod_full_brace_while = ignore # ignore/add/remove/force +mod_full_brace_while = ignore # ignore/add/remove/force # Add or remove braces on single-line 'using ()' statement -mod_full_brace_using = ignore # ignore/add/remove/force +mod_full_brace_using = ignore # ignore/add/remove/force # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = ignore # ignore/add/remove/force +mod_paren_on_return = ignore # ignore/add/remove/force # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = false # false/true +mod_full_paren_if_bool = false # false/true # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = true # false/true +mod_remove_extra_semicolon = true # false/true # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 0 # number +mod_add_long_function_closebrace_comment = 0 # number # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number +mod_add_long_switch_closebrace_comment = 0 # number # If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after # the #endif, a comment will be added. -mod_add_long_ifdef_endif_comment = 0 # number +mod_add_long_ifdef_endif_comment = 0 # number # If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after # the #else, a comment will be added. -mod_add_long_ifdef_else_comment = 0 # number +mod_add_long_ifdef_else_comment = 0 # number # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = true # false/true +mod_sort_include = true # false/true # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = false # false/true +mod_move_case_break = false # false/true # Will add or remove the braces around a fully braced case statement. # Will only remove the braces if there are no variable declarations in the block. -mod_case_brace = remove # ignore/add/remove/force +mod_case_brace = remove # ignore/add/remove/force # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = true # false/true +mod_remove_empty_return = true # false/true # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # number # Set the comment reflow mode (default: 0) # 0: no reflowing (apart from the line wrapping due to cmt_width) # 1: no touching at all # 2: full reflow -cmt_reflow_mode = 0 # number +cmt_reflow_mode = 0 # number # If false, disable all multi-line comment changes, including cmt_width. keyword substitution, and leading chars. # Default is true. -cmt_indent_multi = true # false/true +cmt_indent_multi = true # false/true # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # false/true # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # false/true # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # false/true # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # false/true # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # false/true # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # false/true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # number # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # number # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true # false/true # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # string # The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_footer = "" # string +cmt_insert_file_footer = "" # string # The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment. # Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # string # The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment. # Will substitute $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # string # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_oc_msg_header, cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true +cmt_insert_before_preproc = false # false/true # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = remove # ignore/add/remove/force +pp_indent = remove # ignore/add/remove/force # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # false/true # If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. -pp_indent_count = 1 # number +pp_indent_count = 1 # number # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # ignore/add/remove/force # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # number # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # number # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # false/true # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # number # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true +pp_if_indent_code = false # false/true # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # false/true # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/sp_before_tr_emb_cmt-f.cfg b/tests/config/sp_before_tr_emb_cmt-f.cfg index 908228eb3e..f6a67c2514 100644 --- a/tests/config/sp_before_tr_emb_cmt-f.cfg +++ b/tests/config/sp_before_tr_emb_cmt-f.cfg @@ -4,24 +4,24 @@ # # The type of line endings -newlines = auto # auto/lf/crlf/cr +newlines = auto # auto/lf/crlf/cr # The original size of tabs in the input -input_tab_size = 8 # number +input_tab_size = 8 # number # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 8 # number +output_tab_size = 8 # number # The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # number # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # number # Allow interpreting '>=' and '>>=' as part of a template in 'void f(list>=val);'. # If true (default), 'assert(x<0 && y>=3)' will be broken. # Improvements to template detection may make this option obsolete. -tok_split_gte = false # false/true +tok_split_gte = false # false/true # # Indenting @@ -29,1221 +29,1221 @@ tok_split_gte = false # false/true # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 2 # number +indent_columns = 2 # number # The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents. # For FreeBSD, this is set to 4. -indent_continue = 0 # number +indent_continue = 0 # number # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs to brace level, align with spaces # 2=indent and align with tabs, using spaces when not on a tabstop -indent_with_tabs = 0 # number +indent_with_tabs = 0 # number # Comments that are not a brace level are indented with tabs on a tabstop. # Requires indent_with_tabs=2. If false, will use spaces. -indent_cmt_with_tabs = false # false/true +indent_cmt_with_tabs = false # false/true # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # false/true # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # number # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # false/true # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # false/true # Disabled indenting class braces if indent_braces is true -indent_braces_no_class = false # false/true +indent_braces_no_class = false # false/true # Disabled indenting struct braces if indent_braces is true -indent_braces_no_struct = false # false/true +indent_braces_no_struct = false # false/true # Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # false/true # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # false/true # The number of spaces to indent a namespace block -indent_namespace_level = 0 # number +indent_namespace_level = 0 # number # If the body of the namespace is longer than this number, it won't be indented. # Requires indent_namespace=true. Default=0 (no limit) -indent_namespace_limit = 0 # number +indent_namespace_limit = 0 # number # Whether the 'extern "C"' body is indented -indent_extern = false # false/true +indent_extern = false # false/true # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # false/true # Whether to indent the stuff after a leading class colon -indent_class_colon = true # false/true +indent_class_colon = true # false/true # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level -indent_else_if = false # false/true +indent_else_if = false # false/true # Amount to indent variable declarations after a open brace. neg=relative, pos=absolute -indent_var_def_blk = 0 # number +indent_var_def_blk = 0 # number # Indent continued variable declarations instead of aligning. -indent_var_def_cont = true # false/true +indent_var_def_cont = true # false/true # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = true # false/true +indent_func_call_param = true # false/true # Same as indent_func_call_param, but for function defs -indent_func_def_param = true # false/true +indent_func_def_param = true # false/true # Same as indent_func_call_param, but for function protos -indent_func_proto_param = true # false/true +indent_func_proto_param = true # false/true # Same as indent_func_call_param, but for class declarations -indent_func_class_param = true # false/true +indent_func_class_param = true # false/true # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = true # false/true +indent_func_ctor_var_param = true # false/true # Same as indent_func_call_param, but for templates -indent_template_param = true # false/true +indent_template_param = true # false/true # Double the indent for indent_func_xxx_param options -indent_func_param_double = true # false/true +indent_func_param_double = true # false/true # Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 0 # number +indent_func_const = 0 # number # Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 0 # number +indent_func_throw = 0 # number # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 2 # number +indent_member = 2 # number # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # number # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = true # false/true +indent_relative_single_line_comments = true # false/true # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 2 # number +indent_switch_case = 2 # number # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # number # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 2 # number +indent_case_brace = 2 # number # Whether to indent comments found in first column -indent_col1_comment = true # false/true +indent_col1_comment = true # false/true # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 2 # number +indent_label = 2 # number # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 2 # number +indent_access_spec = 2 # number # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # false/true # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # false/true # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 0 # number +indent_paren_close = 0 # number # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # false/true # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # false/true # If 'indent_bool_paren' is true, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones -indent_first_bool_expr = false # false/true +indent_first_bool_expr = false # false/true # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # false/true # Align continued statements at the '='. Default=True # If FALSE or the '=' is followed by a newline, the next line is indent one tab. -indent_align_assign = false # false/true +indent_align_assign = false # false/true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = ignore # ignore/add/remove/force +sp_arith = ignore # ignore/add/remove/force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # ignore/add/remove/force # Add or remove space around assignment operator '=' in a prototype -sp_assign_default = remove # ignore/add/remove/force +sp_assign_default = remove # ignore/add/remove/force # Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. -sp_before_assign = ignore # ignore/add/remove/force +sp_before_assign = ignore # ignore/add/remove/force # Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. -sp_after_assign = ignore # ignore/add/remove/force +sp_after_assign = ignore # ignore/add/remove/force # Add or remove space around assignment '=' in enum -sp_enum_assign = force # ignore/add/remove/force +sp_enum_assign = force # ignore/add/remove/force # Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_before_assign = ignore # ignore/add/remove/force +sp_enum_before_assign = ignore # ignore/add/remove/force # Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_after_assign = ignore # ignore/add/remove/force +sp_enum_after_assign = ignore # ignore/add/remove/force # Add or remove space around preprocessor '##' concatenation operator. Default=Add -sp_pp_concat = add # ignore/add/remove/force +sp_pp_concat = add # ignore/add/remove/force # Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator. Default=Add -sp_pp_stringify = add # ignore/add/remove/force +sp_pp_stringify = add # ignore/add/remove/force # Add or remove space around boolean operators '&&' and '||' -sp_bool = add # ignore/add/remove/force +sp_bool = add # ignore/add/remove/force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = add # ignore/add/remove/force +sp_compare = add # ignore/add/remove/force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # ignore/add/remove/force # Add or remove space between nested parens -sp_paren_paren = ignore # ignore/add/remove/force +sp_paren_paren = ignore # ignore/add/remove/force # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # false/true # Add or remove space between ')' and '{' -sp_paren_brace = remove # ignore/add/remove/force +sp_paren_brace = remove # ignore/add/remove/force # Add or remove space before pointer star '*' -sp_before_ptr_star = remove # ignore/add/remove/force +sp_before_ptr_star = remove # ignore/add/remove/force # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force +sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # ignore/add/remove/force # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = add # ignore/add/remove/force +sp_after_ptr_star = add # ignore/add/remove/force # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = add # ignore/add/remove/force +sp_after_ptr_star_func = add # ignore/add/remove/force # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = remove # ignore/add/remove/force +sp_before_ptr_star_func = remove # ignore/add/remove/force # Add or remove space before a reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # ignore/add/remove/force # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force +sp_before_unnamed_byref = ignore # ignore/add/remove/force # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = add # ignore/add/remove/force +sp_after_byref = add # ignore/add/remove/force # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = add # ignore/add/remove/force +sp_after_byref_func = add # ignore/add/remove/force # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = remove # ignore/add/remove/force +sp_before_byref_func = remove # ignore/add/remove/force # Add or remove space between type and word. Default=Force -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # ignore/add/remove/force # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. -sp_template_angle = force # ignore/add/remove/force +sp_template_angle = force # ignore/add/remove/force # Add or remove space before '<>' -sp_before_angle = ignore # ignore/add/remove/force +sp_before_angle = ignore # ignore/add/remove/force # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # ignore/add/remove/force # Add or remove space after '<>' -sp_after_angle = ignore # ignore/add/remove/force +sp_after_angle = ignore # ignore/add/remove/force # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = ignore # ignore/add/remove/force +sp_angle_paren = ignore # ignore/add/remove/force # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = force # ignore/add/remove/force +sp_angle_word = force # ignore/add/remove/force # Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add -sp_angle_shift = add # ignore/add/remove/force +sp_angle_shift = add # ignore/add/remove/force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = add # ignore/add/remove/force +sp_before_sparen = add # ignore/add/remove/force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # ignore/add/remove/force # Add or remove space before if-condition ')'. Overrides sp_inside_sparen. -sp_inside_sparen_close = ignore # ignore/add/remove/force +sp_inside_sparen_close = ignore # ignore/add/remove/force # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # ignore/add/remove/force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = force # ignore/add/remove/force +sp_sparen_brace = force # ignore/add/remove/force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # ignore/add/remove/force # Add or remove space before ';'. Default=Remove -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # ignore/add/remove/force # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = ignore # ignore/add/remove/force +sp_before_semi_for = ignore # ignore/add/remove/force # Add or remove space before a semicolon of an empty part of a for statement. -sp_before_semi_for_empty = add # ignore/add/remove/force +sp_before_semi_for_empty = add # ignore/add/remove/force # Add or remove space after ';', except when followed by a comment. Default=Add -sp_after_semi = ignore # ignore/add/remove/force +sp_after_semi = ignore # ignore/add/remove/force # Add or remove space after ';' in non-empty 'for' statements. Default=Force -sp_after_semi_for = force # ignore/add/remove/force +sp_after_semi_for = force # ignore/add/remove/force # Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; ). -sp_after_semi_for_empty = ignore # ignore/add/remove/force +sp_after_semi_for_empty = ignore # ignore/add/remove/force # Add space before trailing comment, e.g., do_something(); // trailing comment -sp_before_tr_emb_cmt = force +sp_before_tr_emb_cmt = force # Number of spaces before trailing comment, e.g., do_something(); // trailing comment -sp_num_before_tr_emb_cmt = 2 +sp_num_before_tr_emb_cmt = 2 # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # ignore/add/remove/force # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # ignore/add/remove/force # Add or remove space inside '[' and ']' -sp_inside_square = ignore # ignore/add/remove/force +sp_inside_square = ignore # ignore/add/remove/force # Add or remove space after ',' -sp_after_comma = add # ignore/add/remove/force +sp_after_comma = add # ignore/add/remove/force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # ignore/add/remove/force # Add or remove space between an open paren and comma: '(,' vs '( ,' -sp_paren_comma = force # ignore/add/remove/force +sp_paren_comma = force # ignore/add/remove/force # Add or remove space before the variadic '...' when preceded by a non-punctuator -sp_before_ellipsis = ignore # ignore/add/remove/force +sp_before_ellipsis = ignore # ignore/add/remove/force # Add or remove space after class ':' -sp_after_class_colon = add # ignore/add/remove/force +sp_after_class_colon = add # ignore/add/remove/force # Add or remove space before class ':' -sp_before_class_colon = add # ignore/add/remove/force +sp_before_class_colon = add # ignore/add/remove/force # Add or remove space before case ':'. Default=Remove -sp_before_case_colon = remove # ignore/add/remove/force +sp_before_case_colon = remove # ignore/add/remove/force # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # ignore/add/remove/force # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = remove # ignore/add/remove/force +sp_after_operator_sym = remove # ignore/add/remove/force # Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = ignore # ignore/add/remove/force +sp_after_cast = ignore # ignore/add/remove/force # Add or remove spaces inside cast parens -sp_inside_paren_cast = remove # ignore/add/remove/force +sp_inside_paren_cast = remove # ignore/add/remove/force # Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = remove # ignore/add/remove/force +sp_cpp_cast_paren = remove # ignore/add/remove/force # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # ignore/add/remove/force # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = ignore # ignore/add/remove/force +sp_inside_braces_enum = ignore # ignore/add/remove/force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = ignore # ignore/add/remove/force +sp_inside_braces_struct = ignore # ignore/add/remove/force # Add or remove space inside '{' and '}' -sp_inside_braces = ignore # ignore/add/remove/force +sp_inside_braces = ignore # ignore/add/remove/force # Add or remove space inside '{}' -sp_inside_braces_empty = remove # ignore/add/remove/force +sp_inside_braces_empty = remove # ignore/add/remove/force # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = ignore # ignore/add/remove/force +sp_type_func = ignore # ignore/add/remove/force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # ignore/add/remove/force # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # ignore/add/remove/force # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # ignore/add/remove/force # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # ignore/add/remove/force # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # ignore/add/remove/force # Add or remove space between ')' and '{' of function -sp_fparen_brace = force # ignore/add/remove/force +sp_fparen_brace = force # ignore/add/remove/force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = ignore # ignore/add/remove/force +sp_func_call_paren = ignore # ignore/add/remove/force # Add or remove space between function name and '()' on function calls without parameters. # If set to 'ignore' (the default), sp_func_call_paren is used. -sp_func_call_paren_empty = ignore # ignore/add/remove/force +sp_func_call_paren_empty = ignore # ignore/add/remove/force # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = ignore # ignore/add/remove/force +sp_func_call_user_paren = ignore # ignore/add/remove/force # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # ignore/add/remove/force # Add or remove space between 'return' and '(' -sp_return_paren = add # ignore/add/remove/force +sp_return_paren = add # ignore/add/remove/force # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # ignore/add/remove/force # Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = ignore # ignore/add/remove/force +sp_defined_paren = ignore # ignore/add/remove/force # Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = ignore # ignore/add/remove/force +sp_throw_paren = ignore # ignore/add/remove/force # Add or remove space between 'catch' and '(' in 'catch (something) { }' # If set to ignore, sp_before_sparen is used. -sp_catch_paren = ignore # ignore/add/remove/force +sp_catch_paren = ignore # ignore/add/remove/force # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # ignore/add/remove/force # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # ignore/add/remove/force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = add # ignore/add/remove/force +sp_else_brace = add # ignore/add/remove/force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = add # ignore/add/remove/force +sp_brace_else = add # ignore/add/remove/force # Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = add # ignore/add/remove/force +sp_brace_typedef = add # ignore/add/remove/force # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = add # ignore/add/remove/force +sp_catch_brace = add # ignore/add/remove/force # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = add # ignore/add/remove/force +sp_brace_catch = add # ignore/add/remove/force # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = add # ignore/add/remove/force +sp_finally_brace = add # ignore/add/remove/force # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = add # ignore/add/remove/force +sp_brace_finally = add # ignore/add/remove/force # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = add # ignore/add/remove/force +sp_try_brace = add # ignore/add/remove/force # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # ignore/add/remove/force # Add or remove space before the '::' operator -sp_before_dc = remove # ignore/add/remove/force +sp_before_dc = remove # ignore/add/remove/force # Add or remove space after the '::' operator -sp_after_dc = remove # ignore/add/remove/force +sp_after_dc = remove # ignore/add/remove/force # Add or remove space after the '!' (not) operator. Default=Remove -sp_not = remove # ignore/add/remove/force +sp_not = remove # ignore/add/remove/force # Add or remove space after the '~' (invert) operator. Default=Remove -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # ignore/add/remove/force # Add or remove space after the '&' (address-of) operator. Default=Remove # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # ignore/add/remove/force # Add or remove space around the '.' or '->' operators. Default=Remove -sp_member = remove # ignore/add/remove/force +sp_member = remove # ignore/add/remove/force # Add or remove space after the '*' (dereference) operator. Default=Remove # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # ignore/add/remove/force # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # ignore/add/remove/force # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # ignore/add/remove/force # Add or remove space before a backslash-newline at the end of a line. Default=Add -sp_before_nl_cont = add # ignore/add/remove/force +sp_before_nl_cont = add # ignore/add/remove/force # Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = add # ignore/add/remove/force +sp_cond_colon = add # ignore/add/remove/force # Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = add # ignore/add/remove/force +sp_cond_question = add # ignore/add/remove/force # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = ignore # ignore/add/remove/force +sp_case_label = ignore # ignore/add/remove/force # Control the space after the opening of a C++ comment '// A' vs '//A' -sp_cmt_cpp_start = add # ignore/add/remove/force +sp_cmt_cpp_start = add # ignore/add/remove/force # Controls the spaces between #else or #endif and a trailing comment -sp_endif_cmt = ignore # ignore/add/remove/force +sp_endif_cmt = ignore # ignore/add/remove/force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # false/true # Whether to use tabs for aligning -align_with_tabs = false # false/true +align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # false/true # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # false/true # Align variable definitions in prototypes and functions -align_func_params = false # false/true +align_func_params = false # false/true # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = false # false/true +align_same_func_call_params = false # false/true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 0 # number +align_var_def_span = 0 # number # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 0 # number +align_var_def_star_style = 0 # number # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # number # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # number # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # number # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # false/true # Whether to align any attribute after the variable name -align_var_def_attribute = false # false/true +align_var_def_attribute = false # false/true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = false # false/true +align_var_def_inline = false # false/true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 0 # number +align_assign_span = 0 # number # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 # number # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 0 # number +align_enum_equ_span = 0 # number # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # number # The span for aligning struct/union (0=don't align) -align_var_struct_span = 0 # number +align_var_struct_span = 0 # number # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # number # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # number # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 0 # number +align_struct_init_span = 0 # number # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number +align_typedef_gap = 0 # number # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 0 # number +align_typedef_span = 0 # number # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # number # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typedef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # number # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typedef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # number # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 0 # number +align_right_cmt_span = 0 # number # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # false/true # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. This has to be > 0 to do anything. -align_right_cmt_gap = 0 # number +align_right_cmt_gap = 0 # number # Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore) -align_right_cmt_at_col = 0 # number +align_right_cmt_at_col = 0 # number # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # number # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # number # Align function protos on the 'operator' keyword instead of what follows -align_on_operator = false # false/true +align_on_operator = false # false/true # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # false/true # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true +align_single_line_func = false # false/true # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # false/true # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # number # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = false # false/true +align_nl_cont = false # false/true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 0 # number +align_pp_define_gap = 0 # number # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 0 # number +align_pp_define_span = 0 # number # Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = true # false/true +align_left_shift = true # false/true # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = true # false/true +nl_collapse_empty_body = true # false/true # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = true # false/true +nl_assign_leave_one_liners = true # false/true # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = true # false/true +nl_class_leave_one_liners = true # false/true # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = true # false/true +nl_enum_leave_one_liners = true # false/true # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # false/true # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # false/true # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # false/true # Add or remove newlines at the start of the file -nl_start_of_file = ignore # ignore/add/remove/force +nl_start_of_file = ignore # ignore/add/remove/force # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # number # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # ignore/add/remove/force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # number # Add or remove newline between '=' and '{' -nl_assign_brace = remove # ignore/add/remove/force +nl_assign_brace = remove # ignore/add/remove/force # The number of blank lines after a block of variable definitions -nl_func_var_def_blk = 0 # number +nl_func_var_def_blk = 0 # number # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = remove # ignore/add/remove/force +nl_fcall_brace = remove # ignore/add/remove/force # Add or remove newline between 'enum' and '{' -nl_enum_brace = remove # ignore/add/remove/force +nl_enum_brace = remove # ignore/add/remove/force # Add or remove newline between 'struct and '{' -nl_struct_brace = remove # ignore/add/remove/force +nl_struct_brace = remove # ignore/add/remove/force # Add or remove newline between 'union' and '{' -nl_union_brace = remove # ignore/add/remove/force +nl_union_brace = remove # ignore/add/remove/force # Add or remove newline between 'if' and '{' -nl_if_brace = remove # ignore/add/remove/force +nl_if_brace = remove # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = remove # ignore/add/remove/force +nl_brace_else = remove # ignore/add/remove/force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = remove # ignore/add/remove/force +nl_elseif_brace = remove # ignore/add/remove/force # Add or remove newline between 'else' and '{' -nl_else_brace = remove # ignore/add/remove/force +nl_else_brace = remove # ignore/add/remove/force # Add or remove newline between 'else' and 'if' -nl_else_if = remove # ignore/add/remove/force +nl_else_if = remove # ignore/add/remove/force # Add or remove newline between '}' and 'finally' -nl_brace_finally = remove # ignore/add/remove/force +nl_brace_finally = remove # ignore/add/remove/force # Add or remove newline between 'finally' and '{' -nl_finally_brace = remove # ignore/add/remove/force +nl_finally_brace = remove # ignore/add/remove/force # Add or remove newline between 'try' and '{' -nl_try_brace = remove # ignore/add/remove/force +nl_try_brace = remove # ignore/add/remove/force # Add or remove newline between get/set and '{' -nl_getset_brace = ignore # ignore/add/remove/force +nl_getset_brace = ignore # ignore/add/remove/force # Add or remove newline between 'for' and '{' -nl_for_brace = remove # ignore/add/remove/force +nl_for_brace = remove # ignore/add/remove/force # Add or remove newline between 'catch' and '{' -nl_catch_brace = remove # ignore/add/remove/force +nl_catch_brace = remove # ignore/add/remove/force # Add or remove newline between '}' and 'catch' -nl_brace_catch = remove # ignore/add/remove/force +nl_brace_catch = remove # ignore/add/remove/force # Add or remove newline between 'while' and '{' -nl_while_brace = remove # ignore/add/remove/force +nl_while_brace = remove # ignore/add/remove/force # Add or remove newline between 'using' and '{' -nl_using_brace = remove # ignore/add/remove/force +nl_using_brace = remove # ignore/add/remove/force # Add or remove newline between two open or close braces. # Due to general newline/brace handling, REMOVE may not work. -nl_brace_brace = ignore # ignore/add/remove/force +nl_brace_brace = ignore # ignore/add/remove/force # Add or remove newline between 'do' and '{' -nl_do_brace = remove # ignore/add/remove/force +nl_do_brace = remove # ignore/add/remove/force # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # ignore/add/remove/force # Add or remove newline between 'switch' and '{' -nl_switch_brace = remove # ignore/add/remove/force +nl_switch_brace = remove # ignore/add/remove/force # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = true # false/true +nl_multi_line_cond = true # false/true # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = false # false/true +nl_multi_line_define = false # false/true # Whether to put a newline before 'case' statement -nl_before_case = false # false/true +nl_before_case = false # false/true # Add or remove newline between ')' and 'throw' -nl_before_throw = ignore # ignore/add/remove/force +nl_before_throw = ignore # ignore/add/remove/force # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # false/true # Newline between namespace and { -nl_namespace_brace = remove # ignore/add/remove/force +nl_namespace_brace = remove # ignore/add/remove/force # Add or remove newline between 'template<>' and whatever follows. -nl_template_class = force # ignore/add/remove/force +nl_template_class = force # ignore/add/remove/force # Add or remove newline between 'class' and '{' -nl_class_brace = remove # ignore/add/remove/force +nl_class_brace = remove # ignore/add/remove/force # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = add # ignore/add/remove/force +nl_class_init_args = add # ignore/add/remove/force # Add or remove newline between return type and function name in a function definition -nl_func_type_name = remove # ignore/add/remove/force +nl_func_type_name = remove # ignore/add/remove/force # Add or remove newline between return type and function name inside a class {} # Uses nl_func_type_name or nl_func_proto_type_name if set to ignore. -nl_func_type_name_class = remove # ignore/add/remove/force +nl_func_type_name_class = remove # ignore/add/remove/force # Add or remove newline between function scope and name in a definition # Controls the newline after '::' in 'void A::f() { }' -nl_func_scope_name = remove # ignore/add/remove/force +nl_func_scope_name = remove # ignore/add/remove/force # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = remove # ignore/add/remove/force +nl_func_proto_type_name = remove # ignore/add/remove/force # Add or remove newline between a function name and the opening '(' -nl_func_paren = remove # ignore/add/remove/force +nl_func_paren = remove # ignore/add/remove/force # Add or remove newline between a function name and the opening '(' in the definition -nl_func_def_paren = remove # ignore/add/remove/force +nl_func_def_paren = remove # ignore/add/remove/force # Add or remove newline after '(' in a function declaration -nl_func_decl_start = add # ignore/add/remove/force +nl_func_decl_start = add # ignore/add/remove/force # Add or remove newline after '(' in a function definition -nl_func_def_start = add # ignore/add/remove/force +nl_func_def_start = add # ignore/add/remove/force # Overrides nl_func_decl_start when there is only one parameter. -nl_func_decl_start_single = remove # ignore/add/remove/force +nl_func_decl_start_single = remove # ignore/add/remove/force # Overrides nl_func_def_start when there is only one parameter. -nl_func_def_start_single = remove # ignore/add/remove/force +nl_func_def_start_single = remove # ignore/add/remove/force # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = add # ignore/add/remove/force +nl_func_decl_args = add # ignore/add/remove/force # Add or remove newline after each ',' in a function definition -nl_func_def_args = add # ignore/add/remove/force +nl_func_def_args = add # ignore/add/remove/force # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = remove # ignore/add/remove/force +nl_func_decl_end = remove # ignore/add/remove/force # Add or remove newline before the ')' in a function definition -nl_func_def_end = remove # ignore/add/remove/force +nl_func_def_end = remove # ignore/add/remove/force # Overrides nl_func_decl_end when there is only one parameter. -nl_func_decl_end_single = remove # ignore/add/remove/force +nl_func_decl_end_single = remove # ignore/add/remove/force # Overrides nl_func_def_end when there is only one parameter. -nl_func_def_end_single = remove # ignore/add/remove/force +nl_func_def_end_single = remove # ignore/add/remove/force # Add or remove newline between '()' in a function declaration. -nl_func_decl_empty = remove # ignore/add/remove/force +nl_func_decl_empty = remove # ignore/add/remove/force # Add or remove newline between '()' in a function definition. -nl_func_def_empty = remove # ignore/add/remove/force +nl_func_def_empty = remove # ignore/add/remove/force # Add or remove newline between function signature and '{' -nl_fdef_brace = remove # ignore/add/remove/force +nl_fdef_brace = remove # ignore/add/remove/force # Whether to put a newline after 'return' statement -nl_after_return = false # false/true +nl_after_return = false # false/true # Add or remove a newline between the return keyword and return expression. -nl_return_expr = ignore # ignore/add/remove/force +nl_return_expr = ignore # ignore/add/remove/force # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # false/true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = false # false/true +nl_after_brace_open = false # false/true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true +nl_after_brace_open_cmt = false # false/true # Whether to put a newline after a virtual brace open with a non-empty body. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = true # false/true +nl_after_vbrace_open = true # false/true # Whether to put a newline after a virtual brace open with an empty body. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open_empty = true # false/true +nl_after_vbrace_open_empty = true # false/true # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. -nl_after_brace_close = true # false/true +nl_after_brace_close = true # false/true # Whether to put a newline after a virtual brace close. # Would add a newline before return in: 'if (foo) a++; return;' -nl_after_vbrace_close = true # false/true +nl_after_vbrace_close = true # false/true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # false/true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true +nl_squeeze_ifdef = false # false/true # Add or remove blank line before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # ignore/add/remove/force # Add or remove blank line after 'if' statement -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # ignore/add/remove/force # Add or remove blank line before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # ignore/add/remove/force # Add or remove blank line after 'for' statement -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # ignore/add/remove/force # Add or remove blank line before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # ignore/add/remove/force # Add or remove blank line after 'while' statement -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # ignore/add/remove/force # Add or remove blank line before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # ignore/add/remove/force # Add or remove blank line after 'switch' statement -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # ignore/add/remove/force # Add or remove blank line before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # ignore/add/remove/force # Add or remove blank line after 'do/while' statement -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # ignore/add/remove/force # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # false/true # Whether to double-space before the close brace of a struct/union/enum # (lower priority than 'eat_blanks_before_close_brace') -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # false/true # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # ignore/add/remove/force # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # false/true # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # false/true # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # false/true # # Positioning options # # The position of arithmetic operators in wrapped expressions -pos_arith = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_arith = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of assignment in wrapped expressions. # Do not affect '=' followed by '{' -pos_assign = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_assign = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of boolean operators in wrapped expressions -pos_bool = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_bool = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of comparison operators in wrapped expressions -pos_compare = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_compare = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of conditional (b ? t : f) operators in wrapped expressions -pos_conditional = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_conditional = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of the comma in wrapped expressions -pos_comma = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_comma = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of the comma in the constructor initialization list -pos_class_comma = trail_force # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_comma = trail_force # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # The position of colons between constructor and member initialization -pos_class_colon = lead # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_colon = lead # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 120 # number +code_width = 120 # number # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = true # false/true +ls_for_split_full = true # false/true # Whether to fully split long function protos/calls at commas -ls_func_split_full = true # false/true +ls_func_split_full = true # false/true # # Blank line options # # The maximum consecutive newlines -nl_max = 3 # number +nl_max = 3 # number # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 2 # number +nl_after_func_proto = 2 # number # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # number # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # number # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 2 # number +nl_after_func_body_one_liner = 2 # number # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 0 # number +nl_before_block_comment = 0 # number # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # number # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # number # Whether to force a newline after a multi-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # false/true # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 2 # number +nl_before_access_spec = 2 # number # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 1 # number +nl_after_access_spec = 1 # number # The number of newlines between a function def and the function comment. # 0 = No change. -nl_comment_func_def = 0 # number +nl_comment_func_def = 0 # number # The number of newlines after a try-catch-finally block that isn't followed by a brace close. # 0 = No change. -nl_after_try_catch_finally = 2 # number +nl_after_try_catch_finally = 2 # number # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # false/true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # false/true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = ignore # ignore/add/remove/force +mod_full_brace_do = ignore # ignore/add/remove/force # Add or remove braces on single-line 'for' statement -mod_full_brace_for = ignore # ignore/add/remove/force +mod_full_brace_for = ignore # ignore/add/remove/force # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = ignore # ignore/add/remove/force +mod_full_brace_if = ignore # ignore/add/remove/force # Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if. # If any must be braced, they are all braced. If all can be unbraced, then the braces are removed. -mod_full_brace_if_chain = true # false/true +mod_full_brace_if_chain = true # false/true # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # number # Add or remove braces on single-line 'while' statement -mod_full_brace_while = ignore # ignore/add/remove/force +mod_full_brace_while = ignore # ignore/add/remove/force # Add or remove braces on single-line 'using ()' statement -mod_full_brace_using = ignore # ignore/add/remove/force +mod_full_brace_using = ignore # ignore/add/remove/force # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = ignore # ignore/add/remove/force +mod_paren_on_return = ignore # ignore/add/remove/force # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = false # false/true +mod_full_paren_if_bool = false # false/true # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = true # false/true +mod_remove_extra_semicolon = true # false/true # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 0 # number +mod_add_long_function_closebrace_comment = 0 # number # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number +mod_add_long_switch_closebrace_comment = 0 # number # If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after # the #endif, a comment will be added. -mod_add_long_ifdef_endif_comment = 0 # number +mod_add_long_ifdef_endif_comment = 0 # number # If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after # the #else, a comment will be added. -mod_add_long_ifdef_else_comment = 0 # number +mod_add_long_ifdef_else_comment = 0 # number # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = true # false/true +mod_sort_include = true # false/true # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = false # false/true +mod_move_case_break = false # false/true # Will add or remove the braces around a fully braced case statement. # Will only remove the braces if there are no variable declarations in the block. -mod_case_brace = remove # ignore/add/remove/force +mod_case_brace = remove # ignore/add/remove/force # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = true # false/true +mod_remove_empty_return = true # false/true # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # number # Set the comment reflow mode (default: 0) # 0: no reflowing (apart from the line wrapping due to cmt_width) # 1: no touching at all # 2: full reflow -cmt_reflow_mode = 0 # number +cmt_reflow_mode = 0 # number # If false, disable all multi-line comment changes, including cmt_width. keyword substitution, and leading chars. # Default is true. -cmt_indent_multi = true # false/true +cmt_indent_multi = true # false/true # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # false/true # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # false/true # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # false/true # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # false/true # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # false/true # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # false/true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # number # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # number # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true # false/true # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # string # The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_footer = "" # string +cmt_insert_file_footer = "" # string # The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment. # Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # string # The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment. # Will substitute $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # string # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_oc_msg_header, cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true +cmt_insert_before_preproc = false # false/true # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = remove # ignore/add/remove/force +pp_indent = remove # ignore/add/remove/force # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # false/true # If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. -pp_indent_count = 1 # number +pp_indent_count = 1 # number # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # ignore/add/remove/force # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # number # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # number # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # false/true # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # number # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true +pp_if_indent_code = false # false/true # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # false/true # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/sp_before_type_brace_init_lst_close-f.cfg b/tests/config/sp_before_type_brace_init_lst_close-f.cfg index 3dda0281e9..154b034d1c 100644 --- a/tests/config/sp_before_type_brace_init_lst_close-f.cfg +++ b/tests/config/sp_before_type_brace_init_lst_close-f.cfg @@ -1 +1 @@ -sp_before_type_brace_init_lst_close = force \ No newline at end of file +sp_before_type_brace_init_lst_close = force diff --git a/tests/config/sp_before_type_brace_init_lst_close-r.cfg b/tests/config/sp_before_type_brace_init_lst_close-r.cfg index 5fb0bf3665..081c0192dd 100644 --- a/tests/config/sp_before_type_brace_init_lst_close-r.cfg +++ b/tests/config/sp_before_type_brace_init_lst_close-r.cfg @@ -1 +1 @@ -sp_before_type_brace_init_lst_close = remove \ No newline at end of file +sp_before_type_brace_init_lst_close = remove diff --git a/tests/config/sp_between_new_paren.cfg b/tests/config/sp_between_new_paren.cfg index 07ea765b27..58f0cc1949 100644 --- a/tests/config/sp_between_new_paren.cfg +++ b/tests/config/sp_between_new_paren.cfg @@ -1,2 +1,2 @@ -sp_after_new=force -sp_between_new_paren=remove +sp_after_new = force +sp_between_new_paren = remove diff --git a/tests/config/sp_block_as_argument.cfg b/tests/config/sp_block_as_argument.cfg index 9034651769..39535423c4 100644 --- a/tests/config/sp_block_as_argument.cfg +++ b/tests/config/sp_block_as_argument.cfg @@ -1,11 +1,11 @@ -include "obj-c.cfg" +include "obj-c.cfg" -output_tab_size = 4 # new tab size -indent_columns = output_tab_size +output_tab_size = 4 # new tab size +indent_columns = output_tab_size -sp_before_oc_block_caret = remove -sp_after_oc_block_caret = remove -indent_oc_block = true -indent_oc_block_msg = 0 +sp_before_oc_block_caret = remove +sp_after_oc_block_caret = remove +indent_oc_block = true +indent_oc_block_msg = 0 indent_oc_block_msg_from_keyword = true diff --git a/tests/config/sp_block_as_argument2.cfg b/tests/config/sp_block_as_argument2.cfg index 8285f5450e..ba14dc7127 100644 --- a/tests/config/sp_block_as_argument2.cfg +++ b/tests/config/sp_block_as_argument2.cfg @@ -1,5 +1,5 @@ -include "obj-c.cfg" -include "sp_block_as_argument.cfg" +include "obj-c.cfg" +include "sp_block_as_argument.cfg" indent_oc_block_msg_from_keyword = false -indent_oc_block_msg_from_colon = true +indent_oc_block_msg_from_colon = true diff --git a/tests/config/sp_block_as_argument3.cfg b/tests/config/sp_block_as_argument3.cfg index 3450c754f7..67cf15b185 100644 --- a/tests/config/sp_block_as_argument3.cfg +++ b/tests/config/sp_block_as_argument3.cfg @@ -1,6 +1,6 @@ -include "obj-c.cfg" -include "sp_block_as_argument.cfg" +include "obj-c.cfg" +include "sp_block_as_argument.cfg" indent_oc_block_msg_from_keyword = false -indent_oc_block_msg_from_colon = false -indent_oc_block_msg_from_brace = true +indent_oc_block_msg_from_colon = false +indent_oc_block_msg_from_brace = true diff --git a/tests/config/sp_block_as_argument4.cfg b/tests/config/sp_block_as_argument4.cfg index 10476f0fe6..3255a893c0 100644 --- a/tests/config/sp_block_as_argument4.cfg +++ b/tests/config/sp_block_as_argument4.cfg @@ -1,7 +1,7 @@ -include "obj-c.cfg" -include "sp_block_as_argument.cfg" +include "obj-c.cfg" +include "sp_block_as_argument.cfg" indent_oc_block_msg_from_keyword = false -indent_oc_block_msg_from_colon = false -indent_oc_block_msg_from_brace = false -indent_oc_block_msg_from_caret = true +indent_oc_block_msg_from_colon = false +indent_oc_block_msg_from_brace = false +indent_oc_block_msg_from_caret = true diff --git a/tests/config/sp_block_as_argument5.cfg b/tests/config/sp_block_as_argument5.cfg index a44b6b66d4..34d25895b3 100644 --- a/tests/config/sp_block_as_argument5.cfg +++ b/tests/config/sp_block_as_argument5.cfg @@ -1,12 +1,12 @@ -include "obj-c.cfg" -include "sp_block_as_argument4.cfg" +include "obj-c.cfg" +include "sp_block_as_argument4.cfg" indent_oc_block_msg_from_keyword = false -indent_oc_block_msg_from_colon = false -indent_oc_block_msg_from_brace = false -indent_oc_block_msg_from_caret = false +indent_oc_block_msg_from_colon = false +indent_oc_block_msg_from_brace = false +indent_oc_block_msg_from_caret = false -indent_oc_msg_colon = 1 # the span for aligning ObjC msg spec (0=don't align) +indent_oc_msg_colon = 1 # the span for aligning ObjC msg spec (0=don't align) #align_oc_msg_colon_first = true -align_oc_msg_spec_span = 20 # the span for aligning ObjC msg spec (0=don't align) +align_oc_msg_spec_span = 20 # the span for aligning ObjC msg spec (0=don't align) indent_oc_block_msg_xcode_style = true diff --git a/tests/config/sp_cmt_cpp_start_add.cfg b/tests/config/sp_cmt_cpp_start_add.cfg index a189715957..20116d2c8e 100644 --- a/tests/config/sp_cmt_cpp_start_add.cfg +++ b/tests/config/sp_cmt_cpp_start_add.cfg @@ -1,3 +1,3 @@ -sp_cmt_cpp_start = add +sp_cmt_cpp_start = add diff --git a/tests/config/sp_cmt_cpp_start_force.cfg b/tests/config/sp_cmt_cpp_start_force.cfg index c0a3d50784..d36da7623e 100644 --- a/tests/config/sp_cmt_cpp_start_force.cfg +++ b/tests/config/sp_cmt_cpp_start_force.cfg @@ -1,2 +1,2 @@ -sp_cmt_cpp_start = force -cmt_width = 40 +sp_cmt_cpp_start = force +cmt_width = 40 diff --git a/tests/config/sp_cmt_cpp_start_remove.cfg b/tests/config/sp_cmt_cpp_start_remove.cfg index 7089c805e8..699dbc8039 100644 --- a/tests/config/sp_cmt_cpp_start_remove.cfg +++ b/tests/config/sp_cmt_cpp_start_remove.cfg @@ -1,3 +1,3 @@ -sp_cmt_cpp_start = remove +sp_cmt_cpp_start = remove diff --git a/tests/config/sp_cond_colon.cfg b/tests/config/sp_cond_colon.cfg index d8eeff2996..3504300bdc 100644 --- a/tests/config/sp_cond_colon.cfg +++ b/tests/config/sp_cond_colon.cfg @@ -1,5 +1,5 @@ -include ben.cfg -sp_cond_question_before = remove -sp_cond_question_after = force -sp_cond_colon_before = remove -sp_cond_colon_after = force +include ben.cfg +sp_cond_question_before = remove +sp_cond_question_after = force +sp_cond_colon_before = remove +sp_cond_colon_after = force diff --git a/tests/config/sp_cparen_oparen-f.cfg b/tests/config/sp_cparen_oparen-f.cfg index 5e814e6a9c..ca70b1245d 100644 --- a/tests/config/sp_cparen_oparen-f.cfg +++ b/tests/config/sp_cparen_oparen-f.cfg @@ -1,3 +1,3 @@ -indent_with_tabs = 0 -indent_class = true -sp_cparen_oparen = force +indent_with_tabs = 0 +indent_class = true +sp_cparen_oparen = force diff --git a/tests/config/sp_cparen_oparen-r.cfg b/tests/config/sp_cparen_oparen-r.cfg index 0d0b611690..c804b862f7 100644 --- a/tests/config/sp_cparen_oparen-r.cfg +++ b/tests/config/sp_cparen_oparen-r.cfg @@ -1,3 +1,3 @@ -indent_with_tabs = 0 -indent_class = true -sp_cparen_oparen = remove +indent_with_tabs = 0 +indent_class = true +sp_cparen_oparen = remove diff --git a/tests/config/sp_enum_paren-f.cfg b/tests/config/sp_enum_paren-f.cfg index 4d82689297..41c7c071ca 100644 --- a/tests/config/sp_enum_paren-f.cfg +++ b/tests/config/sp_enum_paren-f.cfg @@ -1 +1 @@ -sp_enum_paren = force +sp_enum_paren = force diff --git a/tests/config/sp_enum_paren-r.cfg b/tests/config/sp_enum_paren-r.cfg index 538b8e4fab..c26a24e265 100644 --- a/tests/config/sp_enum_paren-r.cfg +++ b/tests/config/sp_enum_paren-r.cfg @@ -1 +1 @@ -sp_enum_paren = remove +sp_enum_paren = remove diff --git a/tests/config/sp_func_call_empty.cfg b/tests/config/sp_func_call_empty.cfg index b34dbc6adc..15cb7f53c4 100644 --- a/tests/config/sp_func_call_empty.cfg +++ b/tests/config/sp_func_call_empty.cfg @@ -1,218 +1,218 @@ -newlines = auto -input_tab_size = 8 -output_tab_size = 3 -string_escape_char = 92 -indent_columns = 3 -indent_with_tabs = 0 -indent_align_string = false -indent_xml_string = 0 -indent_brace = 0 -indent_braces = false -indent_braces_no_func = false -indent_brace_parent = false -indent_namespace = false -indent_class = true -indent_class_colon = false -indent_func_call_param = false -indent_member = 3 -indent_sing_line_comments = 0 -indent_switch_case = 0 -indent_case_brace = 0 -indent_col1_comment = false -indent_label = 2 -indent_access_spec = 2 -indent_paren_nl = false -indent_square_nl = false -sp_arith = force -sp_assign = force -sp_assign_default = remove -sp_bool = force -sp_compare = force -sp_inside_paren = remove -sp_paren_paren = remove -sp_balance_nested_parens = false -sp_paren_brace = ignore -sp_before_ptr_star = force -sp_between_ptr_star = remove -sp_after_ptr_star = remove -sp_before_byref = remove -sp_after_byref = ignore -sp_before_angle = remove -sp_after_angle = force -sp_angle_paren = remove -sp_angle_paren_empty = remove -sp_angle_word = force -sp_before_sparen = force -sp_inside_sparen = remove -sp_after_sparen = force -sp_sparen_brace = ignore -sp_special_semi = ignore -sp_before_semi = remove -sp_before_semi_for = ignore -sp_before_square = ignore -sp_before_squares = ignore -sp_inside_square = remove -sp_after_comma = force -sp_before_comma = remove -sp_after_operator = ignore -sp_after_cast = remove -sp_sizeof_paren = remove -sp_after_tag = ignore -sp_inside_braces_enum = force -sp_inside_braces_struct = force -sp_inside_braces = force -sp_inside_angle = remove -sp_type_func = ignore -sp_func_proto_paren = remove -sp_func_def_paren = remove -sp_inside_fparens = ignore -sp_inside_fparen = remove -sp_square_fparen = ignore -sp_fparen_brace = ignore -sp_func_call_paren = force -sp_func_call_paren_empty = remove -sp_func_class_paren = ignore -sp_return_paren = remove -sp_macro = ignore -sp_before_semi_for_empty = force +newlines = auto +input_tab_size = 8 +output_tab_size = 3 +string_escape_char = 92 +indent_columns = 3 +indent_with_tabs = 0 +indent_align_string = false +indent_xml_string = 0 +indent_brace = 0 +indent_braces = false +indent_braces_no_func = false +indent_brace_parent = false +indent_namespace = false +indent_class = true +indent_class_colon = false +indent_func_call_param = false +indent_member = 3 +indent_sing_line_comments = 0 +indent_switch_case = 0 +indent_case_brace = 0 +indent_col1_comment = false +indent_label = 2 +indent_access_spec = 2 +indent_paren_nl = false +indent_square_nl = false +sp_arith = force +sp_assign = force +sp_assign_default = remove +sp_bool = force +sp_compare = force +sp_inside_paren = remove +sp_paren_paren = remove +sp_balance_nested_parens = false +sp_paren_brace = ignore +sp_before_ptr_star = force +sp_between_ptr_star = remove +sp_after_ptr_star = remove +sp_before_byref = remove +sp_after_byref = ignore +sp_before_angle = remove +sp_after_angle = force +sp_angle_paren = remove +sp_angle_paren_empty = remove +sp_angle_word = force +sp_before_sparen = force +sp_inside_sparen = remove +sp_after_sparen = force +sp_sparen_brace = ignore +sp_special_semi = ignore +sp_before_semi = remove +sp_before_semi_for = ignore +sp_before_square = ignore +sp_before_squares = ignore +sp_inside_square = remove +sp_after_comma = force +sp_before_comma = remove +sp_after_operator = ignore +sp_after_cast = remove +sp_sizeof_paren = remove +sp_after_tag = ignore +sp_inside_braces_enum = force +sp_inside_braces_struct = force +sp_inside_braces = force +sp_inside_angle = remove +sp_type_func = ignore +sp_func_proto_paren = remove +sp_func_def_paren = remove +sp_inside_fparens = ignore +sp_inside_fparen = remove +sp_square_fparen = ignore +sp_fparen_brace = ignore +sp_func_call_paren = force +sp_func_call_paren_empty = remove +sp_func_class_paren = ignore +sp_return_paren = remove +sp_macro = ignore +sp_before_semi_for_empty = force -sp_macro_func = ignore -sp_else_brace = ignore -sp_brace_else = ignore -sp_catch_brace = ignore -sp_brace_catch = ignore -sp_finally_brace = ignore -sp_brace_finally = ignore -sp_try_brace = ignore -sp_getset_brace = ignore -align_keep_tabs = false -align_with_tabs = false -align_on_tabstop = false -align_number_right = true -align_func_params = true -align_var_def_span = 2 -align_var_def_star_style = 1 -align_var_def_thresh = 0 -align_var_def_colon = true -align_var_def_inline = true -align_assign_span = 1 -align_assign_thresh = 0 -align_enum_equ_span = 4 -align_enum_equ_thresh = 0 -align_var_struct_span = 3 -align_struct_init_span = 3 -align_typedef_gap = 3 -align_typedef_span = 5 -align_typedef_star_style = 0 -align_right_cmt_span = 3 -align_func_proto_span = 0 -align_nl_cont = true -align_pp_define_gap = 4 -align_pp_define_span = 3 -code_width = 0 -nl_collapse_empty_body = false -nl_class_leave_one_liners = true -nl_assign_leave_one_liners = true -nl_start_of_file = ignore -nl_start_of_file_min = 0 -nl_end_of_file = ignore -nl_end_of_file_min = 0 -nl_assign_brace = add -nl_func_var_def_blk = 1 -nl_fcall_brace = add -nl_enum_brace = add -nl_struct_brace = add -nl_union_brace = add -nl_if_brace = add -nl_brace_else = add -nl_elseif_brace = ignore -nl_else_brace = add -nl_brace_finally = ignore -nl_finally_brace = add -nl_try_brace = add -nl_getset_brace = ignore -nl_for_brace = add -nl_catch_brace = add -nl_brace_catch = ignore -nl_while_brace = add -nl_do_brace = add -nl_brace_while = remove -nl_switch_brace = add -nl_before_case = true -nl_after_case = false -nl_namespace_brace = ignore -nl_template_class = ignore -nl_class_brace = ignore -nl_class_init_args = ignore -nl_func_type_name = ignore -nl_func_decl_start = ignore -nl_func_decl_args = ignore -nl_func_decl_end = ignore -nl_fdef_brace = add -nl_after_return = true -nl_after_semicolon = true -nl_after_brace_open = true -nl_after_vbrace_open = true -nl_after_access_spec = 1 -nl_assign_leave_one_liners = true -nl_class_leave_one_liners = true -nl_enum_leave_one_liners = true -nl_getset_leave_one_liners = true -nl_define_macro = false -nl_squeeze_ifdef = true -nl_before_if = ignore -nl_after_if = ignore -nl_before_for = ignore -nl_after_for = ignore -nl_before_while = ignore -nl_after_while = ignore -nl_before_switch = ignore -nl_after_switch = ignore -nl_before_do = ignore -nl_after_do = ignore -nl_ds_struct_enum_cmt = false -pos_bool = ignore -pos_class_colon = ignore -ls_for_split_full = false -ls_func_split_full = false -nl_max = 0 -nl_after_func_proto = 0 -nl_after_func_proto_group = 0 -nl_after_func_body = 0 -nl_after_func_body_one_liner = 0 -nl_before_block_comment = 0 -nl_before_c_comment = 0 -nl_before_cpp_comment = 0 -eat_blanks_after_open_brace = true -eat_blanks_before_close_brace = true -mod_full_brace_do = add -mod_full_brace_for = add -mod_full_brace_function = ignore -mod_full_brace_if = add -mod_full_brace_nl = 0 -mod_full_brace_while = add -mod_paren_on_return = add -mod_pawn_semicolon = false -mod_full_paren_if_bool = false -cmt_cpp_group = false -cmt_cpp_nl_start = false -cmt_cpp_nl_end = false -cmt_cpp_to_c = false -cmt_star_cont = true -cmt_sp_before_star_cont = 0 -cmt_sp_after_star_cont = 0 -pp_indent = remove -pp_space = remove -sp_after_dc = remove -sp_before_dc = remove -sp_attribute_paren = remove -sp_defined_paren = force +sp_macro_func = ignore +sp_else_brace = ignore +sp_brace_else = ignore +sp_catch_brace = ignore +sp_brace_catch = ignore +sp_finally_brace = ignore +sp_brace_finally = ignore +sp_try_brace = ignore +sp_getset_brace = ignore +align_keep_tabs = false +align_with_tabs = false +align_on_tabstop = false +align_number_right = true +align_func_params = true +align_var_def_span = 2 +align_var_def_star_style = 1 +align_var_def_thresh = 0 +align_var_def_colon = true +align_var_def_inline = true +align_assign_span = 1 +align_assign_thresh = 0 +align_enum_equ_span = 4 +align_enum_equ_thresh = 0 +align_var_struct_span = 3 +align_struct_init_span = 3 +align_typedef_gap = 3 +align_typedef_span = 5 +align_typedef_star_style = 0 +align_right_cmt_span = 3 +align_func_proto_span = 0 +align_nl_cont = true +align_pp_define_gap = 4 +align_pp_define_span = 3 +code_width = 0 +nl_collapse_empty_body = false +nl_class_leave_one_liners = true +nl_assign_leave_one_liners = true +nl_start_of_file = ignore +nl_start_of_file_min = 0 +nl_end_of_file = ignore +nl_end_of_file_min = 0 +nl_assign_brace = add +nl_func_var_def_blk = 1 +nl_fcall_brace = add +nl_enum_brace = add +nl_struct_brace = add +nl_union_brace = add +nl_if_brace = add +nl_brace_else = add +nl_elseif_brace = ignore +nl_else_brace = add +nl_brace_finally = ignore +nl_finally_brace = add +nl_try_brace = add +nl_getset_brace = ignore +nl_for_brace = add +nl_catch_brace = add +nl_brace_catch = ignore +nl_while_brace = add +nl_do_brace = add +nl_brace_while = remove +nl_switch_brace = add +nl_before_case = true +nl_after_case = false +nl_namespace_brace = ignore +nl_template_class = ignore +nl_class_brace = ignore +nl_class_init_args = ignore +nl_func_type_name = ignore +nl_func_decl_start = ignore +nl_func_decl_args = ignore +nl_func_decl_end = ignore +nl_fdef_brace = add +nl_after_return = true +nl_after_semicolon = true +nl_after_brace_open = true +nl_after_vbrace_open = true +nl_after_access_spec = 1 +nl_assign_leave_one_liners = true +nl_class_leave_one_liners = true +nl_enum_leave_one_liners = true +nl_getset_leave_one_liners = true +nl_define_macro = false +nl_squeeze_ifdef = true +nl_before_if = ignore +nl_after_if = ignore +nl_before_for = ignore +nl_after_for = ignore +nl_before_while = ignore +nl_after_while = ignore +nl_before_switch = ignore +nl_after_switch = ignore +nl_before_do = ignore +nl_after_do = ignore +nl_ds_struct_enum_cmt = false +pos_bool = ignore +pos_class_colon = ignore +ls_for_split_full = false +ls_func_split_full = false +nl_max = 0 +nl_after_func_proto = 0 +nl_after_func_proto_group = 0 +nl_after_func_body = 0 +nl_after_func_body_one_liner = 0 +nl_before_block_comment = 0 +nl_before_c_comment = 0 +nl_before_cpp_comment = 0 +eat_blanks_after_open_brace = true +eat_blanks_before_close_brace = true +mod_full_brace_do = add +mod_full_brace_for = add +mod_full_brace_function = ignore +mod_full_brace_if = add +mod_full_brace_nl = 0 +mod_full_brace_while = add +mod_paren_on_return = add +mod_pawn_semicolon = false +mod_full_paren_if_bool = false +cmt_cpp_group = false +cmt_cpp_nl_start = false +cmt_cpp_nl_end = false +cmt_cpp_to_c = false +cmt_star_cont = true +cmt_sp_before_star_cont = 0 +cmt_sp_after_star_cont = 0 +pp_indent = remove +pp_space = remove +sp_after_dc = remove +sp_before_dc = remove +sp_attribute_paren = remove +sp_defined_paren = force mod_add_long_function_closebrace_comment = 40 -mod_add_long_switch_closebrace_comment = 40 -mod_remove_extra_semicolon = TRUE +mod_add_long_switch_closebrace_comment = 40 +mod_remove_extra_semicolon = TRUE -sp_brace_typedef = force -nl_after_brace_close = TRUE -sp_before_ellipsis = remove +sp_brace_typedef = force +nl_after_brace_close = TRUE +sp_before_ellipsis = remove diff --git a/tests/config/sp_func_class_empty.cfg b/tests/config/sp_func_class_empty.cfg index 83fcd16dec..4ea13efc81 100644 --- a/tests/config/sp_func_class_empty.cfg +++ b/tests/config/sp_func_class_empty.cfg @@ -1,4 +1,4 @@ -include sp_func_call_empty.cfg +include sp_func_call_empty.cfg -sp_func_class_paren = remove -sp_func_class_paren_empty = force +sp_func_class_paren = remove +sp_func_class_paren_empty = force diff --git a/tests/config/sp_func_def_empty.cfg b/tests/config/sp_func_def_empty.cfg index 1784cb235d..ef8497c79b 100644 --- a/tests/config/sp_func_def_empty.cfg +++ b/tests/config/sp_func_def_empty.cfg @@ -1,4 +1,4 @@ -include sp_func_call_empty.cfg +include sp_func_call_empty.cfg -sp_func_def_paren = remove -sp_func_def_paren_empty = force +sp_func_def_paren = remove +sp_func_def_paren_empty = force diff --git a/tests/config/sp_func_proto_empty.cfg b/tests/config/sp_func_proto_empty.cfg index 1101714abc..c9c3a7288f 100644 --- a/tests/config/sp_func_proto_empty.cfg +++ b/tests/config/sp_func_proto_empty.cfg @@ -1,4 +1,4 @@ -include sp_func_call_empty.cfg +include sp_func_call_empty.cfg -sp_func_proto_paren = remove -sp_func_proto_paren_empty = force +sp_func_proto_paren = remove +sp_func_proto_paren_empty = force diff --git a/tests/config/sp_inside_type_brace_init_lst-f.cfg b/tests/config/sp_inside_type_brace_init_lst-f.cfg index 23245f1063..3def3985f3 100644 --- a/tests/config/sp_inside_type_brace_init_lst-f.cfg +++ b/tests/config/sp_inside_type_brace_init_lst-f.cfg @@ -1 +1 @@ -sp_inside_type_brace_init_lst = force \ No newline at end of file +sp_inside_type_brace_init_lst = force diff --git a/tests/config/sp_inside_type_brace_init_lst-r.cfg b/tests/config/sp_inside_type_brace_init_lst-r.cfg index c65ec23942..ca9d93b022 100644 --- a/tests/config/sp_inside_type_brace_init_lst-r.cfg +++ b/tests/config/sp_inside_type_brace_init_lst-r.cfg @@ -1 +1 @@ -sp_inside_type_brace_init_lst = remove \ No newline at end of file +sp_inside_type_brace_init_lst = remove diff --git a/tests/config/sp_skip_vbrace_tokens.cfg b/tests/config/sp_skip_vbrace_tokens.cfg index e65f9f2b3e..2c3f4ce13b 100644 --- a/tests/config/sp_skip_vbrace_tokens.cfg +++ b/tests/config/sp_skip_vbrace_tokens.cfg @@ -1,5 +1,5 @@ # test for issue #546 -input_tab_size = 4 -indent_columns = 4 -indent_with_tabs = 0 -sp_skip_vbrace_tokens = true +input_tab_size = 4 +indent_columns = 4 +indent_with_tabs = 0 +sp_skip_vbrace_tokens = true diff --git a/tests/config/sp_this_paren.cfg b/tests/config/sp_this_paren.cfg index 1f039cdeec..468d7981d2 100644 --- a/tests/config/sp_this_paren.cfg +++ b/tests/config/sp_this_paren.cfg @@ -1,2 +1,2 @@ -sp_this_paren = force -sp_super_paren = force +sp_this_paren = force +sp_super_paren = force diff --git a/tests/config/sp_throw_paren-f.cfg b/tests/config/sp_throw_paren-f.cfg index 8d0b610f2e..6d8af673e6 100644 --- a/tests/config/sp_throw_paren-f.cfg +++ b/tests/config/sp_throw_paren-f.cfg @@ -1,3 +1,3 @@ -sp_throw_paren = force +sp_throw_paren = force diff --git a/tests/config/sp_throw_paren-r.cfg b/tests/config/sp_throw_paren-r.cfg index 0143383bf4..64ef1aff31 100644 --- a/tests/config/sp_throw_paren-r.cfg +++ b/tests/config/sp_throw_paren-r.cfg @@ -1,3 +1,3 @@ -sp_throw_paren = remove +sp_throw_paren = remove diff --git a/tests/config/sp_type_brace_init_lst-f.cfg b/tests/config/sp_type_brace_init_lst-f.cfg index 4fac1d19f2..712ce13b72 100644 --- a/tests/config/sp_type_brace_init_lst-f.cfg +++ b/tests/config/sp_type_brace_init_lst-f.cfg @@ -1 +1 @@ -sp_type_brace_init_lst = force \ No newline at end of file +sp_type_brace_init_lst = force diff --git a/tests/config/sp_type_brace_init_lst-r.cfg b/tests/config/sp_type_brace_init_lst-r.cfg index 73c26117da..b6c01fa9a6 100644 --- a/tests/config/sp_type_brace_init_lst-r.cfg +++ b/tests/config/sp_type_brace_init_lst-r.cfg @@ -1 +1 @@ -sp_type_brace_init_lst = remove \ No newline at end of file +sp_type_brace_init_lst = remove diff --git a/tests/config/sp_word_brace_force.cfg b/tests/config/sp_word_brace_force.cfg index c591005919..298419346a 100644 --- a/tests/config/sp_word_brace_force.cfg +++ b/tests/config/sp_word_brace_force.cfg @@ -1,2 +1,2 @@ -sp_word_brace = force -sp_word_brace_ns = remove +sp_word_brace = force +sp_word_brace_ns = remove diff --git a/tests/config/sp_word_brace_remove.cfg b/tests/config/sp_word_brace_remove.cfg index 63752917de..709daa0950 100644 --- a/tests/config/sp_word_brace_remove.cfg +++ b/tests/config/sp_word_brace_remove.cfg @@ -1,2 +1,2 @@ -sp_word_brace = remove -sp_word_brace_ns = force +sp_word_brace = remove +sp_word_brace_ns = force diff --git a/tests/config/squeeze_ifdef.cfg b/tests/config/squeeze_ifdef.cfg index 3631194df1..b9a55e2c1e 100644 --- a/tests/config/squeeze_ifdef.cfg +++ b/tests/config/squeeze_ifdef.cfg @@ -1,3 +1,3 @@ -include "no_squeeze_ifdef.cfg" +include "no_squeeze_ifdef.cfg" -nl_squeeze_ifdef = true +nl_squeeze_ifdef = true diff --git a/tests/config/squeeze_ifdef_top.cfg b/tests/config/squeeze_ifdef_top.cfg index ba12228338..5dafc518e0 100644 --- a/tests/config/squeeze_ifdef_top.cfg +++ b/tests/config/squeeze_ifdef_top.cfg @@ -1,3 +1,3 @@ -include "squeeze_ifdef.cfg" +include "squeeze_ifdef.cfg" -nl_squeeze_ifdef_top_level = true +nl_squeeze_ifdef_top_level = true diff --git a/tests/config/star_pos-0.cfg b/tests/config/star_pos-0.cfg index a3af9d20c4..eddacd9a9b 100644 --- a/tests/config/star_pos-0.cfg +++ b/tests/config/star_pos-0.cfg @@ -4,26 +4,26 @@ # $Id: byref-left.cfg 803 2007-07-25 00:36:25Z bengardner $ # -indent_columns = 3 +indent_columns = 3 -align_typedef_span = 5 -align_typedef_gap = 3 -align_typedef_star_style = 0 -align_typedef_amp_style = 0 -align_typedef_func = 1 +align_typedef_span = 5 +align_typedef_gap = 3 +align_typedef_star_style = 0 +align_typedef_amp_style = 0 +align_typedef_func = 1 -align_var_def_span = 2 -align_var_def_star_style = 0 -align_var_def_amp_style = 0 +align_var_def_span = 2 +align_var_def_star_style = 0 +align_var_def_amp_style = 0 -align_var_struct_span = 2 +align_var_struct_span = 2 -align_func_proto_span = 2 +align_func_proto_span = 2 -sp_before_ptr_star = remove -sp_between_ptr_star = remove -sp_after_ptr_star = force +sp_before_ptr_star = remove +sp_between_ptr_star = remove +sp_after_ptr_star = force -sp_before_byref = remove -sp_after_byref = force +sp_before_byref = remove +sp_after_byref = force diff --git a/tests/config/star_pos-1.cfg b/tests/config/star_pos-1.cfg index 7e7f485c1f..d6fac6035a 100644 --- a/tests/config/star_pos-1.cfg +++ b/tests/config/star_pos-1.cfg @@ -4,25 +4,25 @@ # $Id: byref-left.cfg 803 2007-07-25 00:36:25Z bengardner $ # -indent_columns = 3 +indent_columns = 3 -align_typedef_span = 2 -align_typedef_gap = 3 -align_typedef_star_style = 1 -align_typedef_amp_style = 1 +align_typedef_span = 2 +align_typedef_gap = 3 +align_typedef_star_style = 1 +align_typedef_amp_style = 1 -align_var_def_span = 2 -align_var_def_star_style = 1 -align_var_def_amp_style = 1 +align_var_def_span = 2 +align_var_def_star_style = 1 +align_var_def_amp_style = 1 -align_var_struct_span = 2 +align_var_struct_span = 2 -align_func_proto_span = 2 +align_func_proto_span = 2 -sp_before_ptr_star = force -sp_between_ptr_star = remove -sp_after_ptr_star = remove +sp_before_ptr_star = force +sp_between_ptr_star = remove +sp_after_ptr_star = remove -sp_before_byref = force -sp_after_byref = remove +sp_before_byref = force +sp_after_byref = remove diff --git a/tests/config/star_pos-2.cfg b/tests/config/star_pos-2.cfg index 0b16844c76..2e11b5ac82 100644 --- a/tests/config/star_pos-2.cfg +++ b/tests/config/star_pos-2.cfg @@ -4,25 +4,25 @@ # $Id: byref-left.cfg 803 2007-07-25 00:36:25Z bengardner $ # -indent_columns = 3 +indent_columns = 3 -align_typedef_span = 2 -align_typedef_gap = 3 -align_typedef_star_style = 2 -align_typedef_amp_style = 2 +align_typedef_span = 2 +align_typedef_gap = 3 +align_typedef_star_style = 2 +align_typedef_amp_style = 2 -align_var_def_span = 2 -align_var_def_star_style = 2 -align_var_def_amp_style = 2 +align_var_def_span = 2 +align_var_def_star_style = 2 +align_var_def_amp_style = 2 -align_var_struct_span = 2 +align_var_struct_span = 2 -align_func_proto_span = 2 +align_func_proto_span = 2 -sp_before_ptr_star = force -sp_between_ptr_star = remove -sp_after_ptr_star = remove +sp_before_ptr_star = force +sp_between_ptr_star = remove +sp_after_ptr_star = remove -sp_before_byref = force -sp_after_byref = remove +sp_before_byref = force +sp_after_byref = remove diff --git a/tests/config/stdcall.cfg b/tests/config/stdcall.cfg index 6260329c8d..29727227a4 100644 --- a/tests/config/stdcall.cfg +++ b/tests/config/stdcall.cfg @@ -1 +1 @@ -sp_arith=add +sp_arith = add diff --git a/tests/config/string_replace_tab_chars.cfg b/tests/config/string_replace_tab_chars.cfg index 1fcc5cd12f..ddaa7cc78c 100644 --- a/tests/config/string_replace_tab_chars.cfg +++ b/tests/config/string_replace_tab_chars.cfg @@ -1 +1 @@ -string_replace_tab_chars=true +string_replace_tab_chars = true diff --git a/tests/config/string_replace_tab_chars_f.cfg b/tests/config/string_replace_tab_chars_f.cfg index d47152cd72..68d0d7e5f7 100644 --- a/tests/config/string_replace_tab_chars_f.cfg +++ b/tests/config/string_replace_tab_chars_f.cfg @@ -1 +1 @@ -string_replace_tab_chars=false +string_replace_tab_chars = false diff --git a/tests/config/tab-0-11.cfg b/tests/config/tab-0-11.cfg index f3db265d13..4452bb4bc4 100644 --- a/tests/config/tab-0-11.cfg +++ b/tests/config/tab-0-11.cfg @@ -1,2 +1,2 @@ -indent_with_tabs=0 -indent_columns=11 +indent_with_tabs = 0 +indent_columns = 11 diff --git a/tests/config/tab-1-11.cfg b/tests/config/tab-1-11.cfg index 2c1f9ab4ed..f5cbdb099a 100644 --- a/tests/config/tab-1-11.cfg +++ b/tests/config/tab-1-11.cfg @@ -1 +1 @@ -indent_columns=11 +indent_columns = 11 diff --git a/tests/config/tcf.cfg b/tests/config/tcf.cfg index d9b61be495..762ce7dd7c 100644 --- a/tests/config/tcf.cfg +++ b/tests/config/tcf.cfg @@ -1,5 +1,5 @@ -nl_finally_brace = force -nl_after_try_catch_finally = 3 -nl_between_get_set = 2 -nl_around_cs_property = 2 +nl_finally_brace = force +nl_after_try_catch_finally = 3 +nl_between_get_set = 2 +nl_around_cs_property = 2 diff --git a/tests/config/template4.cfg b/tests/config/template4.cfg index adaa3532e9..9cab65174c 100644 --- a/tests/config/template4.cfg +++ b/tests/config/template4.cfg @@ -1,2 +1,2 @@ -sp_func_call_paren = remove +sp_func_call_paren = remove diff --git a/tests/config/template_sp-force.cfg b/tests/config/template_sp-force.cfg index 1a234b90cb..2446497386 100644 --- a/tests/config/template_sp-force.cfg +++ b/tests/config/template_sp-force.cfg @@ -2,26 +2,26 @@ # Forces a newline between template '>' and class # -indent_columns = 3 +indent_columns = 3 -sp_before_byref = remove -sp_after_byref = force +sp_before_byref = remove +sp_after_byref = force -indent_class = True +indent_class = True -sp_func_def_paren = remove -sp_func_proto_paren = remove -sp_after_operator = force -sp_before_angle = force -sp_inside_angle = force -sp_after_angle = force -sp_angle_word = force -sp_angle_paren = force -sp_angle_paren_empty = force -sp_arith = force -sp_compare = remove # just to show a difference -sp_template_angle = remove -sp_inside_braces = force -sp_inside_braces_struct = force +sp_func_def_paren = remove +sp_func_proto_paren = remove +sp_after_operator = force +sp_before_angle = force +sp_inside_angle = force +sp_after_angle = force +sp_angle_word = force +sp_angle_paren = force +sp_angle_paren_empty = force +sp_arith = force +sp_compare = remove # just to show a difference +sp_template_angle = remove +sp_inside_braces = force +sp_inside_braces_struct = force -tok_split_gte = true +tok_split_gte = true diff --git a/tests/config/template_sp-remove.cfg b/tests/config/template_sp-remove.cfg index e36f0a6b46..109a62e405 100644 --- a/tests/config/template_sp-remove.cfg +++ b/tests/config/template_sp-remove.cfg @@ -2,26 +2,26 @@ # remove spaces around template defs # -indent_columns = 3 +indent_columns = 3 -sp_before_byref = remove -sp_after_byref = force +sp_before_byref = remove +sp_after_byref = force -indent_class = True +indent_class = True -sp_func_def_paren = remove -sp_func_proto_paren = remove -sp_func_call_paren = remove -sp_after_operator = remove -sp_before_angle = remove -sp_inside_angle = remove -sp_after_angle = remove -sp_angle_word = remove -sp_angle_paren = remove -sp_angle_paren_empty = remove -sp_arith = force -sp_compare = force -sp_inside_braces = force -sp_inside_braces_struct = force +sp_func_def_paren = remove +sp_func_proto_paren = remove +sp_func_call_paren = remove +sp_after_operator = remove +sp_before_angle = remove +sp_inside_angle = remove +sp_after_angle = remove +sp_angle_word = remove +sp_angle_paren = remove +sp_angle_paren_empty = remove +sp_arith = force +sp_compare = force +sp_inside_braces = force +sp_inside_braces_struct = force -tok_split_gte = true +tok_split_gte = true diff --git a/tests/config/ternary_short.cfg b/tests/config/ternary_short.cfg index 68be1aba32..641b7e76a5 100644 --- a/tests/config/ternary_short.cfg +++ b/tests/config/ternary_short.cfg @@ -1,5 +1,5 @@ -sp_cond_question_after = add -sp_cond_question_before = add -sp_cond_colon_before = add -sp_cond_colon_after = add -sp_cond_ternary_short = remove +sp_cond_question_after = add +sp_cond_question_before = add +sp_cond_colon_before = add +sp_cond_colon_after = add +sp_cond_ternary_short = remove diff --git a/tests/config/toggle_processing_cmt.cfg b/tests/config/toggle_processing_cmt.cfg index 2c776151ff..da7f6675ed 100644 --- a/tests/config/toggle_processing_cmt.cfg +++ b/tests/config/toggle_processing_cmt.cfg @@ -1 +1 @@ -disable_processing_cmt=' **ABC**' +disable_processing_cmt = ' **ABC**' diff --git a/tests/config/toggle_processing_cmt2.cfg b/tests/config/toggle_processing_cmt2.cfg index a4c2ef0dc2..064fec2a30 100644 --- a/tests/config/toggle_processing_cmt2.cfg +++ b/tests/config/toggle_processing_cmt2.cfg @@ -1 +1 @@ -enable_processing_cmt=' ??DEF??' +enable_processing_cmt = ' ??DEF??' diff --git a/tests/config/type_wrap.cfg b/tests/config/type_wrap.cfg index 343cdecb14..0d5e5e7369 100644 --- a/tests/config/type_wrap.cfg +++ b/tests/config/type_wrap.cfg @@ -1,8 +1,8 @@ -set TYPE_WRAP STACK_OF -sp_before_ptr_star = force -sp_after_ptr_star = remove +set TYPE_WRAP STACK_OF +sp_before_ptr_star = force +sp_after_ptr_star = remove -sp_assign = force +sp_assign = force diff --git a/tests/config/var_def_gap.cfg b/tests/config/var_def_gap.cfg index 6edd9c29b7..62aa809438 100644 --- a/tests/config/var_def_gap.cfg +++ b/tests/config/var_def_gap.cfg @@ -1,19 +1,19 @@ -align_var_def_span = 3 -align_var_def_gap = 5 -align_var_def_star_style = 2 -align_var_def_amp_style = 2 -sp_after_ptr_star = remove -sp_between_ptr_star = remove -sp_before_ptr_star = force -sp_after_byref = force -sp_before_byref = remove +align_var_def_span = 3 +align_var_def_gap = 5 +align_var_def_star_style = 2 +align_var_def_amp_style = 2 +sp_after_ptr_star = remove +sp_between_ptr_star = remove +sp_before_ptr_star = force +sp_after_byref = force +sp_before_byref = remove # align_pp_define_span = 3 # align_pp_define_gap = 3 -align_number_right = true +align_number_right = true -align_assign_span = 1 +align_assign_span = 1 -align_typedef_span = 2 +align_typedef_span = 2 diff --git a/tests/config/verbatim_strings.cfg b/tests/config/verbatim_strings.cfg index 7719291736..2a15848ce7 100644 --- a/tests/config/verbatim_strings.cfg +++ b/tests/config/verbatim_strings.cfg @@ -1,9 +1,9 @@ -input_tab_size=4 +input_tab_size = 4 -indent_columns=4 -indent_with_tabs=0 -indent_class=true +indent_columns = 4 +indent_with_tabs = 0 +indent_class = true -string_replace_tab_chars=true +string_replace_tab_chars = true -warn_level_tabs_found_in_verbatim_string_literals=3 +warn_level_tabs_found_in_verbatim_string_literals = 3 diff --git a/tests/config/verbatim_strings.rerun.cfg b/tests/config/verbatim_strings.rerun.cfg index 8d8dffb785..69846297ac 100644 --- a/tests/config/verbatim_strings.rerun.cfg +++ b/tests/config/verbatim_strings.rerun.cfg @@ -1,2 +1,2 @@ -include "verbatim_strings.cfg" -warn_level_tabs_found_in_verbatim_string_literals=1 \ No newline at end of file +include "verbatim_strings.cfg" +warn_level_tabs_found_in_verbatim_string_literals = 1 diff --git a/tests/config/wessex.cfg b/tests/config/wessex.cfg index e490f7ee69..e01a8302a8 100644 --- a/tests/config/wessex.cfg +++ b/tests/config/wessex.cfg @@ -4,19 +4,19 @@ # # The type of line endings -newlines = auto # auto/lf/crlf/cr +newlines = auto # auto/lf/crlf/cr # The original size of tabs in the input -input_tab_size = 4 # number +input_tab_size = 4 # number # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 4 # number +output_tab_size = 4 # number # The ascii value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # number # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # number # # Indenting @@ -24,641 +24,641 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 4 # number +indent_columns = 4 # number # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # number # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # false/true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 4 # number +indent_xml_string = 4 # number # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # number # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # false/true # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # false/true # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # false/true # Whether the 'namespace' body is indented -indent_namespace = true # false/true +indent_namespace = true # false/true # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # false/true # Whether to indent the stuff after a leading class colon -indent_class_colon = true # false/true +indent_class_colon = true # false/true # Whether to indent continued function call parameters one indent level (true) or aligns instead of indent (false) -indent_func_call_param = false # false/true +indent_func_call_param = false # false/true # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 0 # number +indent_member = 0 # number # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # number # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 4 # number +indent_switch_case = 4 # number # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # number # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 0 # number +indent_case_brace = 0 # number # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # false/true # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # number # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # number # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # false/true # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # false/true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # ignore/add/remove/force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # ignore/add/remove/force # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # ignore/add/remove/force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # ignore/add/remove/force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # ignore/add/remove/force # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # ignore/add/remove/force # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # false/true # Add or remove space between ')' and '{' -sp_paren_brace = force # ignore/add/remove/force +sp_paren_brace = force # ignore/add/remove/force # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # ignore/add/remove/force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # ignore/add/remove/force # Add or remove space after pointer star '*' -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # ignore/add/remove/force # Add or remove space before reference sign '&' -sp_before_byref = force # ignore/add/remove/force +sp_before_byref = force # ignore/add/remove/force # Add or remove space after reference sign '&' -sp_after_byref = remove # ignore/add/remove/force +sp_after_byref = remove # ignore/add/remove/force # Add or remove space before '<>' -sp_before_angle = remove # ignore/add/remove/force +sp_before_angle = remove # ignore/add/remove/force # Add or remove space after '<>' -sp_after_angle = force # ignore/add/remove/force +sp_after_angle = force # ignore/add/remove/force # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = remove # ignore/add/remove/force -sp_angle_paren_empty = remove +sp_angle_paren = remove # ignore/add/remove/force +sp_angle_paren_empty = remove # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = force # ignore/add/remove/force +sp_angle_word = force # ignore/add/remove/force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # ignore/add/remove/force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # ignore/add/remove/force # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # ignore/add/remove/force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = force # ignore/add/remove/force +sp_sparen_brace = force # ignore/add/remove/force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = remove # ignore/add/remove/force +sp_special_semi = remove # ignore/add/remove/force # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # ignore/add/remove/force # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = remove # ignore/add/remove/force +sp_before_semi_for = remove # ignore/add/remove/force # Add or remove space before a semicolon of an empty part of a for statment. -sp_before_semi_for_empty = remove # ignore/add/remove/force +sp_before_semi_for_empty = remove # ignore/add/remove/force # Add or remove space before '[' (except '[]') -sp_before_square = remove # ignore/add/remove/force +sp_before_square = remove # ignore/add/remove/force # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # ignore/add/remove/force # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # ignore/add/remove/force # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # ignore/add/remove/force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # ignore/add/remove/force # Add or remove space between 'operator' and operator sign -sp_after_operator = force # ignore/add/remove/force +sp_after_operator = force # ignore/add/remove/force # Add or remove space after cast -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # ignore/add/remove/force # Add or remove spaces inside cast parens -sp_inside_paren_cast = remove # ignore/add/remove/force +sp_inside_paren_cast = remove # ignore/add/remove/force # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # ignore/add/remove/force # Add or remove space after the tag keyword (Pawn) -sp_after_tag = remove # ignore/add/remove/force +sp_after_tag = remove # ignore/add/remove/force # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = remove # ignore/add/remove/force +sp_inside_braces_enum = remove # ignore/add/remove/force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = remove # ignore/add/remove/force +sp_inside_braces_struct = remove # ignore/add/remove/force # Add or remove space inside '{' and '}' -sp_inside_braces = remove # ignore/add/remove/force +sp_inside_braces = remove # ignore/add/remove/force # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # ignore/add/remove/force # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = force # ignore/add/remove/force +sp_type_func = force # ignore/add/remove/force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # ignore/add/remove/force # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # ignore/add/remove/force # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # ignore/add/remove/force # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # ignore/add/remove/force # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = remove # ignore/add/remove/force +sp_square_fparen = remove # ignore/add/remove/force # Add or remove space between ')' and '{' of function -sp_fparen_brace = force # ignore/add/remove/force +sp_fparen_brace = force # ignore/add/remove/force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # ignore/add/remove/force # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # ignore/add/remove/force # Add or remove space between 'return' and '(' -sp_return_paren = force # ignore/add/remove/force +sp_return_paren = force # ignore/add/remove/force # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # ignore/add/remove/force # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # ignore/add/remove/force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = ignore # ignore/add/remove/force +sp_else_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # ignore/add/remove/force # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # ignore/add/remove/force # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # ignore/add/remove/force # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # ignore/add/remove/force # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # ignore/add/remove/force # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # ignore/add/remove/force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # false/true # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # false/true # Whether to right-align numbers -align_number_right = true # false/true +align_number_right = true # false/true # Align variable definitions in prototypes and functions -align_func_params = true # false/true +align_func_params = true # false/true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 4 # number +align_var_def_span = 4 # number # How to align the star in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_star_style = 1 # number +align_var_def_star_style = 1 # number # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 4 # number +align_var_def_thresh = 4 # number # Whether to align the colon in struct bit fields -align_var_def_colon = true # false/true +align_var_def_colon = true # false/true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = true # false/true +align_var_def_inline = true # false/true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 4 # number +align_assign_span = 4 # number # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 4 # number +align_assign_thresh = 4 # number # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 4 # number +align_enum_equ_span = 4 # number # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 4 # number +align_enum_equ_thresh = 4 # number # The span for aligning struct/union (0=don't align) -align_var_struct_span = 4 # number +align_var_struct_span = 4 # number # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 4 # number +align_struct_init_span = 4 # number # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number +align_typedef_gap = 0 # number # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 4 # number +align_typedef_span = 4 # number # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 1 # number +align_typedef_star_style = 1 # number # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 4 # number +align_right_cmt_span = 4 # number # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 4 # number +align_func_proto_span = 4 # number # Whether to align macros wrapped with a backslash and a newline -align_nl_cont = true # false/true +align_nl_cont = true # false/true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 0 # number +align_pp_define_gap = 0 # number # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 4 # number +align_pp_define_span = 4 # number # # Newline adding and removing options # # Try to limit code width to N number of columns -code_width = 120 # number +code_width = 120 # number # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # false/true # Don't touch one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = false # false/true +nl_assign_leave_one_liners = false # false/true # Don't touch one-line function bodies inside a class xx { } body -nl_class_leave_one_liners = false # false/true +nl_class_leave_one_liners = false # false/true # Add or remove newlines at the start of the file -nl_start_of_file = ignore # ignore/add/remove/force +nl_start_of_file = ignore # ignore/add/remove/force # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # number # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # ignore/add/remove/force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # number # Add or remove newline between '=' and '{' -nl_assign_brace = force # ignore/add/remove/force +nl_assign_brace = force # ignore/add/remove/force # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # number # Add or remove newline between function call and '(' -nl_fcall_brace = remove # ignore/add/remove/force +nl_fcall_brace = remove # ignore/add/remove/force # Add or remove newline between 'enum' and '{' -nl_enum_brace = force # ignore/add/remove/force +nl_enum_brace = force # ignore/add/remove/force # Add or remove newline between 'struct and '{' -nl_struct_brace = force # ignore/add/remove/force +nl_struct_brace = force # ignore/add/remove/force # Add or remove newline between 'union' and '{' -nl_union_brace = force # ignore/add/remove/force +nl_union_brace = force # ignore/add/remove/force # Add or remove newline between 'if' and '{' -nl_if_brace = force # ignore/add/remove/force +nl_if_brace = force # ignore/add/remove/force # Add or remove newline between '}' and 'else' -nl_brace_else = force # ignore/add/remove/force +nl_brace_else = force # ignore/add/remove/force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = force # ignore/add/remove/force +nl_elseif_brace = force # ignore/add/remove/force # Add or remove newline between 'else' and '{' -nl_else_brace = force # ignore/add/remove/force +nl_else_brace = force # ignore/add/remove/force # Add or remove newline between '}' and 'finally' -nl_brace_finally = ignore # ignore/add/remove/force +nl_brace_finally = ignore # ignore/add/remove/force # Add or remove newline between 'finally' and '{' -nl_finally_brace = ignore # ignore/add/remove/force +nl_finally_brace = ignore # ignore/add/remove/force # Add or remove newline between 'try' and '{' -nl_try_brace = force # ignore/add/remove/force +nl_try_brace = force # ignore/add/remove/force # Add or remove newline between get/set and '{' -nl_getset_brace = ignore # ignore/add/remove/force +nl_getset_brace = ignore # ignore/add/remove/force # Add or remove newline between 'for' and '{' -nl_for_brace = force # ignore/add/remove/force +nl_for_brace = force # ignore/add/remove/force # Add or remove newline between 'catch' and '{' -nl_catch_brace = force # ignore/add/remove/force +nl_catch_brace = force # ignore/add/remove/force # Add or remove newline between '}' and 'catch' -nl_brace_catch = force # ignore/add/remove/force +nl_brace_catch = force # ignore/add/remove/force # Add or remove newline between 'while' and '{' -nl_while_brace = force # ignore/add/remove/force +nl_while_brace = force # ignore/add/remove/force # Add or remove newline between 'do' and '{' -nl_do_brace = force # ignore/add/remove/force +nl_do_brace = force # ignore/add/remove/force # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # ignore/add/remove/force # Add or remove newline between 'switch' and '{' -nl_switch_brace = force # ignore/add/remove/force +nl_switch_brace = force # ignore/add/remove/force # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # false/true # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # false/true # Newline between namespace and { -nl_namespace_brace = force # ignore/add/remove/force +nl_namespace_brace = force # ignore/add/remove/force # Add or remove newline between 'template<>' and 'class' -nl_template_class = force # ignore/add/remove/force +nl_template_class = force # ignore/add/remove/force # Add or remove newline between 'class' and '{' -nl_class_brace = force # ignore/add/remove/force +nl_class_brace = force # ignore/add/remove/force # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = force # ignore/add/remove/force +nl_class_init_args = force # ignore/add/remove/force # Add or remove newline between return type and function name in definition -nl_func_type_name = remove # ignore/add/remove/force +nl_func_type_name = remove # ignore/add/remove/force # Add or remove newline after '(' in a function declaration -nl_func_decl_start = remove # ignore/add/remove/force +nl_func_decl_start = remove # ignore/add/remove/force # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = force # ignore/add/remove/force +nl_func_decl_args = force # ignore/add/remove/force # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = remove # ignore/add/remove/force +nl_func_decl_end = remove # ignore/add/remove/force # Add or remove newline between function signature and '{' -nl_fdef_brace = force # ignore/add/remove/force +nl_fdef_brace = force # ignore/add/remove/force # Whether to put a newline after 'return' statement -nl_after_return = false # false/true +nl_after_return = false # false/true # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # false/true # Whether to put a newline after brace open -nl_after_brace_open = true # false/true +nl_after_brace_open = true # false/true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # false/true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = true # false/true +nl_squeeze_ifdef = true # false/true # Add or remove newline before 'if' -nl_before_if = force # ignore/add/remove/force +nl_before_if = force # ignore/add/remove/force # Add or remove newline after 'if' -nl_after_if = remove # ignore/add/remove/force +nl_after_if = remove # ignore/add/remove/force # Add or remove newline before 'for' -nl_before_for = force # ignore/add/remove/force +nl_before_for = force # ignore/add/remove/force # Add or remove newline after 'for' -nl_after_for = remove # ignore/add/remove/force +nl_after_for = remove # ignore/add/remove/force # Add or remove newline before 'while' -nl_before_while = force # ignore/add/remove/force +nl_before_while = force # ignore/add/remove/force # Add or remove newline after 'while' -nl_after_while = remove # ignore/add/remove/force +nl_after_while = remove # ignore/add/remove/force # Add or remove newline before 'switch' -nl_before_switch = force # ignore/add/remove/force +nl_before_switch = force # ignore/add/remove/force # Add or remove newline after 'switch' -nl_after_switch = remove # ignore/add/remove/force +nl_after_switch = remove # ignore/add/remove/force # Add or remove newline before 'do' -nl_before_do = force # ignore/add/remove/force +nl_before_do = force # ignore/add/remove/force # Add or remove newline after 'do' -nl_after_do = remove # ignore/add/remove/force +nl_after_do = remove # ignore/add/remove/force # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # false/true # # Positioning options # # The position of boolean operators in wrapped expressions -pos_bool = trail # ignore/lead/trail +pos_bool = trail # ignore/lead/trail # The position of the comma in wrapped expressions -pos_comma = trail # ignore/lead/trail +pos_comma = trail # ignore/lead/trail # The position of colons between constructor and member initialization -pos_class_colon = lead # ignore/lead/trail +pos_class_colon = lead # ignore/lead/trail # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = true # false/true +ls_for_split_full = true # false/true # Whether to fully split long function protos/calls at commas -ls_func_split_full = true # false/true +ls_func_split_full = true # false/true # # Blank line options # # The maximum consecutive newlines -nl_max = 2 # number +nl_max = 2 # number # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 1 # number +nl_after_func_proto = 1 # number # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # number # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # number # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 2 # number +nl_after_func_body_one_liner = 2 # number # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # number # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 2 # number +nl_before_c_comment = 2 # number # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 2 # number +nl_before_cpp_comment = 2 # number # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # false/true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # false/true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # ignore/add/remove/force # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # ignore/add/remove/force # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = add # ignore/add/remove/force +mod_full_brace_function = add # ignore/add/remove/force # Add or remove braces on single-line 'if' statement -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # ignore/add/remove/force # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # number # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # ignore/add/remove/force # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = remove # ignore/add/remove/force +mod_paren_on_return = remove # ignore/add/remove/force # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # false/true # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = true # false/true +mod_full_paren_if_bool = true # false/true # # Comment modifications # # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # false/true # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # false/true # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # false/true # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # false/true # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # false/true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # number # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # number # # Preprocessor options # # Add or remove indent of preprocessor directives -pp_indent = remove # ignore/add/remove/force +pp_indent = remove # ignore/add/remove/force # Add or remove space between # and, say, define -pp_space = remove # ignore/add/remove/force +pp_space = remove # ignore/add/remove/force # You can force a token to be a type with the 'type' option. # Example: @@ -671,7 +671,7 @@ pp_space = remove # ignore/add/remove/force # macro-open BEGIN_MESSAGE_MAP # macro-close END_MESSAGE_MAP -macro-open BEGIN_TEMPLATE_MESSAGE_MAP -macro-open BEGIN_MESSAGE_MAP -macro-close END_MESSAGE_MAP +macro-open BEGIN_TEMPLATE_MESSAGE_MAP +macro-open BEGIN_MESSAGE_MAP +macro-close END_MESSAGE_MAP diff --git a/tests/config/width-2.cfg b/tests/config/width-2.cfg index d6eca5592a..0ada9786d7 100644 --- a/tests/config/width-2.cfg +++ b/tests/config/width-2.cfg @@ -2,36 +2,36 @@ # width stuff # -indent_with_tabs = 0 -input_tab_size = 8 -indent_columns = 4 +indent_with_tabs = 0 +input_tab_size = 8 +indent_columns = 4 -nl_if_brace = remove -nl_elseif_brace = remove -nl_else_brace = remove -nl_brace_else = remove -nl_fdef_brace = force +nl_if_brace = remove +nl_elseif_brace = remove +nl_else_brace = remove +nl_brace_else = remove +nl_fdef_brace = force -sp_arith = force -sp_macro = force -sp_macro_func = force -sp_sparen_brace = add -sp_after_sparen = add -sp_fparen_brace = force -sp_square_fparen = remove -sp_inside_braces = add -sp_after_tag = remove +sp_arith = force +sp_macro = force +sp_macro_func = force +sp_sparen_brace = add +sp_after_sparen = add +sp_fparen_brace = force +sp_square_fparen = remove +sp_inside_braces = add +sp_after_tag = remove -code_width = 60 -cmt_width = 60 -cmt_cpp_to_c = true -cmt_cpp_group = true -cmt_c_group = true -cmt_c_nl_end = true -cmt_star_cont = true +code_width = 60 +cmt_width = 60 +cmt_cpp_to_c = true +cmt_cpp_group = true +cmt_c_group = true +cmt_c_nl_end = true +cmt_star_cont = true -sp_after_ptr_star = remove -sp_before_ptr_star = force +sp_after_ptr_star = remove +sp_before_ptr_star = force -ls_for_split_full = true -ls_func_split_full = false +ls_for_split_full = true +ls_func_split_full = false diff --git a/tests/config/width-3.cfg b/tests/config/width-3.cfg index 1f0ec146fd..c712342bf8 100644 --- a/tests/config/width-3.cfg +++ b/tests/config/width-3.cfg @@ -4,30 +4,30 @@ # $Id: width-3.cfg 803 2007-07-25 00:36:25Z bengardner $ # -indent_with_tabs = 0 -input_tab_size = 8 -indent_columns = 4 +indent_with_tabs = 0 +input_tab_size = 8 +indent_columns = 4 -nl_if_brace = remove -nl_elseif_brace = remove -nl_else_brace = remove -nl_brace_else = remove -nl_fdef_brace = force +nl_if_brace = remove +nl_elseif_brace = remove +nl_else_brace = remove +nl_brace_else = remove +nl_fdef_brace = force -sp_arith = force -sp_macro = force -sp_macro_func = force -sp_sparen_brace = add -sp_after_sparen = add -sp_fparen_brace = force -sp_square_fparen = remove -sp_inside_braces = add -sp_after_tag = remove +sp_arith = force +sp_macro = force +sp_macro_func = force +sp_sparen_brace = add +sp_after_sparen = add +sp_fparen_brace = force +sp_square_fparen = remove +sp_inside_braces = add +sp_after_tag = remove -code_width = 80 +code_width = 80 -sp_after_ptr_star = remove -sp_before_ptr_star = force +sp_after_ptr_star = remove +sp_before_ptr_star = force -ls_for_split_full = true -ls_func_split_full = true +ls_for_split_full = true +ls_func_split_full = true diff --git a/tests/config/width.cfg b/tests/config/width.cfg index db3b17dbbb..4d1fe4189a 100644 --- a/tests/config/width.cfg +++ b/tests/config/width.cfg @@ -2,30 +2,30 @@ # width stuff # -indent_with_tabs = 0 -input_tab_size = 8 -indent_columns = 4 +indent_with_tabs = 0 +input_tab_size = 8 +indent_columns = 4 -nl_if_brace = remove -nl_elseif_brace = remove -nl_else_brace = remove -nl_brace_else = remove -nl_fdef_brace = force +nl_if_brace = remove +nl_elseif_brace = remove +nl_else_brace = remove +nl_brace_else = remove +nl_fdef_brace = force -sp_arith = force -sp_macro = force -sp_macro_func = force -sp_sparen_brace = add -sp_after_sparen = add -sp_fparen_brace = force -sp_square_fparen = remove -sp_inside_braces = add -sp_after_tag = remove +sp_arith = force +sp_macro = force +sp_macro_func = force +sp_sparen_brace = add +sp_after_sparen = add +sp_fparen_brace = force +sp_square_fparen = remove +sp_inside_braces = add +sp_after_tag = remove -code_width = 60 +code_width = 60 -sp_after_ptr_star = remove -sp_before_ptr_star = force +sp_after_ptr_star = remove +sp_before_ptr_star = force -ls_for_split_full = false -ls_func_split_full = true +ls_for_split_full = false +ls_func_split_full = true diff --git a/tests/config/xml-str.cfg b/tests/config/xml-str.cfg index 0b9fad45c5..20906f7308 100644 --- a/tests/config/xml-str.cfg +++ b/tests/config/xml-str.cfg @@ -2,95 +2,95 @@ # My favorite format # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size -indent_columns = output_tab_size -indent_label = 2 # pos: absolute col, neg: relative column -indent_access_spec = 2 -indent_align_string = True # align broken strings -indent_xml_string = 2 # align broken strings -indent_brace = 0 -indent_member = indent_columns +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +input_tab_size = 8 # original tab size +output_tab_size = 3 # new tab size +indent_columns = output_tab_size +indent_label = 2 # pos: absolute col, neg: relative column +indent_access_spec = 2 +indent_align_string = True # align broken strings +indent_xml_string = 2 # align broken strings +indent_brace = 0 +indent_member = indent_columns -nl_assign_brace = add # "= {" vs "= \n {" -nl_enum_brace = add # "enum {" vs "enum \n {" -nl_union_brace = add # "union {" vs "union \n {" -nl_struct_brace = add # "struct {" vs "struct \n {" -nl_do_brace = add # "do {" vs "do \n {" -nl_if_brace = add # "if () {" vs "if () \n {" -nl_for_brace = add # "for () {" vs "for () \n {" -nl_else_brace = add # "else {" vs "else \n {" -nl_while_brace = add # "while () {" vs "while () \n {" -nl_switch_brace = add # "switch () {" vs "switch () \n {" -nl_func_var_def_blk = 1 -nl_before_case = 1 -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" -nl_after_return = TRUE -nl_brace_while = remove -nl_brace_else = add -nl_squeeze_ifdef = TRUE +nl_assign_brace = add # "= {" vs "= \n {" +nl_enum_brace = add # "enum {" vs "enum \n {" +nl_union_brace = add # "union {" vs "union \n {" +nl_struct_brace = add # "struct {" vs "struct \n {" +nl_do_brace = add # "do {" vs "do \n {" +nl_if_brace = add # "if () {" vs "if () \n {" +nl_for_brace = add # "for () {" vs "for () \n {" +nl_else_brace = add # "else {" vs "else \n {" +nl_while_brace = add # "while () {" vs "while () \n {" +nl_switch_brace = add # "switch () {" vs "switch () \n {" +nl_func_var_def_blk = 1 +nl_before_case = 1 +nl_fcall_brace = add # "foo() {" vs "foo()\n{" +nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_after_return = TRUE +nl_brace_while = remove +nl_brace_else = add +nl_squeeze_ifdef = TRUE -mod_paren_on_return = add # "return 1;" vs "return (1);" -mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" -mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" +mod_paren_on_return = add # "return 1;" vs "return (1);" +mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" +mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" +mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" +mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" -sp_before_byref = remove -sp_before_semi = remove -sp_paren_paren = remove # space between (( and )) -sp_return_paren = remove # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" -sp_inside_paren = remove -sp_inside_fparen = remove -sp_inside_sparen = remove -sp_inside_square = remove +sp_before_byref = remove +sp_before_semi = remove +sp_paren_paren = remove # space between (( and )) +sp_return_paren = remove # "return (1);" vs "return(1);" +sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" +sp_before_sparen = force # "if (" vs "if(" +sp_after_sparen = force # "if () {" vs "if (){" +sp_after_cast = remove # "(int) a" vs "(int)a" +sp_inside_braces = force # "{ 1 }" vs "{1}" +sp_inside_braces_struct = force # "{ 1 }" vs "{1}" +sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_inside_paren = remove +sp_inside_fparen = remove +sp_inside_sparen = remove +sp_inside_square = remove #sp_type_func = ignore -sp_assign = force -sp_arith = force -sp_bool = force -sp_compare = force -sp_assign = force -sp_after_comma = force -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" -sp_after_ptr_star = remove -sp_before_ptr_star = force -sp_between_ptr_star = remove +sp_assign = force +sp_arith = force +sp_bool = force +sp_compare = force +sp_assign = force +sp_after_comma = force +sp_func_def_paren = remove # "int foo (){" vs "int foo(){" +sp_func_call_paren = remove # "foo (" vs "foo(" +sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_after_ptr_star = remove +sp_before_ptr_star = force +sp_between_ptr_star = remove -align_with_tabs = FALSE # use tabs to align -align_on_tabstop = FALSE # align on tabstops -align_enum_equ_span = 4 -align_nl_cont = TRUE -align_var_def_span = 2 -align_var_def_inline = TRUE -align_var_def_star_style = 1 -align_var_def_colon = TRUE -align_assign_span = 1 +align_with_tabs = FALSE # use tabs to align +align_on_tabstop = FALSE # align on tabstops +align_enum_equ_span = 4 +align_nl_cont = TRUE +align_var_def_span = 2 +align_var_def_inline = TRUE +align_var_def_star_style = 1 +align_var_def_colon = TRUE +align_assign_span = 1 # align_assign_thresh = 8 -align_struct_init_span = 3 -align_var_struct_span = 3 -align_right_cmt_span = 3 -align_pp_define_span = 3 -align_pp_define_gap = 4 -align_number_right = TRUE -align_typedef_span = 5 -align_typedef_gap = 3 +align_struct_init_span = 3 +align_var_struct_span = 3 +align_right_cmt_span = 3 +align_pp_define_span = 3 +align_pp_define_gap = 4 +align_number_right = TRUE +align_typedef_span = 5 +align_typedef_gap = 3 -cmt_star_cont = TRUE +cmt_star_cont = TRUE -eat_blanks_before_close_brace = TRUE -eat_blanks_after_open_brace = TRUE +eat_blanks_before_close_brace = TRUE +eat_blanks_after_open_brace = TRUE # indent_namespace = FALSE -indent_class = TRUE +indent_class = TRUE From f3f9887878ce9e92c50b4bf2300bb4b0f7055bc1 Mon Sep 17 00:00:00 2001 From: Daniel Chumak Date: Fri, 17 Nov 2017 22:58:37 +0100 Subject: [PATCH 130/136] tests - remove trailing default comments --- tests/config/1liner-no-split.cfg | 304 ++-- tests/config/1liner-split.cfg | 288 ++-- tests/config/Uncrustify.Common-CStyle.cfg | 470 +++---- tests/config/al.cfg | 540 +++---- tests/config/align-1.cfg | 72 +- tests/config/align-2.cfg | 72 +- tests/config/align-3.cfg | 72 +- tests/config/amxmodx.cfg | 2 +- tests/config/avalon.cfg | 200 +-- tests/config/avalon2.cfg | 204 +-- tests/config/avalon3.cfg | 304 ++-- tests/config/avalon4.cfg | 400 +++--- tests/config/blc-1.cfg | 6 +- tests/config/bool-pos-eol-break.cfg | 6 +- tests/config/bool-pos-eol-force.cfg | 6 +- tests/config/bool-pos-eol.cfg | 6 +- tests/config/bool-pos-sol-break.cfg | 6 +- tests/config/bool-pos-sol-force.cfg | 6 +- tests/config/bool-pos-sol.cfg | 6 +- tests/config/brace-allman.cfg | 30 +- tests/config/brace-banner.cfg | 34 +- tests/config/brace-gnu.cfg | 26 +- tests/config/brace-kr-br.cfg | 34 +- tests/config/brace-kr-nobr.cfg | 34 +- tests/config/brace-kr.cfg | 34 +- tests/config/brace-remove-2.cfg | 12 +- tests/config/brace-remove-all.cfg | 10 +- tests/config/brace-ws.cfg | 30 +- tests/config/brace-ws2.cfg | 30 +- tests/config/bug_340.cfg | 768 +++++----- tests/config/bug_472.cfg | 8 +- tests/config/bug_671.cfg | 974 ++++++------- tests/config/bug_i_408.cfg | 4 +- tests/config/case-1.cfg | 6 +- tests/config/case-2.cfg | 6 +- tests/config/case-3.cfg | 6 +- tests/config/clark.cfg | 320 ++--- tests/config/class-colon-pos-eol-add.cfg | 6 +- tests/config/class-colon-pos-eol.cfg | 6 +- tests/config/class-colon-pos-sol-add.cfg | 6 +- tests/config/class-colon-pos-sol.cfg | 6 +- tests/config/class-nl_func-add.cfg | 6 +- tests/config/class-nl_func-add2.cfg | 6 +- tests/config/class-nl_func-del.cfg | 6 +- tests/config/class-on-colon-indent.cfg | 6 +- tests/config/cmt_nl_end.cfg | 4 +- tests/config/const_throw.cfg | 4 +- tests/config/cu.cfg | 4 +- tests/config/custom-open.cfg | 2 +- tests/config/custom-open2.cfg | 2 +- tests/config/custom_types_ssl.cfg | 42 +- tests/config/d-tst2.cfg | 74 +- tests/config/d.cfg | 60 +- tests/config/d2.cfg | 74 +- tests/config/d3.cfg | 60 +- tests/config/d3a.cfg | 60 +- tests/config/enum_comma-1.cfg | 4 +- tests/config/enum_comma-2.cfg | 4 +- tests/config/enum_comma-3.cfg | 4 +- tests/config/enum_comma-4.cfg | 4 +- tests/config/enum_comma-5.cfg | 4 +- tests/config/enum_comma-6.cfg | 4 +- tests/config/freebsd.cfg | 738 +++++----- tests/config/func-def-1.cfg | 6 +- tests/config/func-def-2.cfg | 6 +- tests/config/func-def-3.cfg | 6 +- tests/config/func_call_user.cfg | 542 +++---- tests/config/getset.cfg | 54 +- tests/config/gh293.a.cfg | 84 +- tests/config/gh293.b.cfg | 84 +- tests/config/if_chain.cfg | 68 +- tests/config/indent-1.cfg | 10 +- tests/config/indent.cfg | 6 +- tests/config/indent_ctor_init.cfg | 28 +- tests/config/indent_ctor_init_leading.cfg | 28 +- tests/config/indent_var_def.cfg | 650 ++++----- tests/config/issue_564.cfg | 2 +- tests/config/issue_574.cfg | 918 ++++++------ tests/config/java_foreach.cfg | 142 +- tests/config/java_synchronized_1.cfg | 6 +- tests/config/java_synchronized_2.cfg | 6 +- tests/config/kw_subst3.cfg | 570 ++++---- tests/config/libd.cfg | 2 +- tests/config/mod-paren.cfg | 304 ++-- tests/config/mod-paren2.cfg | 304 ++-- tests/config/mod_case_brace_add.cfg | 688 ++++----- tests/config/mod_case_brace_rm.cfg | 688 ++++----- tests/config/mod_move_case_brace.cfg | 688 ++++----- tests/config/mono.cfg | 54 +- tests/config/nSolve.cfg | 788 +++++------ tests/config/nepenthes.cfg | 728 +++++----- tests/config/nl-comment.cfg | 78 +- tests/config/nl_after_func_body-3.cfg | 2 +- tests/config/nl_brace_square.cfg | 2 +- tests/config/nl_brace_test.cfg | 664 ++++----- tests/config/nl_semicolon.cfg | 72 +- tests/config/obj-c.cfg | 2 +- tests/config/objc_complex_method.cfg | 74 +- tests/config/pbtech.cfg | 40 +- tests/config/pp_ret.cfg | 442 +++--- tests/config/preproc-cleanup.cfg | 70 +- tests/config/rdan.cfg | 734 +++++----- tests/config/sf.3266678.cfg | 12 +- tests/config/sf.3315874.cfg | 190 +-- tests/config/sf574.cfg | 960 ++++++------- tests/config/sf593.cfg | 4 +- tests/config/sim.cfg | 402 +++--- tests/config/sp_after_oc_at_sel_add.cfg | 2 +- tests/config/sp_after_oc_at_sel_force.cfg | 2 +- tests/config/sp_after_oc_at_sel_remove.cfg | 2 +- tests/config/sp_after_oc_block_caret_add.cfg | 2 +- .../config/sp_after_oc_block_caret_force.cfg | 2 +- .../config/sp_after_oc_block_caret_remove.cfg | 2 +- tests/config/sp_after_oc_return_type_add.cfg | 2 +- .../config/sp_after_oc_return_type_force.cfg | 2 +- .../config/sp_after_oc_return_type_remove.cfg | 2 +- .../sp_before_after_oc_block_caret_remove.cfg | 2 +- tests/config/sp_before_oc_block_caret_add.cfg | 2 +- .../config/sp_before_oc_block_caret_force.cfg | 2 +- .../sp_before_oc_block_caret_remove.cfg | 2 +- tests/config/sp_before_tr_emb_cmt-a.cfg | 732 +++++----- tests/config/sp_before_tr_emb_cmt-f.cfg | 732 +++++----- tests/config/sp_block_as_argument.cfg | 2 +- tests/config/sp_block_as_argument5.cfg | 4 +- tests/config/wessex.cfg | 398 +++--- tests/config/xml-str.cfg | 74 +- tests/default_strings.txt | 1246 +++++++++++++++++ tests/default_strings_remover.py | 729 ++++++++++ 128 files changed, 11829 insertions(+), 9854 deletions(-) create mode 100644 tests/default_strings.txt create mode 100755 tests/default_strings_remover.py diff --git a/tests/config/1liner-no-split.cfg b/tests/config/1liner-no-split.cfg index c50b5a29ed..8664fc75c3 100644 --- a/tests/config/1liner-no-split.cfg +++ b/tests/config/1liner-no-split.cfg @@ -10,510 +10,510 @@ # # The type of line endings -newlines = lf # auto/lf/crlf/cr +newlines = lf # The original size of tabs in the input -input_tab_size = 8 # number +input_tab_size = 8 # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 3 # number +output_tab_size = 3 # The ascii value of the string escape char, usually 92 (\). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # # Indenting # # The number of columns to indent per level (usually 2, 3, 4, or 8) -indent_columns = 3 # number +indent_columns = 3 # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # Whether to indent the stuff after a leading class colon -indent_class_colon = true # false/true +indent_class_colon = true # Whether to indent continued function call parameters one indent level (true) or aligns instead of indent (false) -indent_func_call_param = false # false/true +indent_func_call_param = false # The number of spaces to indent a continued '->' or '.' # Usually set to indent_columns. -indent_member = 3 # number +indent_member = 3 # Spaces to indent 'case' from 'switch' -indent_switch_case = 0 # number +indent_switch_case = 0 # Spaces to indent '{' from 'case' -indent_case_brace = 0 # number +indent_case_brace = 0 # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # How to indent goto labels (>0=absolute column where 1 is the leftmost column, <=0=subtract from brace indent) -indent_label = 1 # number +indent_label = 1 # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # Add or remove space after pointer star '*' -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # Add or remove space before reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # Add or remove space after reference sign '&' -sp_after_byref = ignore # ignore/add/remove/force +sp_after_byref = ignore # Add or remove space before '<>' -sp_before_angle = force # ignore/add/remove/force +sp_before_angle = force # Add or remove space after '<>' -sp_after_angle = force # ignore/add/remove/force +sp_after_angle = force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = add # ignore/add/remove/force +sp_sparen_brace = add # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # Add or remove space after cast -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = force # ignore/add/remove/force +sp_inside_braces_enum = force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = force # ignore/add/remove/force +sp_inside_braces_struct = force # Add or remove space inside '{' and '}' -sp_inside_braces = force # ignore/add/remove/force +sp_inside_braces = force # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # Add or remove space between return type and function name (a minimum of 1 is forced except for pointer return types) -sp_type_func = ignore # ignore/add/remove/force +sp_type_func = ignore # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # Add or remove space inside empty function '()' -sp_inside_fparens = ignore # ignore/add/remove/force +sp_inside_fparens = ignore # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # Add or remove space between ')' and '{' of function -sp_fparen_brace = add # ignore/add/remove/force +sp_fparen_brace = add # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # Add or remove space between 'return' and '(' -sp_return_paren = remove # ignore/add/remove/force +sp_return_paren = remove # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = force # ignore/add/remove/force +sp_else_brace = force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = force # ignore/add/remove/force +sp_brace_else = force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # Whether to right-align numbers -align_number_right = true # false/true +align_number_right = true align_func_params = true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 1 # number +align_var_def_span = 1 # Whether the pointer star is part of the variable name or not -align_var_def_star_style = 1 # number +align_var_def_star_style = 1 # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 12 # number +align_var_def_thresh = 12 # Whether to align the colon in struct bit fields -align_var_def_colon = true # false/true +align_var_def_colon = true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = true # false/true +align_var_def_inline = true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 1 # number +align_assign_span = 1 # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 12 # number +align_assign_thresh = 12 # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 16 # number +align_enum_equ_span = 16 # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # The span for aligning struct/union (0=don't align) -align_var_struct_span = 99 # number +align_var_struct_span = 99 # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 3 # number +align_struct_init_span = 3 # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 3 # number +align_typedef_gap = 3 # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 5 # number +align_typedef_span = 5 # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type: typedef int * pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 3 # number +align_right_cmt_span = 3 # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # Whether to align macros wrapped with a backslash and a newline -align_nl_cont = true # false/true +align_nl_cont = true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 4 # number +align_pp_define_gap = 4 # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 3 # number +align_pp_define_span = 3 # # Newline adding and removing options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # Don't touch one-line function bodies inside a class xx { } body -nl_class_leave_one_liners = true # false/true +nl_class_leave_one_liners = true nl_assign_leave_one_liners = true nl_enum_leave_one_liners = true nl_func_leave_one_liners = true nl_if_leave_one_liners = true # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # Add or remove newline between '=' and '{' -nl_assign_brace = add # ignore/add/remove/force +nl_assign_brace = add # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # Add or remove newline between function call and '(' -nl_fcall_brace = add # ignore/add/remove/force +nl_fcall_brace = add # Add or remove newline between 'enum' and '{' -nl_enum_brace = add # ignore/add/remove/force +nl_enum_brace = add # Add or remove newline between 'struct and '{' -nl_struct_brace = add # ignore/add/remove/force +nl_struct_brace = add # Add or remove newline between 'union' and '{' -nl_union_brace = add # ignore/add/remove/force +nl_union_brace = add # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = ignore # ignore/add/remove/force +nl_elseif_brace = ignore # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # Newline between namespace and { -nl_namespace_brace = ignore # ignore/add/remove/force +nl_namespace_brace = ignore # Add or remove newline between 'template<>' and 'class' -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # Add or remove newline between return type and function name in definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # Whether to put a newline after 'return' statement -nl_after_return = true # false/true +nl_after_return = true # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # Whether to put a newline after brace open -nl_after_brace_open = true # false/true +nl_after_brace_open = true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = true # false/true +nl_squeeze_ifdef = true # # Positioning options # # The position of boolean operators in wrapped expressions -pos_bool = trail # ignore/lead/trail +pos_bool = trail # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # # Blank line options # # The maximum consecutive newlines -nl_max = 4 # number +nl_max = 4 # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # The number of newlines after '}' of the function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # The minimum number of newlines before a multi-line comment (doesn't apply if after a brace open) -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # Add or remove braces on single-line 'if' statement -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = add # ignore/add/remove/force +mod_paren_on_return = add # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # # Comment modifications # # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # Whether to put a star on subsequent comment lines -cmt_star_cont = true # false/true +cmt_star_cont = true # # Preprocessor options # # Add or remove indent of preprocessor directives -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # Add or remove space between # and, say, define -pp_space = ignore # ignore/add/remove/force +pp_space = ignore nl_getset_brace = force diff --git a/tests/config/1liner-split.cfg b/tests/config/1liner-split.cfg index 494b450e79..e7542199e3 100644 --- a/tests/config/1liner-split.cfg +++ b/tests/config/1liner-split.cfg @@ -8,453 +8,453 @@ # # The type of line endings -newlines = lf # auto/lf/crlf/cr +newlines = lf # The original size of tabs in the input -input_tab_size = 8 # number +input_tab_size = 8 # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 3 # number +output_tab_size = 3 # The ascii value of the string escape char, usually 92 (\). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # # Indenting # # The number of columns to indent per level (usually 2, 3, 4, or 8) -indent_columns = 3 # number +indent_columns = 3 # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # Whether to indent the stuff after a leading class colon -indent_class_colon = true # false/true +indent_class_colon = true # Whether to indent continued function call parameters one indent level (true) or aligns instead of indent (false) -indent_func_call_param = false # false/true +indent_func_call_param = false # The number of spaces to indent a continued '->' or '.' # Usually set to indent_columns. -indent_member = 3 # number +indent_member = 3 # Spaces to indent 'case' from 'switch' -indent_switch_case = 0 # number +indent_switch_case = 0 # Spaces to indent '{' from 'case' -indent_case_brace = 0 # number +indent_case_brace = 0 # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # How to indent goto labels (>0=absolute column where 1 is the leftmost column, <=0=subtract from brace indent) -indent_label = 1 # number +indent_label = 1 # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # Add or remove space after pointer star '*' -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # Add or remove space before reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # Add or remove space after reference sign '&' -sp_after_byref = ignore # ignore/add/remove/force +sp_after_byref = ignore # Add or remove space before '<>' -sp_before_angle = force # ignore/add/remove/force +sp_before_angle = force # Add or remove space after '<>' -sp_after_angle = force # ignore/add/remove/force +sp_after_angle = force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = add # ignore/add/remove/force +sp_sparen_brace = add # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # Add or remove space after cast -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = force # ignore/add/remove/force +sp_inside_braces_enum = force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = force # ignore/add/remove/force +sp_inside_braces_struct = force # Add or remove space inside '{' and '}' -sp_inside_braces = force # ignore/add/remove/force +sp_inside_braces = force # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # Add or remove space between return type and function name (a minimum of 1 is forced except for pointer return types) -sp_type_func = ignore # ignore/add/remove/force +sp_type_func = ignore # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # Add or remove space inside empty function '()' -sp_inside_fparens = ignore # ignore/add/remove/force +sp_inside_fparens = ignore # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # Add or remove space between ')' and '{' of function -sp_fparen_brace = add # ignore/add/remove/force +sp_fparen_brace = add # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # Add or remove space between 'return' and '(' -sp_return_paren = remove # ignore/add/remove/force +sp_return_paren = remove # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = ignore # ignore/add/remove/force +sp_else_brace = ignore # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # Whether to right-align numbers -align_number_right = true # false/true +align_number_right = true align_func_params = true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 1 # number +align_var_def_span = 1 # Whether the pointer star is part of the variable name or not -align_var_def_star_style = 1 # number +align_var_def_star_style = 1 # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 12 # number +align_var_def_thresh = 12 # Whether to align the colon in struct bit fields -align_var_def_colon = true # false/true +align_var_def_colon = true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = true # false/true +align_var_def_inline = true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 1 # number +align_assign_span = 1 # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 12 # number +align_assign_thresh = 12 # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 16 # number +align_enum_equ_span = 16 # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # The span for aligning struct/union (0=don't align) -align_var_struct_span = 99 # number +align_var_struct_span = 99 # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 3 # number +align_struct_init_span = 3 # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 3 # number +align_typedef_gap = 3 # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 5 # number +align_typedef_span = 5 # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type: typedef int * pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 3 # number +align_right_cmt_span = 3 # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # Whether to align macros wrapped with a backslash and a newline -align_nl_cont = true # false/true +align_nl_cont = true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 4 # number +align_pp_define_gap = 4 # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 3 # number +align_pp_define_span = 3 # # Newline adding and removing options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # Don't touch one-line function bodies inside a class xx { } body -nl_class_leave_one_liners = true # false/true +nl_class_leave_one_liners = true nl_assign_leave_one_liners = false nl_enum_leave_one_liners = false nl_func_leave_one_liners = false # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # Add or remove newline between '=' and '{' -nl_assign_brace = add # ignore/add/remove/force +nl_assign_brace = add # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # Add or remove newline between function call and '(' -nl_fcall_brace = add # ignore/add/remove/force +nl_fcall_brace = add # Add or remove newline between 'enum' and '{' -nl_enum_brace = add # ignore/add/remove/force +nl_enum_brace = add # Add or remove newline between 'struct and '{' -nl_struct_brace = add # ignore/add/remove/force +nl_struct_brace = add # Add or remove newline between 'union' and '{' -nl_union_brace = add # ignore/add/remove/force +nl_union_brace = add # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = ignore # ignore/add/remove/force +nl_elseif_brace = ignore # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # Newline between namespace and { -nl_namespace_brace = ignore # ignore/add/remove/force +nl_namespace_brace = ignore # Add or remove newline between 'template<>' and 'class' -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # Add or remove newline between return type and function name in definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # Whether to put a newline after 'return' statement -nl_after_return = true # false/true +nl_after_return = true # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # Whether to put a newline after brace open -nl_after_brace_open = true # false/true +nl_after_brace_open = true nl_after_vbrace_open = true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = true # false/true +nl_squeeze_ifdef = true # # Positioning options # # The position of boolean operators in wrapped expressions -pos_bool = trail # ignore/lead/trail +pos_bool = trail # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # # Blank line options # # The maximum consecutive newlines -nl_max = 4 # number +nl_max = 4 # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # The number of newlines after '}' of the function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # The minimum number of newlines before a multi-line comment (doesn't apply if after a brace open) -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # # Code modifying options (non-whitespace) @@ -489,29 +489,29 @@ eat_blanks_before_close_brace = true # false/true # # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # Whether to put a star on subsequent comment lines -cmt_star_cont = true # false/true +cmt_star_cont = true # # Preprocessor options # # Add or remove indent of preprocessor directives -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # Add or remove space between # and, say, define -pp_space = ignore # ignore/add/remove/force +pp_space = ignore nl_getset_brace = force diff --git a/tests/config/Uncrustify.Common-CStyle.cfg b/tests/config/Uncrustify.Common-CStyle.cfg index 9d35b4ec5c..339515e6d1 100644 --- a/tests/config/Uncrustify.Common-CStyle.cfg +++ b/tests/config/Uncrustify.Common-CStyle.cfg @@ -7,7 +7,7 @@ #newlines { Auto, LF, CR, CRLF } # The type of line endings. Default=Auto # -input_tab_size = 4 # Number +input_tab_size = 4 # The original size of tabs in the input. Default=8 # #output_tab_size Number @@ -19,10 +19,10 @@ input_tab_size = 4 # Number #string_escape_char2 Number # Alternate string escape char for Pawn. Only works right before the quote char. # -string_replace_tab_chars = true # { False, True } +string_replace_tab_chars = true # Replace tab characters found in string literals with the escape sequence \t instead. # -tok_split_gte = false # { False, True } +tok_split_gte = false # Allow interpreting '>=' and '>>=' as part of a template in 'void f(list>=val);'. # If true, 'assert(x<0 && y>=3)' will be broken. Default=False # Improvements to template detection may make this option obsolete. @@ -36,20 +36,20 @@ enable_processing_cmt = *end-nonstandard-formatting* #enable_digraphs { False, True } # Enable parsing of digraphs. Default=False # -utf8_bom = remove # { Ignore, Add, Remove, Force } +utf8_bom = remove # Control what to do with the UTF-8 BOM (recommend 'remove') # -utf8_byte = false # { False, True } +utf8_byte = false # If the file contains bytes with values between 128 and 255, but is not UTF-8, then output as UTF-8 # -utf8_force = false # { False, True } +utf8_force = false # Force the output encoding to UTF-8 # ## ## Indenting ## # -indent_columns = 4 # Number +indent_columns = 4 # The number of columns to indent per level. # Usually 2, 3, 4, or 8. Default=8 # @@ -57,17 +57,17 @@ indent_columns = 4 # Number # The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents. # For FreeBSD, this is set to 4. Negative value is absolute and not increased for each ( level # -indent_with_tabs = 0 # Number +indent_with_tabs = 0 # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs to brace level, align with spaces (default) # 2=indent and align with tabs, using spaces when not on a tabstop # -indent_cmt_with_tabs = false # { False, True } +indent_cmt_with_tabs = false # Comments that are not a brace level are indented with tabs on a tabstop. # Requires indent_with_tabs=2. If false, will use spaces. # -indent_align_string = false # { False, True } +indent_align_string = false # Whether to indent strings broken by '\' so that they line up # #indent_xml_string Number @@ -77,28 +77,28 @@ indent_align_string = false # { False, True } #indent_brace Number # Spaces to indent '{' from level # -indent_braces = false # { False, True } +indent_braces = false # Whether braces are indented to the body level # -indent_braces_no_func = false # { False, True } +indent_braces_no_func = false # Disabled indenting function braces if indent_braces is true # -indent_braces_no_class = false # { False, True } +indent_braces_no_class = false # Disabled indenting class braces if indent_braces is true # -indent_braces_no_struct = false # { False, True } +indent_braces_no_struct = false # Disabled indenting struct braces if indent_braces is true # -indent_brace_parent = false # { False, True } +indent_brace_parent = false # Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc. # #indent_paren_open_brace { False, True } # Indent based on the paren open instead of the brace open in '({\n', default is to indent by brace. # -indent_cs_delegate_brace = true # { False, True } +indent_cs_delegate_brace = true # indent a C# delegate by another level, default is to not indent by another level. # -indent_namespace = true # { False, True } +indent_namespace = true # Whether the 'namespace' body is indented # #indent_namespace_single_indent { False, True } @@ -112,13 +112,13 @@ indent_namespace = true # { False, True } # If the body of the namespace is longer than this number, it won't be indented. # Requires indent_namespace=true. Default=0 (no limit) # -indent_extern = false # { False, True } +indent_extern = false # Whether the 'extern "C"' body is indented # -indent_class = true # { False, True } +indent_class = true # Whether the 'class' body is indented # -indent_class_colon = false # { False, True } +indent_class_colon = false # Whether to indent the stuff after a leading base class colon # #indent_class_on_colon { False, True } @@ -134,14 +134,14 @@ indent_class_colon = false # { False, True } #indent_ctor_init Number # Additional indenting for constructor initializer list # -indent_else_if = false # { False, True } +indent_else_if = false # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level # #indent_var_def_blk Number # Amount to indent variable declarations after a open brace. neg=relative, pos=absolute # -indent_var_def_cont = false # { False, True } +indent_var_def_cont = false # Indent continued variable declarations instead of aligning. # #indent_shift { False, True } @@ -152,26 +152,26 @@ indent_var_def_cont = false # { False, True } # True: force indentation of function definition to start in column 1 # False: use the default behavior # -indent_func_call_param = true # { False, True } +indent_func_call_param = true # True: indent continued function call parameters one indent level # False: align parameters under the open paren # -indent_func_def_param = true # { False, True } +indent_func_def_param = true # Same as indent_func_call_param, but for function defs # -indent_func_proto_param = true # { False, True } +indent_func_proto_param = true # Same as indent_func_call_param, but for function protos # -indent_func_class_param = false # { False, True } +indent_func_class_param = false # Same as indent_func_call_param, but for class declarations # -indent_func_ctor_var_param = false # { False, True } +indent_func_ctor_var_param = false # Same as indent_func_call_param, but for class variable constructors # -indent_template_param = false # { False, True } +indent_template_param = false # Same as indent_func_call_param, but for templates # -indent_func_param_double = false # { False, True } +indent_func_param_double = false # Double the indent for indent_func_xxx_param options # #indent_func_const Number @@ -187,40 +187,40 @@ indent_func_param_double = false # { False, True } #indent_sing_line_comments Number # Spaces to indent single line ('//') comments on lines before code # -indent_relative_single_line_comments = false # { False, True } +indent_relative_single_line_comments = false # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column # -indent_switch_case = 4 # Number +indent_switch_case = 4 # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. # -indent_case_shift = 0 # Number +indent_case_shift = 0 # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. # -indent_case_brace = 0 # Number +indent_case_brace = 0 # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. # -indent_col1_comment = false # { False, True } +indent_col1_comment = false # Whether to indent comments found in first column # -indent_label = -4 # Number +indent_label = -4 # How to indent goto labels # >0: absolute column where 1 is the leftmost column # <=0: subtract from brace indent # Default=1 # -indent_access_spec = -4 # Number +indent_access_spec = -4 # Same as indent_label, but for access specifiers that are followed by a colon. Default=1 # #indent_access_spec_body { False, True } # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' # -indent_paren_nl = false # { False, True } +indent_paren_nl = false # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) # #indent_paren_close Number @@ -229,19 +229,19 @@ indent_paren_nl = false # { False, True } # 1: Align under the open paren # 2: Indent to the brace level # -indent_comma_paren = false # { False, True } +indent_comma_paren = false # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren # -indent_bool_paren = false # { False, True } +indent_bool_paren = false # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren # -indent_first_bool_expr = false # { False, True } +indent_first_bool_expr = false # If 'indent_bool_paren' is true, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones # -indent_square_nl = false # { False, True } +indent_square_nl = false # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) # -indent_preserve_sql = false # { False, True } +indent_preserve_sql = false # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies # #indent_align_assign { False, True } @@ -262,7 +262,7 @@ indent_preserve_sql = false # { False, True } # If true, prioritize aligning with initial colon (and stripping spaces from lines, if necessary). # Default=True. # -indent_oc_block_msg_xcode_style = true # { False, True } +indent_oc_block_msg_xcode_style = true # If indent_oc_block_msg and this option are on, blocks will be indented the way that Xcode does by default (from keyword if the parameter is on its own line; otherwise, from the previous indentation level). # #indent_oc_block_msg_from_keyword { False, True } @@ -293,11 +293,11 @@ indent_oc_block_msg_xcode_style = true # { False, True } ## Spacing options ## # -sp_arith = add # { Ignore, Add, Remove, Force } +sp_arith = add # Add or remove space around arithmetic operator '+', '-', '/', '*', etc # also '>>>' '<<' '>>' '%' '|' # -sp_assign = add # { Ignore, Add, Remove, Force } +sp_assign = add # Add or remove space around assignment operator '=', '+=', etc # #sp_cpp_lambda_assign { Ignore, Add, Remove, Force } @@ -306,7 +306,7 @@ sp_assign = add # { Ignore, Add, Remove, Force } #sp_cpp_lambda_paren { Ignore, Add, Remove, Force } # Add or remove space after the capture specification in C++11 lambda. # -sp_assign_default = add # { Ignore, Add, Remove, Force } +sp_assign_default = add # Add or remove space around assignment operator '=' in a prototype # #sp_before_assign { Ignore, Add, Remove, Force } @@ -318,7 +318,7 @@ sp_assign_default = add # { Ignore, Add, Remove, Force } #sp_enum_paren { Ignore, Add, Remove, Force } # Add or remove space in 'NS_ENUM (' # -sp_enum_assign = add # { Ignore, Add, Remove, Force } +sp_enum_assign = add # Add or remove space around assignment '=' in enum # #sp_enum_before_assign { Ignore, Add, Remove, Force } @@ -327,34 +327,34 @@ sp_enum_assign = add # { Ignore, Add, Remove, Force } #sp_enum_after_assign { Ignore, Add, Remove, Force } # Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. # -sp_pp_concat = remove # { Ignore, Add, Remove, Force } +sp_pp_concat = remove # Add or remove space around preprocessor '##' concatenation operator. Default=Add # -sp_pp_stringify = remove # { Ignore, Add, Remove, Force } +sp_pp_stringify = remove # Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator. # #sp_before_pp_stringify { Ignore, Add, Remove, Force } # Add or remove space before preprocessor '#' stringify operator as in '#define x(y) L#y'. # -sp_bool = add # { Ignore, Add, Remove, Force } +sp_bool = add # Add or remove space around boolean operators '&&' and '||' # -sp_compare = add # { Ignore, Add, Remove, Force } +sp_compare = add # Add or remove space around compare operator '<', '>', '==', etc # -sp_inside_paren = remove # { Ignore, Add, Remove, Force } +sp_inside_paren = remove # Add or remove space inside '(' and ')' # -sp_paren_paren = remove # { Ignore, Add, Remove, Force } +sp_paren_paren = remove # Add or remove space between nested parens: '((' vs ') )' # #sp_cparen_oparen { Ignore, Add, Remove, Force } # Add or remove space between back-to-back parens: ')(' vs ') (' # -sp_balance_nested_parens = false # { False, True } +sp_balance_nested_parens = false # Whether to balance spaces inside nested parens # -sp_paren_brace = force # { Ignore, Add, Remove, Force } +sp_paren_brace = force # Add or remove space between ')' and '{' # #sp_before_ptr_star { Ignore, Add, Remove, Force } @@ -398,45 +398,45 @@ sp_paren_brace = force # { Ignore, Add, Remove, Force } #sp_before_byref_func { Ignore, Add, Remove, Force } # Add or remove space before a reference sign '&', if followed by a func proto/def. # -sp_after_type = ignore # { Ignore, Add, Remove, Force } +sp_after_type = ignore # Add or remove space between type and word. Default=Force # #sp_before_template_paren { Ignore, Add, Remove, Force } # Add or remove space before the paren in the D constructs 'template Foo(' and 'class Foo('. # -sp_template_angle = remove # { Ignore, Add, Remove, Force } +sp_template_angle = remove # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. # -sp_before_angle = remove # { Ignore, Add, Remove, Force } +sp_before_angle = remove # Add or remove space before '<>' # -sp_inside_angle = remove # { Ignore, Add, Remove, Force } +sp_inside_angle = remove # Add or remove space inside '<' and '>' # #sp_after_angle { Ignore, Add, Remove, Force } # Add or remove space after '<>' # -sp_angle_paren = remove # { Ignore, Add, Remove, Force } +sp_angle_paren = remove # Add or remove space between '<>' and '(' as found in 'new List(foo);' # -sp_angle_paren_empty = remove # { Ignore, Add, Remove, Force } +sp_angle_paren_empty = remove # Add or remove space between '<>' and '()' as found in 'new List();' # -sp_angle_word = add # { Ignore, Add, Remove, Force } +sp_angle_word = add # Add or remove space between '<>' and a word as in 'List m;' or 'template static ...' # -sp_angle_shift = remove # { Ignore, Add, Remove, Force } +sp_angle_shift = remove # Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add # #sp_permit_cpp11_shift { False, True } # Permit removal of the space between '>>' in 'foo >' (C++11 only). Default=False # sp_angle_shift cannot remove the space without this option. # -sp_before_sparen = force # { Ignore, Add, Remove, Force } +sp_before_sparen = force # Add or remove space before '(' of 'if', 'for', 'switch', 'while', etc. # -sp_inside_sparen = remove # { Ignore, Add, Remove, Force } +sp_inside_sparen = remove # Add or remove space inside if-condition '(' and ')' # #sp_inside_sparen_close { Ignore, Add, Remove, Force } @@ -445,10 +445,10 @@ sp_inside_sparen = remove # { Ignore, Add, Remove, Force } #sp_inside_sparen_open { Ignore, Add, Remove, Force } # Add or remove space after if-condition '('. Overrides sp_inside_sparen. # -sp_after_sparen = add # { Ignore, Add, Remove, Force } +sp_after_sparen = add # Add or remove space after ')' of 'if', 'for', 'switch', and 'while', etc. # -sp_sparen_brace = force # { Ignore, Add, Remove, Force } +sp_sparen_brace = force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while', etc. # #sp_invariant_paren { Ignore, Add, Remove, Force } @@ -457,61 +457,61 @@ sp_sparen_brace = force # { Ignore, Add, Remove, Force } #sp_after_invariant_paren { Ignore, Add, Remove, Force } # Add or remove space after the ')' in 'invariant (C) c' in the D language. # -sp_special_semi = force # { Ignore, Add, Remove, Force } +sp_special_semi = force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' # -sp_before_semi = remove # { Ignore, Add, Remove, Force } +sp_before_semi = remove # Add or remove space before ';'. Default=Remove # -sp_before_semi_for = remove # { Ignore, Add, Remove, Force } +sp_before_semi_for = remove # Add or remove space before ';' in non-empty 'for' statements # -sp_before_semi_for_empty = remove # { Ignore, Add, Remove, Force } +sp_before_semi_for_empty = remove # Add or remove space before a semicolon of an empty part of a for statement. # -sp_after_semi = add # { Ignore, Add, Remove, Force } +sp_after_semi = add # Add or remove space after ';', except when followed by a comment. Default=Add # -sp_after_semi_for = force # { Ignore, Add, Remove, Force } +sp_after_semi_for = force # Add or remove space after ';' in non-empty 'for' statements. Default=Force # -sp_after_semi_for_empty = remove # { Ignore, Add, Remove, Force } +sp_after_semi_for_empty = remove # Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; ). # -sp_before_square = remove # { Ignore, Add, Remove, Force } +sp_before_square = remove # Add or remove space before '[' (except '[]') # -sp_before_squares = remove # { Ignore, Add, Remove, Force } +sp_before_squares = remove # Add or remove space before '[]' # -sp_inside_square = remove # { Ignore, Add, Remove, Force } +sp_inside_square = remove # Add or remove space inside a non-empty '[' and ']' # -sp_after_comma = add # { Ignore, Add, Remove, Force } +sp_after_comma = add # Add or remove space after ',' # -sp_before_comma = ignore # { Ignore, Add, Remove, Force } +sp_before_comma = ignore # Add or remove space before ','. Default=Remove # -sp_after_mdatype_commas = remove # { Ignore, Add, Remove, Force } +sp_after_mdatype_commas = remove # Add or remove space between ',' and ']' in multidimensional array type 'int[,,]' # -sp_before_mdatype_commas = remove # { Ignore, Add, Remove, Force } +sp_before_mdatype_commas = remove # Add or remove space between '[' and ',' in multidimensional array type 'int[,,]' # -sp_between_mdatype_commas = remove # { Ignore, Add, Remove, Force } +sp_between_mdatype_commas = remove # Add or remove space between ',' in multidimensional array type 'int[,,]' # -sp_paren_comma = remove # { Ignore, Add, Remove, Force } +sp_paren_comma = remove # Add or remove space between an open paren and comma: '(,' vs '( ,'. Default=Force # #sp_before_ellipsis { Ignore, Add, Remove, Force } # Add or remove space before the variadic '...' when preceded by a non-punctuator # -sp_after_class_colon = force # { Ignore, Add, Remove, Force } +sp_after_class_colon = force # Add or remove space after class ':' # -sp_before_class_colon = force # { Ignore, Add, Remove, Force } +sp_before_class_colon = force # Add or remove space before class ':' # #sp_after_constr_colon { Ignore, Add, Remove, Force } @@ -520,34 +520,34 @@ sp_before_class_colon = force # { Ignore, Add, Remove, Force } #sp_before_constr_colon { Ignore, Add, Remove, Force } # Add or remove space before class constructor ':' # -sp_before_case_colon = remove # { Ignore, Add, Remove, Force } +sp_before_case_colon = remove # Add or remove space before case ':'. Default=Remove # -sp_after_operator = remove # { Ignore, Add, Remove, Force } +sp_after_operator = remove # Add or remove space between 'operator' and operator sign # -sp_after_operator_sym = remove # { Ignore, Add, Remove, Force } +sp_after_operator_sym = remove # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' # -sp_after_operator_sym_empty = remove # { Ignore, Add, Remove, Force } +sp_after_operator_sym_empty = remove # Add or remove space between the operator symbol and the open paren when the operator has no arguments, as in 'operator *()' # -sp_after_cast = remove # { Ignore, Add, Remove, Force } +sp_after_cast = remove # Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' # -sp_inside_paren_cast = remove # { Ignore, Add, Remove, Force } +sp_inside_paren_cast = remove # Add or remove spaces inside cast parens # -sp_cpp_cast_paren = remove # { Ignore, Add, Remove, Force } +sp_cpp_cast_paren = remove # Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)' # -sp_sizeof_paren = remove # { Ignore, Add, Remove, Force } +sp_sizeof_paren = remove # Add or remove space between 'sizeof' and '(' # #sp_after_tag { Ignore, Add, Remove, Force } # Add or remove space after the tag keyword (Pawn) # -sp_inside_braces_enum = add # { Ignore, Add, Remove, Force } +sp_inside_braces_enum = add # Add or remove space inside enum '{' and '}' # #sp_inside_braces_struct { Ignore, Add, Remove, Force } @@ -556,29 +556,29 @@ sp_inside_braces_enum = add # { Ignore, Add, Remove, Force } #sp_inside_braces { Ignore, Add, Remove, Force } # Add or remove space inside '{' and '}' # -sp_inside_braces_empty = remove # { Ignore, Add, Remove, Force } +sp_inside_braces_empty = remove # Add or remove space inside '{}' # -sp_type_func = ignore # { Ignore, Add, Remove, Force } +sp_type_func = ignore # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. # -sp_func_proto_paren = remove # { Ignore, Add, Remove, Force } +sp_func_proto_paren = remove # Add or remove space between function name and '(' on function declaration # #sp_func_proto_paren_empty { Ignore, Add, Remove, Force } # Add or remove space between function name and '()' on function declaration without parameters # -sp_func_def_paren = remove # { Ignore, Add, Remove, Force } +sp_func_def_paren = remove # Add or remove space between function name and '(' on function definition # #sp_func_def_paren_empty { Ignore, Add, Remove, Force } # Add or remove space between function name and '()' on function definition without parameters # -sp_inside_fparens = remove # { Ignore, Add, Remove, Force } +sp_inside_fparens = remove # Add or remove space inside empty function '()' # -sp_inside_fparen = remove # { Ignore, Add, Remove, Force } +sp_inside_fparen = remove # Add or remove space inside function '(' and ')' # #sp_inside_tparen { Ignore, Add, Remove, Force } @@ -590,45 +590,45 @@ sp_inside_fparen = remove # { Ignore, Add, Remove, Force } #sp_square_fparen { Ignore, Add, Remove, Force } # Add or remove space between ']' and '(' when part of a function call. # -sp_fparen_brace = add # { Ignore, Add, Remove, Force } +sp_fparen_brace = add # Add or remove space between ')' and '{' of function # #sp_fparen_dbrace { Ignore, Add, Remove, Force } # Java: Add or remove space between ')' and '{{' of double brace initializer. # -sp_func_call_paren = remove # { Ignore, Add, Remove, Force } +sp_func_call_paren = remove # Add or remove space between function name and '(' on function calls # -sp_func_call_paren_empty = remove # { Ignore, Add, Remove, Force } +sp_func_call_paren_empty = remove # Add or remove space between function name and '()' on function calls without parameters. # If set to 'ignore' (the default), sp_func_call_paren is used. # -sp_func_call_user_paren = remove # { Ignore, Add, Remove, Force } +sp_func_call_user_paren = remove # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. # -sp_func_class_paren = remove # { Ignore, Add, Remove, Force } +sp_func_class_paren = remove # Add or remove space between a constructor/destructor and the open paren # #sp_func_class_paren_empty { Ignore, Add, Remove, Force } # Add or remove space between a constructor without parameters or destructor and '()' # -sp_return_paren = add # { Ignore, Add, Remove, Force } +sp_return_paren = add # Add or remove space between 'return' and '(' # #sp_attribute_paren { Ignore, Add, Remove, Force } # Add or remove space between '__attribute__' and '(' # -sp_defined_paren = remove # { Ignore, Add, Remove, Force } +sp_defined_paren = remove # Add or remove space between 'defined' and '(' in '#if defined (FOO)' # -sp_throw_paren = add # { Ignore, Add, Remove, Force } +sp_throw_paren = add # Add or remove space between 'throw' and '(' in 'throw (something)' # #sp_after_throw { Ignore, Add, Remove, Force } # Add or remove space between 'throw' and anything other than '(' as in '@throw [...];' # -sp_catch_paren = add # { Ignore, Add, Remove, Force } +sp_catch_paren = add # Add or remove space between 'catch' and '(' in 'catch (something) { }' # If set to ignore, sp_before_sparen is used. # @@ -658,7 +658,7 @@ sp_catch_paren = add # { Ignore, Add, Remove, Force } #sp_brace_else { Ignore, Add, Remove, Force } # Add or remove space between '}' and 'else' if on the same line # -sp_brace_typedef = add # { Ignore, Add, Remove, Force } +sp_brace_typedef = add # Add or remove space between '}' and the name of a typedef on the same line # #sp_catch_brace { Ignore, Add, Remove, Force } @@ -676,7 +676,7 @@ sp_brace_typedef = add # { Ignore, Add, Remove, Force } #sp_try_brace { Ignore, Add, Remove, Force } # Add or remove space between 'try' and '{' if on the same line # -sp_getset_brace = add # { Ignore, Add, Remove, Force } +sp_getset_brace = add # Add or remove space between get/set and '{' if on the same line # #sp_word_brace { Ignore, Add, Remove, Force } @@ -694,68 +694,68 @@ sp_getset_brace = add # { Ignore, Add, Remove, Force } #sp_d_array_colon { Ignore, Add, Remove, Force } # Add or remove around the D named array initializer ':' operator # -sp_not = remove # { Ignore, Add, Remove, Force } +sp_not = remove # Add or remove space after the '!' (not) operator. Default=Remove # -sp_inv = remove # { Ignore, Add, Remove, Force } +sp_inv = remove # Add or remove space after the '~' (invert) operator. Default=Remove # -sp_addr = remove # { Ignore, Add, Remove, Force } +sp_addr = remove # Add or remove space after the '&' (address-of) operator. Default=Remove # This does not affect the spacing after a '&' that is part of a type. # -sp_member = remove # { Ignore, Add, Remove, Force } +sp_member = remove # Add or remove space around the '.' or '->' operators. Default=Remove # -sp_deref = remove # { Ignore, Add, Remove, Force } +sp_deref = remove # Add or remove space after the '*' (dereference) operator. Default=Remove # This does not affect the spacing after a '*' that is part of a type. # -sp_sign = remove # { Ignore, Add, Remove, Force } +sp_sign = remove # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove # -sp_incdec = remove # { Ignore, Add, Remove, Force } +sp_incdec = remove # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove # -sp_before_nl_cont = add # { Ignore, Add, Remove, Force } +sp_before_nl_cont = add # Add or remove space before a backslash-newline at the end of a line. Default=Add # -sp_after_oc_scope = force # { Ignore, Add, Remove, Force } +sp_after_oc_scope = force # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' # -sp_after_oc_colon = remove # { Ignore, Add, Remove, Force } +sp_after_oc_colon = remove # Add or remove space after the colon in message specs # '-(int) f:(int) x;' vs '-(int) f: (int) x;' # -sp_before_oc_colon = remove # { Ignore, Add, Remove, Force } +sp_before_oc_colon = remove # Add or remove space before the colon in message specs # '-(int) f: (int) x;' vs '-(int) f : (int) x;' # -sp_after_oc_dict_colon = force # { Ignore, Add, Remove, Force } +sp_after_oc_dict_colon = force # Add or remove space after the colon in immutable dictionary expression # 'NSDictionary *test = @{@"foo" :@"bar"};' # -sp_before_oc_dict_colon = remove # { Ignore, Add, Remove, Force } +sp_before_oc_dict_colon = remove # Add or remove space before the colon in immutable dictionary expression # 'NSDictionary *test = @{@"foo" :@"bar"};' # -sp_after_send_oc_colon = force # { Ignore, Add, Remove, Force } +sp_after_send_oc_colon = force # Add or remove space after the colon in message specs # '[object setValue:1];' vs '[object setValue: 1];' # -sp_before_send_oc_colon = remove # { Ignore, Add, Remove, Force } +sp_before_send_oc_colon = remove # Add or remove space before the colon in message specs # '[object setValue:1];' vs '[object setValue :1];' # -sp_after_oc_type = remove # { Ignore, Add, Remove, Force } +sp_after_oc_type = remove # Add or remove space after the (type) in message specs # '-(int)f: (int) x;' vs '-(int)f: (int)x;' # -sp_after_oc_return_type = remove # { Ignore, Add, Remove, Force } +sp_after_oc_return_type = remove # Add or remove space after the first (type) in message specs # '-(int) f:(int)x;' vs '-(int)f:(int)x;' # -sp_after_oc_at_sel = remove # { Ignore, Add, Remove, Force } +sp_after_oc_at_sel = remove # Add or remove space between '@selector' and '(' # '@selector(msgName)' vs '@selector (msgName)' # Also applies to @protocol() constructs @@ -764,7 +764,7 @@ sp_after_oc_at_sel = remove # { Ignore, Add, Remove, Force } # Add or remove space between '@selector(x)' and the following word # '@selector(foo) a:' vs '@selector(foo)a:' # -sp_inside_oc_at_sel_parens = remove # { Ignore, Add, Remove, Force } +sp_inside_oc_at_sel_parens = remove # Add or remove space inside '@selector' parens # '@selector(foo)' vs '@selector( foo )' # Also applies to @protocol() constructs @@ -784,7 +784,7 @@ sp_inside_oc_at_sel_parens = remove # { Ignore, Add, Remove, Force } #sp_after_oc_property { Ignore, Add, Remove, Force } # Add or remove space after @property. # -sp_cond_colon = add # { Ignore, Add, Remove, Force } +sp_cond_colon = add # Add or remove space around the ':' in 'b ? t : f' # #sp_cond_colon_before { Ignore, Add, Remove, Force } @@ -793,7 +793,7 @@ sp_cond_colon = add # { Ignore, Add, Remove, Force } #sp_cond_colon_after { Ignore, Add, Remove, Force } # Add or remove space after the ':' in 'b ? t : f'. Overrides sp_cond_colon. # -sp_cond_question = add # { Ignore, Add, Remove, Force } +sp_cond_question = add # Add or remove space around the '?' in 'b ? t : f' # #sp_cond_question_before { Ignore, Add, Remove, Force } @@ -805,7 +805,7 @@ sp_cond_question = add # { Ignore, Add, Remove, Force } #sp_cond_ternary_short { Ignore, Add, Remove, Force } # In the abbreviated ternary form (a ?: b), add/remove space between ? and :.'. Overrides all other sp_cond_* options. # -sp_case_label = ignore # { Ignore, Add, Remove, Force } +sp_case_label = ignore # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. # #sp_range { Ignore, Add, Remove, Force } @@ -832,10 +832,10 @@ sp_case_label = ignore # { Ignore, Add, Remove, Force } #sp_endif_cmt { Ignore, Add, Remove, Force } # Controls the spaces between #else or #endif and a trailing comment # -sp_after_new = force # { Ignore, Add, Remove, Force } +sp_after_new = force # Controls the spaces after 'new', 'delete' and 'delete[]' # -sp_between_new_paren = remove # { Ignore, Add, Remove, Force } +sp_between_new_paren = remove # Controls the spaces between new and '(' in 'new()' # #sp_before_tr_emb_cmt { Ignore, Add, Remove, Force } @@ -847,32 +847,32 @@ sp_between_new_paren = remove # { Ignore, Add, Remove, Force } #sp_annotation_paren { Ignore, Add, Remove, Force } # Control space between a Java annotation and the open paren. # -sp_skip_vbrace_tokens = true # { False, True } +sp_skip_vbrace_tokens = true # If true, vbrace tokens are dropped to the previous token and skipped. # ## ## Code alignment (not left column spaces/tabs) ## # -align_keep_tabs = false # { False, True } +align_keep_tabs = false # Whether to keep non-indenting tabs # -align_with_tabs = false # { False, True } +align_with_tabs = false # Whether to use tabs for aligning # -align_on_tabstop = false # { False, True } +align_on_tabstop = false # Whether to bump out to the next tab when aligning # -align_number_right = false # { False, True } +align_number_right = false # Whether to right-align numbers # #align_keep_extra_space { False, True } # Whether to keep whitespace not required for alignment. # -align_func_params = false # { False, True } +align_func_params = false # Align variable definitions in prototypes and functions # -align_same_func_call_params = false # { False, True } +align_same_func_call_params = false # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. # @@ -897,13 +897,13 @@ align_same_func_call_params = false # { False, True } #align_var_def_gap Number # The gap for aligning variable definitions # -align_var_def_colon = false # { False, True } +align_var_def_colon = false # Whether to align the colon in struct bit fields # -align_var_def_attribute = false # { False, True } +align_var_def_attribute = false # Whether to align any attribute after the variable name # -align_var_def_inline = false # { False, True } +align_var_def_inline = false # Whether to align inline struct/enum/union variable definitions # #align_assign_span Number @@ -957,7 +957,7 @@ align_var_def_inline = false # { False, True } #align_right_cmt_span Number # The span for aligning comments that end lines (0=don't align) # -align_right_cmt_mix = false # { False, True } +align_right_cmt_mix = false # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment # #align_right_cmt_gap Number @@ -973,17 +973,17 @@ align_right_cmt_mix = false # { False, True } #align_func_proto_gap Number # Minimum gap between the return type and the function name. # -align_on_operator = false # { False, True } +align_on_operator = false # Align function protos on the 'operator' keyword instead of what follows # -align_mix_var_proto = false # { False, True } +align_mix_var_proto = false # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. # -align_single_line_func = false # { False, True } +align_single_line_func = false # Align single-line functions with function prototypes, uses align_func_proto_span # -align_single_line_brace = false # { False, True } +align_single_line_brace = false # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span # @@ -993,7 +993,7 @@ align_single_line_brace = false # { False, True } #align_oc_msg_spec_span Number # The span for aligning ObjC msg spec (0=don't align) # -align_nl_cont = false # { False, True } +align_nl_cont = false # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. # @@ -1006,7 +1006,7 @@ align_nl_cont = false # { False, True } #align_pp_define_span Number # The span for aligning on '#define' bodies (0=don't align, other=number of lines including comments between blocks) # -align_left_shift = false # { False, True } +align_left_shift = false # Align lines that start with '<<' with previous '<<'. Default=True # #align_asm_colon { False, True } @@ -1025,52 +1025,52 @@ align_left_shift = false # { False, True } ## Newline adding and removing options ## # -nl_collapse_empty_body = false # { False, True } +nl_collapse_empty_body = false # Whether to collapse empty blocks between '{' and '}' # -nl_assign_leave_one_liners = true # { False, True } +nl_assign_leave_one_liners = true # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' # -nl_class_leave_one_liners = true # { False, True } +nl_class_leave_one_liners = true # Don't split one-line braced statements inside a class xx { } body # -nl_enum_leave_one_liners = true # { False, True } +nl_enum_leave_one_liners = true # Don't split one-line enums: 'enum foo { BAR = 15 };' # -nl_getset_leave_one_liners = true # { False, True } +nl_getset_leave_one_liners = true # Don't split one-line get or set functions # -nl_func_leave_one_liners = true # { False, True } +nl_func_leave_one_liners = true # Don't split one-line function definitions - 'int foo() { return 0; }' # -nl_cpp_lambda_leave_one_liners = true # { False, True } +nl_cpp_lambda_leave_one_liners = true # Don't split one-line C++11 lambdas - '[]() { return 0; }' # -nl_if_leave_one_liners = false # { False, True } +nl_if_leave_one_liners = false # Don't split one-line if/else statements - 'if(a) b++;' # #nl_while_leave_one_liners { False, True } # Don't split one-line while statements - 'while(a) b++;' # -nl_oc_msg_leave_one_liner = true # { False, True } +nl_oc_msg_leave_one_liner = true # Don't split one-line OC messages # #nl_oc_block_brace { Ignore, Add, Remove, Force } # Add or remove newline between Objective-C block signature and '{' # -nl_start_of_file = remove # { Ignore, Add, Remove, Force } +nl_start_of_file = remove # Add or remove newlines at the start of the file # #nl_start_of_file_min Number # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' # -nl_end_of_file = force # { Ignore, Add, Remove, Force } +nl_end_of_file = force # Add or remove newline at the end of the file # -nl_end_of_file_min = 1 # Number +nl_end_of_file_min = 1 # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') # -nl_assign_brace = force # { Ignore, Add, Remove, Force } +nl_assign_brace = force # Add or remove newline between '=' and '{' # #nl_assign_square { Ignore, Add, Remove, Force } @@ -1113,50 +1113,50 @@ nl_assign_brace = force # { Ignore, Add, Remove, Force } # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } # -nl_enum_brace = force # { Ignore, Add, Remove, Force } +nl_enum_brace = force # Add or remove newline between 'enum' and '{' # -nl_struct_brace = force # { Ignore, Add, Remove, Force } +nl_struct_brace = force # Add or remove newline between 'struct and '{' # -nl_union_brace = force # { Ignore, Add, Remove, Force } +nl_union_brace = force # Add or remove newline between 'union' and '{' # -nl_if_brace = force # { Ignore, Add, Remove, Force } +nl_if_brace = force # Add or remove newline between 'if' and '{' # -nl_brace_else = force # { Ignore, Add, Remove, Force } +nl_brace_else = force # Add or remove newline between '}' and 'else' # #nl_elseif_brace { Ignore, Add, Remove, Force } # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead # -nl_else_brace = force # { Ignore, Add, Remove, Force } +nl_else_brace = force # Add or remove newline between 'else' and '{' # -nl_else_if = remove # { Ignore, Add, Remove, Force } +nl_else_if = remove # Add or remove newline between 'else' and 'if' # -nl_brace_finally = force # { Ignore, Add, Remove, Force } +nl_brace_finally = force # Add or remove newline between '}' and 'finally' # -nl_finally_brace = force # { Ignore, Add, Remove, Force } +nl_finally_brace = force # Add or remove newline between 'finally' and '{' # -nl_try_brace = force # { Ignore, Add, Remove, Force } +nl_try_brace = force # Add or remove newline between 'try' and '{' # -nl_getset_brace = force # { Ignore, Add, Remove, Force } +nl_getset_brace = force # Add or remove newline between get/set and '{' # -nl_for_brace = force # { Ignore, Add, Remove, Force } +nl_for_brace = force # Add or remove newline between 'for' and '{' # -nl_catch_brace = force # { Ignore, Add, Remove, Force } +nl_catch_brace = force # Add or remove newline between 'catch' and '{' # -nl_brace_catch = force # { Ignore, Add, Remove, Force } +nl_brace_catch = force # Add or remove newline between '}' and 'catch' # #nl_brace_square { Ignore, Add, Remove, Force } @@ -1165,7 +1165,7 @@ nl_brace_catch = force # { Ignore, Add, Remove, Force } #nl_brace_fparen { Ignore, Add, Remove, Force } # Add or remove newline between '}' and ')' in a function invocation # -nl_while_brace = force # { Ignore, Add, Remove, Force } +nl_while_brace = force # Add or remove newline between 'while' and '{' # #nl_scope_brace { Ignore, Add, Remove, Force } @@ -1177,51 +1177,51 @@ nl_while_brace = force # { Ignore, Add, Remove, Force } #nl_version_brace { Ignore, Add, Remove, Force } # Add or remove newline between 'version (x)' and '{' (D) # -nl_using_brace = force # { Ignore, Add, Remove, Force } +nl_using_brace = force # Add or remove newline between 'using' and '{' # -nl_brace_brace = ignore # { Ignore, Add, Remove, Force } +nl_brace_brace = ignore # Add or remove newline between two open or close braces. # Due to general newline/brace handling, REMOVE may not work. # -nl_do_brace = force # { Ignore, Add, Remove, Force } +nl_do_brace = force # Add or remove newline between 'do' and '{' # -nl_brace_while = force # { Ignore, Add, Remove, Force } +nl_brace_while = force # Add or remove newline between '}' and 'while' of 'do' statement # -nl_switch_brace = force # { Ignore, Add, Remove, Force } +nl_switch_brace = force # Add or remove newline between 'switch' and '{' # #nl_synchronized_brace { Ignore, Add, Remove, Force } # Add or remove newline between 'synchronized' and '{' # -nl_multi_line_cond = false # { False, True } +nl_multi_line_cond = false # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch and nl_catch_brace. # #nl_multi_line_define { False, True } # Force a newline in a define after the macro name for multi-line defines. # -nl_before_case = false # { False, True } +nl_before_case = false # Whether to put a newline before 'case' statement, not after the first 'case' # #nl_before_throw { Ignore, Add, Remove, Force } # Add or remove newline between ')' and 'throw' # -nl_after_case = false # { False, True } +nl_after_case = false # Whether to put a newline after 'case' statement # -nl_case_colon_brace = force # { Ignore, Add, Remove, Force } +nl_case_colon_brace = force # Add or remove a newline between a case ':' and '{'. Overrides nl_after_case. # -nl_namespace_brace = force # { Ignore, Add, Remove, Force } +nl_namespace_brace = force # Newline between namespace and { # -nl_template_class = ignore # { Ignore, Add, Remove, Force } +nl_template_class = ignore # Add or remove newline between 'template<>' and whatever follows. # -nl_class_brace = force # { Ignore, Add, Remove, Force } +nl_class_brace = force # Add or remove newline between 'class' and '{' # #nl_class_init_args { Ignore, Add, Remove, Force } @@ -1326,7 +1326,7 @@ nl_class_brace = force # { Ignore, Add, Remove, Force } # Whether to put each OC message parameter on a separate line # See nl_oc_msg_leave_one_liner # -nl_fdef_brace = force # { Ignore, Add, Remove, Force } +nl_fdef_brace = force # Add or remove newline between function signature and '{' # #nl_cpp_ldef_brace { Ignore, Add, Remove, Force } @@ -1335,33 +1335,33 @@ nl_fdef_brace = force # { Ignore, Add, Remove, Force } #nl_return_expr { Ignore, Add, Remove, Force } # Add or remove a newline between the return keyword and return expression. # -nl_after_semicolon = false # { False, True } +nl_after_semicolon = false # Whether to put a newline after semicolons, except in 'for' statements # #nl_paren_dbrace_open { Ignore, Add, Remove, Force } # Java: Control the newline between the ')' and '{{' of the double brace initializer. # -nl_after_brace_open = false # { False, True } +nl_after_brace_open = false # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. # -nl_after_brace_open_cmt = false # { False, True } +nl_after_brace_open_cmt = false # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. # -nl_after_vbrace_open = false # { False, True } +nl_after_vbrace_open = false # Whether to put a newline after a virtual brace open with a non-empty body. # These occur in un-braced if/while/do/for statement bodies. # -nl_after_vbrace_open_empty = false # { False, True } +nl_after_vbrace_open_empty = false # Whether to put a newline after a virtual brace open with an empty body. # These occur in un-braced if/while/do/for statement bodies. # -nl_after_brace_close = false # { False, True } +nl_after_brace_close = false # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. # -nl_after_vbrace_close = false # { False, True } +nl_after_vbrace_close = false # Whether to put a newline after a virtual brace close. # Would add a newline before return in: 'if (foo) a++; return;' # @@ -1372,7 +1372,7 @@ nl_after_vbrace_close = false # { False, True } #nl_define_macro { False, True } # Whether to alter newlines in '#define' macros # -nl_squeeze_ifdef = false # { False, True } +nl_squeeze_ifdef = false # Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and '#endif'. Does not affect top-level #ifdefs. # #nl_squeeze_ifdef_top_level { False, True } @@ -1414,10 +1414,10 @@ nl_squeeze_ifdef = false # { False, True } #nl_after_do { Ignore, Add, Remove, Force } # Add or remove blank line after 'do/while' statement # -nl_ds_struct_enum_cmt = false # { False, True } +nl_ds_struct_enum_cmt = false # Whether to double-space commented-entries in struct/union/enum # -nl_ds_struct_enum_close_brace = false # { False, True } +nl_ds_struct_enum_close_brace = false # force nl before } of a struct/union/enum # (lower priority than 'eat_blanks_before_close_brace') # @@ -1435,15 +1435,15 @@ nl_ds_struct_enum_close_brace = false # { False, True } # Add or remove a newline around a class constructor colon. # Related to nl_constr_init_args, pos_constr_colon and pos_constr_comma. # -nl_create_if_one_liner = false # { False, True } +nl_create_if_one_liner = false # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' # -nl_create_for_one_liner = false # { False, True } +nl_create_for_one_liner = false # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' # -nl_create_while_one_liner = false # { False, True } +nl_create_while_one_liner = false # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' # @@ -1509,10 +1509,10 @@ nl_create_while_one_liner = false # { False, True } #code_width Number # Try to limit code width to N number of columns # -ls_for_split_full = false # { False, True } +ls_for_split_full = false # Whether to fully split long 'for' statements at semi-colons # -ls_func_split_full = false # { False, True } +ls_func_split_full = false # Whether to fully split long function protos/calls at commas # #ls_code_width { False, True } @@ -1522,7 +1522,7 @@ ls_func_split_full = false # { False, True } ## Blank line options ## # -nl_max = 3 # Number +nl_max = 3 # The maximum consecutive newlines (3 = 2 blank lines) # #nl_after_func_proto Number @@ -1543,7 +1543,7 @@ nl_max = 3 # Number #nl_before_func_body_proto Number # The number of newlines before a multi-line function prototype body # -nl_after_func_body = 2 # Number +nl_after_func_body = 2 # The number of newlines after '}' of a multi-line function body # #nl_after_func_body_class Number @@ -1564,7 +1564,7 @@ nl_after_func_body = 2 # Number # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. # -nl_after_multiline_comment = false # { False, True } +nl_after_multiline_comment = false # Whether to force a newline after a multi-line comment. # #nl_after_label_colon { False, True } @@ -1602,13 +1602,13 @@ nl_after_multiline_comment = false # { False, True } # The number of newlines between the get/set/add/remove handlers in C#. # 0 = No change. # -nl_property_brace = force # { Ignore, Add, Remove, Force } +nl_property_brace = force # Add or remove newline between C# property and the '{' # -eat_blanks_after_open_brace = true # { False, True } +eat_blanks_after_open_brace = true # Whether to remove blank lines after '{' # -eat_blanks_before_close_brace = true # { False, True } +eat_blanks_before_close_brace = true # Whether to remove blank lines before '}' # #nl_remove_extra_newlines Number @@ -1620,7 +1620,7 @@ eat_blanks_before_close_brace = true # { False, True } #nl_before_return { False, True } # Whether to put a blank line before 'return' statements, unless after an open brace. # -nl_after_return = false # { False, True } +nl_after_return = false # Whether to put a blank line after 'return' statements, unless followed by a close brace. # #nl_after_annotation { Ignore, Add, Remove, Force } @@ -1646,7 +1646,7 @@ nl_after_return = false # { False, True } #mod_full_brace_if { Ignore, Add, Remove, Force } # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. # -mod_full_brace_if_chain = false # { False, True } +mod_full_brace_if_chain = false # Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if. # If any must be braced, they are all braced. If all can be unbraced, then the braces are removed. # @@ -1665,16 +1665,16 @@ mod_full_brace_if_chain = false # { False, True } #mod_full_brace_using { Ignore, Add, Remove, Force } # Add or remove braces on single-line 'using ()' statement # -mod_paren_on_return = ignore # { Ignore, Add, Remove, Force } +mod_paren_on_return = ignore # Add or remove unnecessary paren on 'return' statement # -mod_pawn_semicolon = false # { False, True } +mod_pawn_semicolon = false # Whether to change optional semicolons to real semicolons # -mod_full_paren_if_bool = false # { False, True } +mod_full_paren_if_bool = false # Add parens on 'while' and 'if' statement around bools # -mod_remove_extra_semicolon = true # { False, True } +mod_remove_extra_semicolon = true # Whether to remove superfluous semicolons # #mod_add_long_function_closebrace_comment Number @@ -1707,14 +1707,14 @@ mod_remove_extra_semicolon = true # { False, True } # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. # -mod_move_case_break = false # { False, True } +mod_move_case_break = false # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. # #mod_case_brace { Ignore, Add, Remove, Force } # Will add or remove the braces around a fully braced case statement. # Will only remove the braces if there are no variable declarations in the block. # -mod_remove_empty_return = true # { False, True } +mod_remove_empty_return = true # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. # ## @@ -1734,32 +1734,32 @@ mod_remove_empty_return = true # { False, True } #cmt_convert_tab_to_spaces { False, True } # Whether to convert all tabs to spaces in comments. Default is to leave tabs inside comments alone, unless used for indenting. # -cmt_indent_multi = false # { False, True } +cmt_indent_multi = false # If false, disable all multi-line comment changes, including cmt_width. keyword substitution and leading chars. # Default=True. # -cmt_c_group = false # { False, True } +cmt_c_group = false # Whether to group c-comments that look like they are in a block # -cmt_c_nl_start = false # { False, True } +cmt_c_nl_start = false # Whether to put an empty '/*' on the first line of the combined c-comment # -cmt_c_nl_end = false # { False, True } +cmt_c_nl_end = false # Whether to put a newline before the closing '*/' of the combined c-comment # -cmt_cpp_group = false # { False, True } +cmt_cpp_group = false # Whether to group cpp-comments that look like they are in a block # -cmt_cpp_nl_start = false # { False, True } +cmt_cpp_nl_start = false # Whether to put an empty '/*' on the first line of the combined cpp-comment # -cmt_cpp_nl_end = false # { False, True } +cmt_cpp_nl_end = false # Whether to put a newline before the closing '*/' of the combined cpp-comment # -cmt_cpp_to_c = false # { False, True } +cmt_cpp_to_c = false # Whether to change cpp-comments into c-comments # -cmt_star_cont = false # { False, True } +cmt_star_cont = false # Whether to put a star on subsequent comment lines # #cmt_sp_before_star_cont Number @@ -1768,7 +1768,7 @@ cmt_star_cont = false # { False, True } #cmt_sp_after_star_cont Number # The number of spaces to insert after the star on subsequent comment lines # -cmt_multi_check_last = false # { False, True } +cmt_multi_check_last = false # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True # @@ -1797,7 +1797,7 @@ cmt_multi_check_last = false # { False, True } # The filename that contains text to insert before a Obj-C message specification if the method isn't preceded with a C/C++ comment. # Will substitute $(message) with the function name and $(javaparam) with the javadoc @param and @return stuff. # -cmt_insert_before_preproc = false # { False, True } +cmt_insert_before_preproc = false # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_oc_msg_header, cmt_insert_func_header and cmt_insert_class_header. @@ -1827,7 +1827,7 @@ cmt_insert_before_preproc = false # { False, True } # If pp_indent_at_level=false, specifies the number of columns to indent preprocessors per level at brace level > 0 (function-level). # Default=1. # -pp_space = ignore # { Ignore, Add, Remove, Force } +pp_space = ignore # Add or remove space after # based on pp_level of #if blocks # #pp_space_count Number @@ -1869,7 +1869,7 @@ pp_space = ignore # { Ignore, Add, Remove, Force } # True: indent_continue will be used only once # False: indent_continue will be used every time (default) # -use_options_overriding_for_qt_macros = false # { False, True } +use_options_overriding_for_qt_macros = false # SIGNAL/SLOT Qt macros have special formatting options. See options_for_QT.cpp for details. # Default=True. # diff --git a/tests/config/al.cfg b/tests/config/al.cfg index 47dd0cbe41..e70850a1d1 100644 --- a/tests/config/al.cfg +++ b/tests/config/al.cfg @@ -3,19 +3,19 @@ # # The type of line endings -newlines = auto # auto/lf/crlf/cr +newlines = auto # The original size of tabs in the input -input_tab_size = 4 # number +input_tab_size = 4 # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 4 # number +output_tab_size = 4 # The ascii value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # # Indenting @@ -23,894 +23,894 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 4 # number +indent_columns = 4 # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # Whether the 'class' body is indented -indent_class = false # false/true +indent_class = false # Whether to indent the stuff after a leading class colon -indent_class_colon = false # false/true +indent_class_colon = false # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = false # false/true +indent_func_call_param = false # Same as indent_func_call_param, but for function defs -indent_func_def_param = false # false/true +indent_func_def_param = false # Same as indent_func_call_param, but for function protos -indent_func_proto_param = false # false/true +indent_func_proto_param = false # Same as indent_func_call_param, but for class declarations -indent_func_class_param = false # false/true +indent_func_class_param = false # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = false # false/true +indent_func_ctor_var_param = false # Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true +indent_func_param_double = false # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 4 # number +indent_member = 4 # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 4 # number +indent_switch_case = 4 # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 4 # number +indent_case_shift = 4 # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 4 # number +indent_case_brace = 4 # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 1 # number +indent_paren_close = 1 # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # Add or remove space inside '(' and ')' -sp_inside_paren = ignore # ignore/add/remove/force +sp_inside_paren = ignore # Add or remove space between nested parens -sp_paren_paren = force # ignore/add/remove/force +sp_paren_paren = force # Whether to balance spaces inside nested parens -sp_balance_nested_parens = true # false/true +sp_balance_nested_parens = true # Add or remove space between ')' and '{' -sp_paren_brace = remove # ignore/add/remove/force +sp_paren_brace = remove # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # Add or remove space before reference sign '&' -sp_before_byref = force # ignore/add/remove/force +sp_before_byref = force # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = remove # ignore/add/remove/force +sp_after_byref = remove # Add or remove space before '<>' -sp_before_angle = force # ignore/add/remove/force +sp_before_angle = force # Add or remove space after '<>' -sp_after_angle = force # ignore/add/remove/force +sp_after_angle = force # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = remove # ignore/add/remove/force +sp_angle_paren = remove sp_angle_paren_empty = remove # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = force # ignore/add/remove/force +sp_angle_word = force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = remove # ignore/add/remove/force +sp_after_sparen = remove # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = remove # ignore/add/remove/force +sp_sparen_brace = remove # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = force # ignore/add/remove/force +sp_special_semi = force # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = force # ignore/add/remove/force +sp_before_semi_for = force # Add or remove space before a semicolon of an empty part of a for statment. -sp_before_semi_for_empty = force # ignore/add/remove/force +sp_before_semi_for_empty = force # Add or remove space after the final semicolon of an empty part of a for statment: for ( ; ; ). -sp_after_semi_for_empty = force # ignore/add/remove/force +sp_after_semi_for_empty = force # Add or remove space before '[' (except '[]') -sp_before_square = remove # ignore/add/remove/force +sp_before_square = remove # Add or remove space before '[]' -sp_before_squares = remove # ignore/add/remove/force +sp_before_squares = remove # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # Add or remove space between 'operator' and operator sign -sp_after_operator = force # ignore/add/remove/force +sp_after_operator = force # Add or remove space after cast -sp_after_cast = force # ignore/add/remove/force +sp_after_cast = force # Add or remove spaces inside cast parens -sp_inside_paren_cast = remove # ignore/add/remove/force +sp_inside_paren_cast = remove # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = force # ignore/add/remove/force +sp_inside_braces_enum = force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = remove # ignore/add/remove/force +sp_inside_braces_struct = remove # Add or remove space inside '{' and '}' -sp_inside_braces = force # ignore/add/remove/force +sp_inside_braces = force # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = remove # ignore/add/remove/force +sp_type_func = remove # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = remove # ignore/add/remove/force +sp_square_fparen = remove # Add or remove space between ')' and '{' of function -sp_fparen_brace = remove # ignore/add/remove/force +sp_fparen_brace = remove # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = ignore # ignore/add/remove/force +sp_func_class_paren = ignore # Add or remove space between 'return' and '(' -sp_return_paren = force # ignore/add/remove/force +sp_return_paren = force # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = force # ignore/add/remove/force +sp_attribute_paren = force # Add or remove space between macro and value -sp_macro = force # ignore/add/remove/force +sp_macro = force # Add or remove space between macro function ')' and value -sp_macro_func = force # ignore/add/remove/force +sp_macro_func = force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = ignore # ignore/add/remove/force +sp_else_brace = ignore # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # Add or remove space before the '::' operator -sp_before_dc = remove # ignore/add/remove/force +sp_before_dc = remove # Add or remove space after the '::' operator -sp_after_dc = remove # ignore/add/remove/force +sp_after_dc = remove # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # Add or remove space after the '!' (not) operator. -sp_not = remove # ignore/add/remove/force +sp_not = remove # Add or remove space after the '~' (invert) operator. -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # Add or remove space after the '&' (address-of) operator. # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # Add or remove space around the '.' or '->' operators -sp_member = remove # ignore/add/remove/force +sp_member = remove # Add or remove space after the '*' (dereference) operator. # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7' -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;' -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force +sp_after_oc_scope = ignore # Add or remove space after the colon in message specs # '-(int) f: (int) x;' vs '+(int) f : (int) x;' -sp_before_oc_colon = force # ignore/add/remove/force +sp_before_oc_colon = force # Add or remove space after the (type) in message specs # '-(int) f: (int) x;' vs '+(int)f : (int)x;' -sp_after_oc_type = force # ignore/add/remove/force +sp_after_oc_type = force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # Align variable definitions in prototypes and functions -align_func_params = true # false/true +align_func_params = true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 20 # number +align_var_def_span = 20 # How to align the star in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_star_style = 0 # number +align_var_def_star_style = 0 # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = true # false/true +align_var_def_inline = true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 1 # number +align_assign_span = 1 # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 30 # number +align_assign_thresh = 30 # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 10 # number +align_enum_equ_span = 10 # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 12 # number +align_enum_equ_thresh = 12 # The span for aligning struct/union (0=don't align) -align_var_struct_span = 30 # number +align_var_struct_span = 30 # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 30 # number +align_var_struct_thresh = 30 # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 8 # number +align_struct_init_span = 8 # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 4 # number +align_typedef_gap = 4 # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 5 # number +align_typedef_span = 5 # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 2 # number +align_typedef_star_style = 2 # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typdef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 2 # number +align_typedef_amp_style = 2 # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 3 # number +align_right_cmt_span = 3 # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 3 # number +align_func_proto_span = 3 # The span for aligning function prototypes (0=don't align) -align_oc_msg_spec_span = 3 # number +align_oc_msg_spec_span = 3 # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = true # false/true +align_nl_cont = true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 2 # number +align_pp_define_gap = 2 # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 50 # number +align_pp_define_span = 50 # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = false # false/true +nl_assign_leave_one_liners = false # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = false # false/true +nl_class_leave_one_liners = false # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = false # false/true +nl_enum_leave_one_liners = false # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # Add or remove newline between '=' and '{' -nl_assign_brace = force # ignore/add/remove/force +nl_assign_brace = force # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = force # ignore/add/remove/force +nl_fcall_brace = force # Add or remove newline between 'enum' and '{' -nl_enum_brace = add # ignore/add/remove/force +nl_enum_brace = add # Add or remove newline between 'struct and '{' -nl_struct_brace = add # ignore/add/remove/force +nl_struct_brace = add # Add or remove newline between 'union' and '{' -nl_union_brace = add # ignore/add/remove/force +nl_union_brace = add # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = add # ignore/add/remove/force +nl_elseif_brace = add # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # Add or remove newline between '}' and 'finally' -nl_brace_finally = ignore # ignore/add/remove/force +nl_brace_finally = ignore # Add or remove newline between 'finally' and '{' -nl_finally_brace = ignore # ignore/add/remove/force +nl_finally_brace = ignore # Add or remove newline between 'try' and '{' -nl_try_brace = ignore # ignore/add/remove/force +nl_try_brace = ignore # Add or remove newline between get/set and '{' -nl_getset_brace = ignore # ignore/add/remove/force +nl_getset_brace = ignore # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # Add or remove newline between 'catch' and '{' -nl_catch_brace = ignore # ignore/add/remove/force +nl_catch_brace = ignore # Add or remove newline between '}' and 'catch' -nl_brace_catch = ignore # ignore/add/remove/force +nl_brace_catch = ignore # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = add # ignore/add/remove/force +nl_brace_while = add # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # Add or remove newline when condition spans two or more lines -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = true # false/true +nl_multi_line_define = true # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # Whether to put a newline after 'case' statement -nl_after_case = false # false/true +nl_after_case = false # Newline between namespace and { -nl_namespace_brace = add # ignore/add/remove/force +nl_namespace_brace = add # Add or remove newline between 'template<>' and 'class' -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # Add or remove newline between return type and function name in definition -nl_func_type_name = remove # ignore/add/remove/force +nl_func_type_name = remove # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = remove # ignore/add/remove/force +nl_func_proto_type_name = remove # Add or remove newline between a function name and the opening '(' -nl_func_paren = remove # ignore/add/remove/force +nl_func_paren = remove # Add or remove newline after '(' in a function declaration -nl_func_decl_start = remove # ignore/add/remove/force +nl_func_decl_start = remove # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # Whether to put a newline after 'return' statement -nl_after_return = true # false/true +nl_after_return = true # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = true # false/true +nl_after_brace_open = true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = true # false/true +nl_after_brace_open_cmt = true # Whether to put a newline after a virtual brace open. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = true # false/true +nl_after_vbrace_open = true # Whether to alter newlines in '#define' macros -nl_define_macro = true # false/true +nl_define_macro = true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true +nl_squeeze_ifdef = false # Add or remove newline before 'if' -nl_before_if = add # ignore/add/remove/force +nl_before_if = add # Add or remove newline after 'if' -nl_after_if = add # ignore/add/remove/force +nl_after_if = add # Add or remove newline before 'for' -nl_before_for = add # ignore/add/remove/force +nl_before_for = add # Add or remove newline after 'for' -nl_after_for = add # ignore/add/remove/force +nl_after_for = add # Add or remove newline before 'while' -nl_before_while = add # ignore/add/remove/force +nl_before_while = add # Add or remove newline after 'while' -nl_after_while = add # ignore/add/remove/force +nl_after_while = add # Add or remove newline before 'switch' -nl_before_switch = add # ignore/add/remove/force +nl_before_switch = add # Add or remove newline after 'switch' -nl_after_switch = add # ignore/add/remove/force +nl_after_switch = add # Add or remove newline before 'do' -nl_before_do = add # ignore/add/remove/force +nl_before_do = add # Add or remove newline after 'do' -nl_after_do = add # ignore/add/remove/force +nl_after_do = add # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = true # false/true +nl_ds_struct_enum_cmt = true # Whether to double-space before the close brace of a struct/union/enum -nl_ds_struct_enum_close_brace = true # false/true +nl_ds_struct_enum_close_brace = true # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # # Positioning options # # The position of boolean operators in wrapped expressions -pos_bool = ignore # ignore/lead/trail +pos_bool = ignore # The position of the comma in wrapped expressions -pos_comma = trail # ignore/lead/trail +pos_comma = trail # The position of the comma in the constructor initialization list -pos_class_comma = ignore # ignore/lead/trail +pos_class_comma = ignore # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 80 # number +code_width = 80 # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = true # false/true +ls_for_split_full = true # Whether to fully split long function protos/calls at commas -ls_func_split_full = true # false/true +ls_func_split_full = true # # Blank line options # # The maximum consecutive newlines -nl_max = 3 # number +nl_max = 3 # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 1 # number +nl_after_func_proto = 1 # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 3 # number +nl_after_func_proto_group = 3 # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 5 # number +nl_after_func_body = 5 # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 5 # number +nl_after_func_body_one_liner = 5 # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 1 # number +nl_before_block_comment = 1 # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 1 # number +nl_before_c_comment = 1 # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 1 # number +nl_before_cpp_comment = 1 # Whether to force a newline after a mulit-line comment. -nl_after_multiline_comment = true # false/true +nl_after_multiline_comment = true # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 0 # number +nl_before_access_spec = 0 # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = false # false/true +eat_blanks_before_close_brace = false # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = add # ignore/add/remove/force +mod_full_brace_function = add # Add or remove braces on single-line 'if' statement -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 1 # number +mod_full_brace_nl = 1 # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = remove # ignore/add/remove/force +mod_paren_on_return = remove # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = false # false/true +mod_full_paren_if_bool = false # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = true # false/true +mod_remove_extra_semicolon = true # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 1 # number +mod_add_long_function_closebrace_comment = 1 # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 10 # number +mod_add_long_switch_closebrace_comment = 10 # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # # Comment modifications # # Try to wrap comments at cmt_witdth columns -cmt_width = 80 # number +cmt_width = 80 # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = true # false/true +cmt_cpp_to_c = true # Whether to put a star on subsequent comment lines -cmt_star_cont = true # false/true +cmt_star_cont = true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 1 # number +cmt_sp_before_star_cont = 1 # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitue $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # The filename that contains text to insert before a function implementation if the function isn't preceeded with a C/C++ comment. # Will substitue $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # The filename that contains text to insert before a class if the class isn't preceeded with a C/C++ comment. # Will substitue $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = remove # ignore/add/remove/force +pp_indent = remove # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true +pp_if_indent_code = false # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/align-1.cfg b/tests/config/align-1.cfg index b3fdf63c13..0fcf2d1472 100644 --- a/tests/config/align-1.cfg +++ b/tests/config/align-1.cfg @@ -2,50 +2,50 @@ # My favorite format # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 3 indent_columns = output_tab_size -indent_label = 2 # pos: absolute col, neg: relative column -indent_align_string = False # align broken strings +indent_label = 2 +indent_align_string = False indent_brace = 0 -nl_assign_brace = add # "= {" vs "= \n {" -nl_enum_brace = add # "enum {" vs "enum \n {" -nl_union_brace = add # "union {" vs "union \n {" -nl_struct_brace = add # "struct {" vs "struct \n {" -nl_do_brace = add # "do {" vs "do \n {" -nl_if_brace = add # "if () {" vs "if () \n {" -nl_for_brace = add # "for () {" vs "for () \n {" -nl_else_brace = add # "else {" vs "else \n {" -nl_while_brace = add # "while () {" vs "while () \n {" -nl_switch_brace = add # "switch () {" vs "switch () \n {" +nl_assign_brace = add +nl_enum_brace = add +nl_union_brace = add +nl_struct_brace = add +nl_do_brace = add +nl_if_brace = add +nl_for_brace = add +nl_else_brace = add +nl_while_brace = add +nl_switch_brace = add nl_func_var_def_blk = 1 nl_before_case = 1 -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_fcall_brace = add +nl_fdef_brace = add nl_after_return = TRUE nl_brace_while = remove nl_brace_else = add nl_squeeze_ifdef = TRUE -mod_paren_on_return = add # "return 1;" vs "return (1);" -mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" -mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" +mod_paren_on_return = add +mod_full_brace_if = add +mod_full_brace_for = add +mod_full_brace_do = add +mod_full_brace_while = add sp_before_byref = remove sp_before_semi = remove -sp_paren_paren = remove # space between (( and )) -sp_return_paren = remove # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_paren_paren = remove +sp_return_paren = remove +sp_sizeof_paren = remove +sp_before_sparen = force +sp_after_sparen = force +sp_after_cast = remove +sp_inside_braces = force +sp_inside_braces_struct = force +sp_inside_braces_enum = force sp_inside_paren = remove sp_inside_fparen = remove sp_inside_sparen = remove @@ -57,12 +57,12 @@ sp_bool = force sp_compare = force sp_assign = force sp_after_comma = force -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_func_def_paren = remove +sp_func_call_paren = remove +sp_func_proto_paren = remove -align_with_tabs = FALSE # use tabs to align -align_on_tabstop = FALSE # align on tabstops +align_with_tabs = FALSE +align_on_tabstop = FALSE align_enum_equ_span = 4 diff --git a/tests/config/align-2.cfg b/tests/config/align-2.cfg index 1e7da238af..7f19b0c7a2 100644 --- a/tests/config/align-2.cfg +++ b/tests/config/align-2.cfg @@ -2,50 +2,50 @@ # My favorite format # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 3 indent_columns = output_tab_size -indent_label = 2 # pos: absolute col, neg: relative column -indent_align_string = False # align broken strings +indent_label = 2 +indent_align_string = False indent_brace = 0 -nl_assign_brace = add # "= {" vs "= \n {" -nl_enum_brace = add # "enum {" vs "enum \n {" -nl_union_brace = add # "union {" vs "union \n {" -nl_struct_brace = add # "struct {" vs "struct \n {" -nl_do_brace = add # "do {" vs "do \n {" -nl_if_brace = add # "if () {" vs "if () \n {" -nl_for_brace = add # "for () {" vs "for () \n {" -nl_else_brace = add # "else {" vs "else \n {" -nl_while_brace = add # "while () {" vs "while () \n {" -nl_switch_brace = add # "switch () {" vs "switch () \n {" +nl_assign_brace = add +nl_enum_brace = add +nl_union_brace = add +nl_struct_brace = add +nl_do_brace = add +nl_if_brace = add +nl_for_brace = add +nl_else_brace = add +nl_while_brace = add +nl_switch_brace = add nl_func_var_def_blk = 1 nl_before_case = 1 -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_fcall_brace = add +nl_fdef_brace = add nl_after_return = TRUE nl_brace_while = remove nl_brace_else = add nl_squeeze_ifdef = TRUE -mod_paren_on_return = add # "return 1;" vs "return (1);" -mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" -mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" +mod_paren_on_return = add +mod_full_brace_if = add +mod_full_brace_for = add +mod_full_brace_do = add +mod_full_brace_while = add sp_before_byref = remove sp_before_semi = remove -sp_paren_paren = remove # space between (( and )) -sp_return_paren = remove # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_paren_paren = remove +sp_return_paren = remove +sp_sizeof_paren = remove +sp_before_sparen = force +sp_after_sparen = force +sp_after_cast = remove +sp_inside_braces = force +sp_inside_braces_struct = force +sp_inside_braces_enum = force sp_inside_paren = remove sp_inside_fparen = remove sp_inside_sparen = remove @@ -57,12 +57,12 @@ sp_bool = force sp_compare = force sp_assign = force sp_after_comma = force -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_func_def_paren = remove +sp_func_call_paren = remove +sp_func_proto_paren = remove -align_with_tabs = FALSE # use tabs to align -align_on_tabstop = FALSE # align on tabstops +align_with_tabs = FALSE +align_on_tabstop = FALSE align_enum_equ_span = 4 diff --git a/tests/config/align-3.cfg b/tests/config/align-3.cfg index 60b0f17343..d8b1ad6793 100644 --- a/tests/config/align-3.cfg +++ b/tests/config/align-3.cfg @@ -2,50 +2,50 @@ # My favorite format # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 3 indent_columns = output_tab_size -indent_label = 2 # pos: absolute col, neg: relative column -indent_align_string = False # align broken strings +indent_label = 2 +indent_align_string = False indent_brace = 0 -nl_assign_brace = add # "= {" vs "= \n {" -nl_enum_brace = add # "enum {" vs "enum \n {" -nl_union_brace = add # "union {" vs "union \n {" -nl_struct_brace = add # "struct {" vs "struct \n {" -nl_do_brace = add # "do {" vs "do \n {" -nl_if_brace = add # "if () {" vs "if () \n {" -nl_for_brace = add # "for () {" vs "for () \n {" -nl_else_brace = add # "else {" vs "else \n {" -nl_while_brace = add # "while () {" vs "while () \n {" -nl_switch_brace = add # "switch () {" vs "switch () \n {" +nl_assign_brace = add +nl_enum_brace = add +nl_union_brace = add +nl_struct_brace = add +nl_do_brace = add +nl_if_brace = add +nl_for_brace = add +nl_else_brace = add +nl_while_brace = add +nl_switch_brace = add nl_func_var_def_blk = 1 nl_before_case = 1 -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_fcall_brace = add +nl_fdef_brace = add nl_after_return = TRUE nl_brace_while = remove nl_brace_else = add nl_squeeze_ifdef = TRUE -mod_paren_on_return = add # "return 1;" vs "return (1);" -mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" -mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" +mod_paren_on_return = add +mod_full_brace_if = add +mod_full_brace_for = add +mod_full_brace_do = add +mod_full_brace_while = add sp_before_byref = remove sp_before_semi = remove -sp_paren_paren = remove # space between (( and )) -sp_return_paren = remove # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_paren_paren = remove +sp_return_paren = remove +sp_sizeof_paren = remove +sp_before_sparen = force +sp_after_sparen = force +sp_after_cast = remove +sp_inside_braces = force +sp_inside_braces_struct = force +sp_inside_braces_enum = force sp_inside_paren = remove sp_inside_fparen = remove sp_inside_sparen = remove @@ -57,12 +57,12 @@ sp_bool = force sp_compare = force sp_assign = force sp_after_comma = force -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_func_def_paren = remove +sp_func_call_paren = remove +sp_func_proto_paren = remove -align_with_tabs = FALSE # use tabs to align -align_on_tabstop = FALSE # align on tabstops +align_with_tabs = FALSE +align_on_tabstop = FALSE align_enum_equ_span = 4 diff --git a/tests/config/amxmodx.cfg b/tests/config/amxmodx.cfg index 18c8a85475..891626fae4 100644 --- a/tests/config/amxmodx.cfg +++ b/tests/config/amxmodx.cfg @@ -134,7 +134,7 @@ align_typedef_star_style = 1 # Start aligning style # Newline Adding and Removing Options # Add/Remove/Ignore -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_fdef_brace = add nl_func_decl_start = ignore # newline after the '(' in a function decl nl_func_decl_args = ignore # newline after each ',' in a function decl nl_func_decl_end = ignore # newline before the ')' in a function decl diff --git a/tests/config/avalon.cfg b/tests/config/avalon.cfg index 04f88f2320..52296bff7c 100644 --- a/tests/config/avalon.cfg +++ b/tests/config/avalon.cfg @@ -1,43 +1,43 @@ # Sets the line endings for the output file -newlines = AUTO # AUTO/LF/CRLF/CR +newlines = AUTO # The original tab space value. # Used to determine what was already aligned. (TODO) -input_tab_size = 2 # number +input_tab_size = 2 # Size of tabs in the output. # Only important if indent_with_tabs=2. -output_tab_size = 2 # number +output_tab_size = 2 # The number of columns to indent. # Usually 2, 3, 4, or 8. -indent_columns = 2 # number +indent_columns = 2 # How to use tabs when indenting code. # 0 = Use spaces only # 1 = Use tabs to the brace-level indent (very portable) # 2 = Use tabs whenever possible -indent_with_tabs = 0 # number +indent_with_tabs = 0 # If an open paren is followed by a newline, indent the next line # so that it lines up after the open paren. # Not recommended. -indent_paren_nl = false # bool +indent_paren_nl = false # Changes the space between # and, say, define. -pp_space = ignore # IARF +pp_space = ignore # Changes the indent of preprocessors. -pp_indent = ignore # IARF +pp_indent = ignore # Spaces to indent case from switch (usually 0 or indent_columns). indent_switch_case = 2 # number * REVISIT: make TRUE/FALSE? * # Spaces to indent '{' from level (usually 0). For GNU style, set to 2. -indent_brace = 0 # number +indent_brace = 0 # Whether braces are indented to the body level or not. -indent_braces = false # bool +indent_braces = false indent_class = false indent_namespace = false @@ -45,16 +45,16 @@ indent_namespace = false # How to indent goto labels. # > 0 : Absolute column (1=leftmost column) # <= 0 : Subtract from brace indent -indent_label = -2 # number +indent_label = -2 # Whether to indent broken strings so that they line up. -indent_align_string = false # bool +indent_align_string = false # Whether to indent comments found in column 1. -indent_col1_comment = false # bool +indent_col1_comment = false # If true, indent continued function call parameters one indent level. -indent_func_call_param = false # bool +indent_func_call_param = false @@ -63,97 +63,97 @@ indent_func_call_param = false # bool # # Space between ')' and '{' -sp_paren_brace = force # IARF +sp_paren_brace = force # Space after cast - "(int) a" vs "(int)a" -sp_after_cast = remove # IARF +sp_after_cast = remove # Space before & in function definition param: -sp_before_byref = remove # IARF +sp_before_byref = remove # Space inside 'foo( xxx )' vs 'foo(xxx)' -sp_inside_fparen = remove # IARF +sp_inside_fparen = remove # space inside '+ ( xxx )' vs '+ (xxx)' -sp_inside_paren = remove # IARF +sp_inside_paren = remove # space inside 'byte[ 5 ]' vs 'byte[5]' -sp_inside_square = remove # IARF +sp_inside_square = remove # Space inside 'if( xxx )' vs 'if(xxx)' -sp_inside_sparen = remove # IARF +sp_inside_sparen = remove # Space inside '<>' -sp_inside_angle = remove # IARF +sp_inside_angle = remove # Space before '(' of 'if/for/while/switch'. -sp_before_sparen = force # IARF +sp_before_sparen = force # Space after ')' of 'if/for/while/switch' -sp_after_sparen = force # IARF +sp_after_sparen = force # Space before '<>' -sp_before_angle = remove # IARF +sp_before_angle = remove # Space after '<>' -sp_after_angle = remove # IARF +sp_after_angle = remove # space before all '[', except '[]' -sp_before_square = force # IARF +sp_before_square = force # space before '[]' -sp_before_squares = remove # IARF +sp_before_squares = remove # space between nested parens - '( (' vs '((' -sp_paren_paren = remove # IARF +sp_paren_paren = remove # space between 'return' and '(' -sp_return_paren = force # IARF +sp_return_paren = force # space between 'sizeof' and '(' -sp_sizeof_paren = remove # IARF +sp_sizeof_paren = remove # space after ',' -sp_after_comma = force # IARF +sp_after_comma = force # space around + - / * etc -sp_arith = force # IARF +sp_arith = force # space around || && -sp_bool = force # IARF +sp_bool = force # space around < > ==, etc -sp_compare = force # IARF +sp_compare = force # space around =, +=, etc -sp_assign = force # IARF +sp_assign = force # space between 'func' and '(' - "foo (" vs "foo(" -sp_func_def_paren = remove # IARF +sp_func_def_paren = remove # space between 'func' and '(' - "foo (" vs "foo(" -sp_func_call_paren = remove # IARF +sp_func_call_paren = remove # space between 'func' and '(' - "foo (" vs "foo(" -sp_func_proto_paren = remove # IARF +sp_func_proto_paren = remove # Space between return type and 'func' #sp_type_func = force # IARF # Space empty stmt ';' on while, if, for -sp_special_semi = force # IARF +sp_special_semi = force # Space before all ';' -sp_before_semi = remove # IARF +sp_before_semi = remove # Space inside '{' and '}' - "{ 1, 2, 3 }" -sp_inside_braces = remove # IARF +sp_inside_braces = remove # Space inside enum '{' and '}' - "{ a, b, c }" -sp_inside_braces_enum = remove # IARF +sp_inside_braces_enum = remove # Space inside struct/union '{' and '}' -sp_inside_braces_struct = remove # IARF +sp_inside_braces_struct = remove @@ -162,52 +162,52 @@ sp_inside_braces_struct = remove # IARF # # Use tabs for aligning. -align_with_tabs = false # bool +align_with_tabs = false # Keep non-indenting tabs. -align_keep_tabs = false # bool +align_keep_tabs = false # When aligning, bump out to the next tabstop. -align_on_tabstop = false # bool +align_on_tabstop = false # Align the back-slash \n combo (macros) -align_nl_cont = true # bool +align_nl_cont = true # Align the '=' in enums -align_enum_equ_span = 0 # bool +align_enum_equ_span = 0 # The span for aligning on '=' in assignments. 0=don't align -align_assign_span = 0 # number +align_assign_span = 0 # Span for aligning comments that end lines. 0=don't align -align_right_cmt_span = 0 # number +align_right_cmt_span = 0 # Span for aligning variable definitions -align_var_def_span = 0 # number +align_var_def_span = 0 # Whether to align inline struct/enum/union var defs -align_var_def_inline = 0 # bool +align_var_def_inline = 0 # Whether the star is part of the variable name or not. -align_var_def_star_style = 2 # bool +align_var_def_star_style = 2 # Align the colon in struct bit fields -align_var_def_colon = false # bool +align_var_def_colon = false # Span for struct/union (0=don't align) -align_var_struct_span = 0 # number +align_var_struct_span = 0 # align bodies in #define statements -align_pp_define_span = 0 # number +align_pp_define_span = 0 # Min space between define label and value "#define a <---> 16" -align_pp_define_gap = 1 # number +align_pp_define_gap = 1 # Align structure initializer values -align_struct_init_span = 0 # number +align_struct_init_span = 0 # Align function prototypes -align_func_proto_span = 0 # number +align_func_proto_span = 0 # right-align numbers #align_number_right: bool * a little buggy * @@ -222,7 +222,7 @@ align_func_proto_span = 0 # number # 0: '*' not part of type # 1: '*' part of the type - no space # 2: '*' part of type, dangling -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 @@ -231,88 +231,88 @@ align_typedef_star_style = 0 # number # # "int foo() {" vs "int foo()\n{" -nl_fdef_brace = force # IARF +nl_fdef_brace = force # Newline after '(' in a function decl -nl_func_decl_start = remove # IARF +nl_func_decl_start = remove # Newline after each ',' in a function decl -nl_func_decl_args = remove # IARF +nl_func_decl_args = remove # Newline before the ')' in a function decl -nl_func_decl_end = remove # IARF +nl_func_decl_end = remove # Newline between return type and func name in def -nl_func_type_name = remove # IARF +nl_func_type_name = remove # Newline after a block of variable defs -nl_func_var_def_blk = 0 # number +nl_func_var_def_blk = 0 # newline before 'case' statement -nl_before_case = false # bool +nl_before_case = false # newline after return statement -nl_after_return = true # bool +nl_after_return = true # Disallow nested "case 1: a=3;" -nl_after_case = true # bool +nl_after_case = true # newline between function call and open brace -nl_fcall_brace = remove # IARF +nl_fcall_brace = remove # No blanks after #ifxx, #elxx, or before #endif -nl_squeeze_ifdef = false # bool +nl_squeeze_ifdef = false # nl between enum and brace -nl_enum_brace = remove # IARF +nl_enum_brace = remove # nl between struct and brace -nl_struct_brace = remove # IARF +nl_struct_brace = remove # nl between union and brace -nl_union_brace = remove # IARF +nl_union_brace = remove # nl between = and { -nl_assign_brace = remove # IARF +nl_assign_brace = remove # nl between do and { -nl_do_brace = remove # IARF +nl_do_brace = remove # nl between if and { -nl_if_brace = remove # IARF +nl_if_brace = remove # nl between for and { -nl_for_brace = remove # IARF +nl_for_brace = remove # nl between else and { -nl_else_brace = remove # IARF +nl_else_brace = remove # nl between while and { -nl_while_brace = remove # IARF +nl_while_brace = remove # nl between switch and { -nl_switch_brace = remove # IARF +nl_switch_brace = remove # nl between } and else -nl_brace_else = remove # IARF +nl_brace_else = remove # nl between } and while of do stmt -nl_brace_while = remove # IARF +nl_brace_while = remove # Alter newlines in #define macros -nl_define_macro = false # bool +nl_define_macro = false # Add or remove newlines at the start of the file -nl_start_of_file = remove # IARF +nl_start_of_file = remove # Number of newlines at the start of the file. Only used if nl_start_of_file is Add or Force #nl_start_of_file_min: number # Add or remove newlines at the end of the file -nl_end_of_file = force # IARF +nl_end_of_file = force # Number of newlines at the end of the file. Only used if nl_end_of_file is Add or Force -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # -1: boolean ops are at the end of the line # 0: do not move boolean ops (default) @@ -327,25 +327,25 @@ pos_bool = Trail # position (Trail, None, Lead) # # Minimum number of newlines before a multi-line comment. -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # Newlines after the closing brace of a function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # Newlines after a single function prototype. -nl_after_func_proto = 1 # number +nl_after_func_proto = 1 # Newlines after a prototype, if not followed by another prototype. -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # The maximum consecutive newlines. -nl_max = 4 # number +nl_max = 4 # Remove blank lines after { -eat_blanks_after_open_brace = true # bool +eat_blanks_after_open_brace = true # Remove blank lines before } -eat_blanks_before_close_brace = true # bool +eat_blanks_before_close_brace = true @@ -354,19 +354,19 @@ eat_blanks_before_close_brace = true # bool # # Add or remove unecessary paren on return. -mod_paren_on_return = remove # IARF +mod_paren_on_return = remove # add or remove braces on single-statement if -mod_full_brace_if = add # IARF +mod_full_brace_if = add # add or remove braces on single-statement for -mod_full_brace_for = add # IARF +mod_full_brace_for = add # add or remove braces on single-statement do -mod_full_brace_do = add # IARF +mod_full_brace_do = add # add or remove braces on single-statement while -mod_full_brace_while = add # IARF +mod_full_brace_while = add # don't remove braces around statements that span X newlines #mod_full_brace_nl: number diff --git a/tests/config/avalon2.cfg b/tests/config/avalon2.cfg index 5025752390..a74c82735b 100644 --- a/tests/config/avalon2.cfg +++ b/tests/config/avalon2.cfg @@ -1,43 +1,43 @@ # Sets the line endings for the output file -newlines = AUTO # AUTO/LF/CRLF/CR +newlines = AUTO # The original tab space value. # Used to determine what was already aligned. (TODO) -input_tab_size = 2 # number +input_tab_size = 2 # Size of tabs in the output. # Only important if indent_with_tabs=2. -output_tab_size = 2 # number +output_tab_size = 2 # The number of columns to indent. # Usually 2, 3, 4, or 8. -indent_columns = 2 # number +indent_columns = 2 # How to use tabs when indenting code. # 0 = Use spaces only # 1 = Use tabs to the brace-level indent (very portable) # 2 = Use tabs whenever possible -indent_with_tabs = 0 # number +indent_with_tabs = 0 # If an open paren is followed by a newline, indent the next line # so that it lines up after the open paren. # Not recommended. -indent_paren_nl = false # bool +indent_paren_nl = false # Changes the space between # and, say, define. -pp_space = ignore # IARF +pp_space = ignore # Changes the indent of preprocessors. -pp_indent = ignore # IARF +pp_indent = ignore # Spaces to indent case from switch (usually 0 or indent_columns). indent_switch_case = 2 # number * REVISIT: make TRUE/FALSE? * # Spaces to indent '{' from level (usually 0). For GNU style, set to 2. -indent_brace = 0 # number +indent_brace = 0 # Whether braces are indented to the body level or not. -indent_braces = false # bool +indent_braces = false indent_class = false indent_namespace = false @@ -45,16 +45,16 @@ indent_namespace = false # How to indent goto labels. # > 0 : Absolute column (1=leftmost column) # <= 0 : Subtract from brace indent -indent_label = -2 # number +indent_label = -2 # Whether to indent broken strings so that they line up. -indent_align_string = false # bool +indent_align_string = false # Whether to indent comments found in column 1. -indent_col1_comment = false # bool +indent_col1_comment = false # If true, indent continued function call parameters one indent level. -indent_func_call_param = false # bool +indent_func_call_param = false @@ -63,100 +63,100 @@ indent_func_call_param = false # bool # # Space between ')' and '{' -sp_paren_brace = force # IARF +sp_paren_brace = force # Space after cast - "(int) a" vs "(int)a" -sp_after_cast = remove # IARF +sp_after_cast = remove # Space before & in function definition param: -sp_before_byref = remove # IARF +sp_before_byref = remove # Space inside 'foo( xxx )' vs 'foo(xxx)' -sp_inside_fparen = remove # IARF +sp_inside_fparen = remove # space inside '+ ( xxx )' vs '+ (xxx)' -sp_inside_paren = remove # IARF +sp_inside_paren = remove # space inside 'byte[ 5 ]' vs 'byte[5]' -sp_inside_square = remove # IARF +sp_inside_square = remove # Space inside 'if( xxx )' vs 'if(xxx)' -sp_inside_sparen = remove # IARF +sp_inside_sparen = remove # Space inside '<>' -sp_inside_angle = remove # IARF +sp_inside_angle = remove # Space before '(' of 'if/for/while/switch'. -sp_before_sparen = force # IARF +sp_before_sparen = force # Space after ')' of 'if/for/while/switch' -sp_after_sparen = force # IARF +sp_after_sparen = force # Space before '<>' -sp_before_angle = remove # IARF +sp_before_angle = remove # Space after '<>' -sp_after_angle = remove # IARF -sp_angle_paren = remove # IARF +sp_after_angle = remove +sp_angle_paren = remove sp_angle_paren_empty = remove -sp_angle_word = force # IARF +sp_angle_word = force # space before all '[', except '[]' -sp_before_square = force # IARF +sp_before_square = force # space before '[]' -sp_before_squares = remove # IARF +sp_before_squares = remove # space between nested parens - '( (' vs '((' -sp_paren_paren = remove # IARF +sp_paren_paren = remove # space between 'return' and '(' -sp_return_paren = force # IARF +sp_return_paren = force # space between 'sizeof' and '(' -sp_sizeof_paren = remove # IARF +sp_sizeof_paren = remove # space after ',' -sp_after_comma = force # IARF +sp_after_comma = force # space around + - / * etc -sp_arith = force # IARF +sp_arith = force # space around || && -sp_bool = force # IARF +sp_bool = force # space around < > ==, etc -sp_compare = force # IARF +sp_compare = force # space around =, +=, etc -sp_assign = force # IARF +sp_assign = force # space between 'func' and '(' - "foo (" vs "foo(" -sp_func_def_paren = remove # IARF +sp_func_def_paren = remove # space between 'func' and '(' - "foo (" vs "foo(" -sp_func_call_paren = remove # IARF +sp_func_call_paren = remove # space between 'func' and '(' - "foo (" vs "foo(" -sp_func_proto_paren = remove # IARF +sp_func_proto_paren = remove # Space between return type and 'func' #sp_type_func = force # IARF # Space empty stmt ';' on while, if, for -sp_special_semi = force # IARF +sp_special_semi = force # Space before all ';' -sp_before_semi = remove # IARF +sp_before_semi = remove # Space inside '{' and '}' - "{ 1, 2, 3 }" -sp_inside_braces = remove # IARF +sp_inside_braces = remove # Space inside enum '{' and '}' - "{ a, b, c }" -sp_inside_braces_enum = remove # IARF +sp_inside_braces_enum = remove # Space inside struct/union '{' and '}' -sp_inside_braces_struct = remove # IARF +sp_inside_braces_struct = remove @@ -165,52 +165,52 @@ sp_inside_braces_struct = remove # IARF # # Use tabs for aligning. -align_with_tabs = false # bool +align_with_tabs = false # Keep non-indenting tabs. -align_keep_tabs = false # bool +align_keep_tabs = false # When aligning, bump out to the next tabstop. -align_on_tabstop = false # bool +align_on_tabstop = false # Align the back-slash \n combo (macros) -align_nl_cont = true # bool +align_nl_cont = true # Align the '=' in enums -align_enum_equ_span = 0 # bool +align_enum_equ_span = 0 # The span for aligning on '=' in assignments. 0=don't align -align_assign_span = 0 # number +align_assign_span = 0 # Span for aligning comments that end lines. 0=don't align -align_right_cmt_span = 0 # number +align_right_cmt_span = 0 # Span for aligning variable definitions -align_var_def_span = 0 # number +align_var_def_span = 0 # Whether to align inline struct/enum/union var defs -align_var_def_inline = 0 # bool +align_var_def_inline = 0 # Whether the star is part of the variable name or not. -align_var_def_star_style = 2 # bool +align_var_def_star_style = 2 # Align the colon in struct bit fields -align_var_def_colon = false # bool +align_var_def_colon = false # Span for struct/union (0=don't align) -align_var_struct_span = 0 # number +align_var_struct_span = 0 # align bodies in #define statements -align_pp_define_span = 0 # number +align_pp_define_span = 0 # Min space between define label and value "#define a <---> 16" -align_pp_define_gap = 1 # number +align_pp_define_gap = 1 # Align structure initializer values -align_struct_init_span = 0 # number +align_struct_init_span = 0 # Align function prototypes -align_func_proto_span = 0 # number +align_func_proto_span = 0 # right-align numbers #align_number_right: bool * a little buggy * @@ -225,7 +225,7 @@ align_func_proto_span = 0 # number # 0: '*' not part of type # 1: '*' part of the type - no space # 2: '*' part of type, dangling -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 @@ -234,88 +234,88 @@ align_typedef_star_style = 0 # number # # "int foo() {" vs "int foo()\n{" -nl_fdef_brace = force # IARF +nl_fdef_brace = force # Newline after '(' in a function decl -nl_func_decl_start = remove # IARF +nl_func_decl_start = remove # Newline after each ',' in a function decl -nl_func_decl_args = remove # IARF +nl_func_decl_args = remove # Newline before the ')' in a function decl -nl_func_decl_end = remove # IARF +nl_func_decl_end = remove # Newline between return type and func name in def -nl_func_type_name = remove # IARF +nl_func_type_name = remove # Newline after a block of variable defs -nl_func_var_def_blk = 0 # number +nl_func_var_def_blk = 0 # newline before 'case' statement -nl_before_case = false # bool +nl_before_case = false # newline after return statement -nl_after_return = true # bool +nl_after_return = true # Disallow nested "case 1: a=3;" -nl_after_case = true # bool +nl_after_case = true # newline between function call and open brace -nl_fcall_brace = remove # IARF +nl_fcall_brace = remove # No blanks after #ifxx, #elxx, or before #endif -nl_squeeze_ifdef = false # bool +nl_squeeze_ifdef = false # nl between enum and brace -nl_enum_brace = remove # IARF +nl_enum_brace = remove # nl between struct and brace -nl_struct_brace = remove # IARF +nl_struct_brace = remove # nl between union and brace -nl_union_brace = remove # IARF +nl_union_brace = remove # nl between = and { -nl_assign_brace = remove # IARF +nl_assign_brace = remove # nl between do and { -nl_do_brace = remove # IARF +nl_do_brace = remove # nl between if and { -nl_if_brace = remove # IARF +nl_if_brace = remove # nl between for and { -nl_for_brace = remove # IARF +nl_for_brace = remove # nl between else and { -nl_else_brace = remove # IARF +nl_else_brace = remove # nl between while and { -nl_while_brace = remove # IARF +nl_while_brace = remove # nl between switch and { -nl_switch_brace = remove # IARF +nl_switch_brace = remove # nl between } and else -nl_brace_else = remove # IARF +nl_brace_else = remove # nl between } and while of do stmt -nl_brace_while = remove # IARF +nl_brace_while = remove # Alter newlines in #define macros -nl_define_macro = false # bool +nl_define_macro = false # Add or remove newlines at the start of the file -nl_start_of_file = remove # IARF +nl_start_of_file = remove # Number of newlines at the start of the file. Only used if nl_start_of_file is Add or Force #nl_start_of_file_min: number # Add or remove newlines at the end of the file -nl_end_of_file = force # IARF +nl_end_of_file = force # Number of newlines at the end of the file. Only used if nl_end_of_file is Add or Force -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # -1: boolean ops are at the end of the line # 0: do not move boolean ops (default) @@ -331,25 +331,25 @@ sp_before_ptr_star = remove # # Minimum number of newlines before a multi-line comment. -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # Newlines after the closing brace of a function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # Newlines after a single function prototype. -nl_after_func_proto = 1 # number +nl_after_func_proto = 1 # Newlines after a prototype, if not followed by another prototype. -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # The maximum consecutive newlines. -nl_max = 4 # number +nl_max = 4 # Remove blank lines after { -eat_blanks_after_open_brace = true # bool +eat_blanks_after_open_brace = true # Remove blank lines before } -eat_blanks_before_close_brace = true # bool +eat_blanks_before_close_brace = true @@ -358,19 +358,19 @@ eat_blanks_before_close_brace = true # bool # # Add or remove unecessary paren on return. -mod_paren_on_return = remove # IARF +mod_paren_on_return = remove # add or remove braces on single-statement if -mod_full_brace_if = add # IARF +mod_full_brace_if = add # add or remove braces on single-statement for -mod_full_brace_for = add # IARF +mod_full_brace_for = add # add or remove braces on single-statement do -mod_full_brace_do = add # IARF +mod_full_brace_do = add # add or remove braces on single-statement while -mod_full_brace_while = add # IARF +mod_full_brace_while = add # don't remove braces around statements that span X newlines #mod_full_brace_nl: number diff --git a/tests/config/avalon3.cfg b/tests/config/avalon3.cfg index 9c23d13c1d..0bcbfca6e7 100644 --- a/tests/config/avalon3.cfg +++ b/tests/config/avalon3.cfg @@ -4,504 +4,504 @@ # # The type of line endings -newlines = lf # auto/lf/crlf/cr +newlines = lf # The original size of tabs in the input -input_tab_size = 2 # number +input_tab_size = 2 # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 2 # number +output_tab_size = 2 # The ascii value of the string escape char, usually 92 (\). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # # Indenting # # The number of columns to indent per level (usually 2, 3, 4, or 8) -indent_columns = 2 # number +indent_columns = 2 # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # Whether to indent strings broken by '\' so that they line up -indent_align_string = false # false/true +indent_align_string = false # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # Whether to indent the stuff after a leading class colon -indent_class_colon = true # false/true +indent_class_colon = true # Whether to indent continued function call parameters one indent level (true) or aligns instead of indent (false) -indent_func_call_param = true # false/true +indent_func_call_param = true # The number of spaces to indent a continued '->' or '.' # Usually set to indent_columns. -indent_member = 0 # number +indent_member = 0 # Spaces to indent 'case' from 'switch' -indent_switch_case = 2 # number +indent_switch_case = 2 # Spaces to indent '{' from 'case' -indent_case_brace = 0 # number +indent_case_brace = 0 # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # How to indent goto labels (>0=absolute column where 1 is the leftmost column, <=0=subtract from brace indent) -indent_label = -2 # number +indent_label = -2 # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # Add or remove space between ')' and '{' -sp_paren_brace = force # ignore/add/remove/force +sp_paren_brace = force # Add or remove space before pointer star '*' -sp_before_ptr_star = remove # ignore/add/remove/force +sp_before_ptr_star = remove # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # Add or remove space after pointer star '*' -sp_after_ptr_star = force # ignore/add/remove/force +sp_after_ptr_star = force # Add or remove space before reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # Add or remove space after reference sign '&' -sp_after_byref = force # ignore/add/remove/force +sp_after_byref = force # Add or remove space before '<>' -sp_before_angle = remove # ignore/add/remove/force +sp_before_angle = remove # Add or remove space after '<>' -sp_after_angle = remove # ignore/add/remove/force +sp_after_angle = remove # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = force # ignore/add/remove/force +sp_sparen_brace = force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = force # ignore/add/remove/force +sp_special_semi = force # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # Add or remove space before '[' (except '[]') -sp_before_square = remove # ignore/add/remove/force +sp_before_square = remove # Add or remove space before '[]' -sp_before_squares = remove # ignore/add/remove/force +sp_before_squares = remove # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # Add or remove space between 'operator' and operator sign -sp_after_operator = remove # ignore/add/remove/force +sp_after_operator = remove # Add or remove space after cast -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = remove # ignore/add/remove/force +sp_inside_braces_enum = remove # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = remove # ignore/add/remove/force +sp_inside_braces_struct = remove # Add or remove space inside '{' and '}' -sp_inside_braces = remove # ignore/add/remove/force +sp_inside_braces = remove # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove sp_angle_word = force sp_angle_paren = remove sp_angle_paren_empty = remove # Add or remove space between return type and function name (a minimum of 1 is forced except for pointer return types) -sp_type_func = ignore # ignore/add/remove/force +sp_type_func = ignore # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # Add or remove space between ')' and '{' of function -sp_fparen_brace = force # ignore/add/remove/force +sp_fparen_brace = force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # Add or remove space between 'return' and '(' -sp_return_paren = force # ignore/add/remove/force +sp_return_paren = force # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = force # ignore/add/remove/force +sp_else_brace = force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = force # ignore/add/remove/force +sp_brace_else = force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # The span for aligning variable definitions (0=don't align) -align_var_def_span = 0 # number +align_var_def_span = 0 # Whether the pointer star is part of the variable name or not -align_var_def_star_style = 2 # false/true +align_var_def_star_style = 2 # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = false # false/true +align_var_def_inline = false # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 0 # number +align_assign_span = 0 # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 0 # number +align_enum_equ_span = 0 # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # The span for aligning struct/union (0=don't align) -align_var_struct_span = 0 # number +align_var_struct_span = 0 # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 0 # number +align_struct_init_span = 0 # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number +align_typedef_gap = 0 # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 0 # number +align_typedef_span = 0 # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type: typedef int * pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 0 # number +align_right_cmt_span = 0 # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # Whether to align macros wrapped with a backslash and a newline -align_nl_cont = true # false/true +align_nl_cont = true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 1 # number +align_pp_define_gap = 1 # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 0 # number +align_pp_define_span = 0 # # Newline adding and removing options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = true # false/true +nl_collapse_empty_body = true # Don't touch one-line function bodies inside a class xx { } body -nl_class_leave_one_liners = false # false/true +nl_class_leave_one_liners = false # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 2 # number +nl_end_of_file_min = 2 # Add or remove newline between '=' and '{' -nl_assign_brace = remove # ignore/add/remove/force +nl_assign_brace = remove # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 0 # number +nl_func_var_def_blk = 0 # Add or remove newline between function call and '(' -nl_fcall_brace = remove # ignore/add/remove/force +nl_fcall_brace = remove # Add or remove newline between 'enum' and '{' -nl_enum_brace = remove # ignore/add/remove/force +nl_enum_brace = remove # Add or remove newline between 'struct and '{' -nl_struct_brace = remove # ignore/add/remove/force +nl_struct_brace = remove # Add or remove newline between 'union' and '{' -nl_union_brace = remove # ignore/add/remove/force +nl_union_brace = remove # Add or remove newline between 'if' and '{' -nl_if_brace = remove # ignore/add/remove/force +nl_if_brace = remove # Add or remove newline between '}' and 'else' -nl_brace_else = remove # ignore/add/remove/force +nl_brace_else = remove # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = remove # ignore/add/remove/force +nl_elseif_brace = remove # Add or remove newline between 'else' and '{' -nl_else_brace = remove # ignore/add/remove/force +nl_else_brace = remove # Add or remove newline between 'for' and '{' -nl_for_brace = remove # ignore/add/remove/force +nl_for_brace = remove # Add or remove newline between 'while' and '{' -nl_while_brace = remove # ignore/add/remove/force +nl_while_brace = remove # Add or remove newline between 'do' and '{' -nl_do_brace = remove # ignore/add/remove/force +nl_do_brace = remove # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # Add or remove newline between 'switch' and '{' -nl_switch_brace = remove # ignore/add/remove/force +nl_switch_brace = remove # Whether to put a newline before 'case' statement -nl_before_case = false # false/true +nl_before_case = false # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # Newline between namespace and { -nl_namespace_brace = remove # ignore/add/remove/force +nl_namespace_brace = remove # Add or remove newline between 'template<>' and 'class' -nl_template_class = force # ignore/add/remove/force +nl_template_class = force # Add or remove newline between 'class' and '{' -nl_class_brace = force # ignore/add/remove/force +nl_class_brace = force # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = force # ignore/add/remove/force +nl_class_init_args = force # Add or remove newline between return type and function name in definition -nl_func_type_name = remove # ignore/add/remove/force +nl_func_type_name = remove # Add or remove newline after '(' in a function declaration -nl_func_decl_start = remove # ignore/add/remove/force +nl_func_decl_start = remove # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = remove # ignore/add/remove/force +nl_func_decl_args = remove # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = remove # ignore/add/remove/force +nl_func_decl_end = remove # Add or remove newline between function signature and '{' -nl_fdef_brace = force # ignore/add/remove/force +nl_fdef_brace = force # Whether to put a newline after 'return' statement -nl_after_return = false # false/true +nl_after_return = false # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = false # false/true +nl_after_semicolon = false # Whether to put a newline after brace open -nl_after_brace_open = true # false/true +nl_after_brace_open = true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true +nl_squeeze_ifdef = false # # Positioning options # # The position of boolean operators in wrapped expressions -pos_bool = ignore # ignore/lead/trail +pos_bool = ignore # The position of colons between constructor and member initialization -pos_class_colon = lead # ignore/lead/trail +pos_class_colon = lead # # Blank line options # # The maximum consecutive newlines -nl_max = 3 # number +nl_max = 3 # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 1 # number +nl_after_func_proto = 1 # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # The number of newlines after '}' of the function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # The minimum number of newlines before a multi-line comment (doesn't apply if after a brace open) -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = false # false/true +eat_blanks_before_close_brace = false # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = ignore # ignore/add/remove/force +mod_full_brace_do = ignore # Add or remove braces on single-line 'for' statement -mod_full_brace_for = ignore # ignore/add/remove/force +mod_full_brace_for = ignore # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # Add or remove braces on single-line 'if' statement -mod_full_brace_if = ignore # ignore/add/remove/force +mod_full_brace_if = ignore # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = remove # ignore/add/remove/force +mod_paren_on_return = remove # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = true # false/true +mod_pawn_semicolon = true # # Comment modifications # # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # # Preprocessor options # # Add or remove indent of preprocessor directives -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # Add or remove space between # and, say, define -pp_space = ignore # ignore/add/remove/force +pp_space = ignore diff --git a/tests/config/avalon4.cfg b/tests/config/avalon4.cfg index 0474f21e17..5515010b3c 100644 --- a/tests/config/avalon4.cfg +++ b/tests/config/avalon4.cfg @@ -4,19 +4,19 @@ # # The type of line endings -newlines = lf # auto/lf/crlf/cr +newlines = lf # The original size of tabs in the input -input_tab_size = 2 # number +input_tab_size = 2 # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 2 # number +output_tab_size = 2 # The ascii value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # # Indenting @@ -24,642 +24,642 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 2 # number +indent_columns = 2 # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # Whether to indent strings broken by '\' so that they line up -indent_align_string = false # false/true +indent_align_string = false # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # Whether to indent the stuff after a leading class colon -indent_class_colon = true # false/true +indent_class_colon = true # Whether to indent continued function call parameters one indent level (true) or aligns instead of indent (false) -indent_func_call_param = true # false/true +indent_func_call_param = true # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 0 # number +indent_member = 0 # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 2 # number +indent_switch_case = 2 # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 0 # number +indent_case_brace = 0 # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # Add or remove space between nested parens -sp_paren_paren = ignore # ignore/add/remove/force +sp_paren_paren = ignore # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # Add or remove space between ')' and '{' -sp_paren_brace = force # ignore/add/remove/force +sp_paren_brace = force # Add or remove space before pointer star '*' -sp_before_ptr_star = remove # ignore/add/remove/force +sp_before_ptr_star = remove # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # Add or remove space after pointer star '*' -sp_after_ptr_star = force # ignore/add/remove/force +sp_after_ptr_star = force # Add or remove space before reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # Add or remove space after reference sign '&' -sp_after_byref = force # ignore/add/remove/force +sp_after_byref = force # Add or remove space before '<>' -sp_before_angle = remove # ignore/add/remove/force +sp_before_angle = remove # Add or remove space after '<>' -sp_after_angle = ignore # ignore/add/remove/force +sp_after_angle = ignore # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = remove # ignore/add/remove/force +sp_angle_paren = remove sp_angle_paren_empty = remove # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = force # ignore/add/remove/force +sp_angle_word = force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = force # ignore/add/remove/force +sp_sparen_brace = force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = force # ignore/add/remove/force +sp_special_semi = force # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = remove # ignore/add/remove/force +sp_before_semi_for = remove # Add or remove space before a semicolon of an empty part of a for statement. -sp_before_semi_for_empty = ignore # ignore/add/remove/force +sp_before_semi_for_empty = ignore # Add or remove space before '[' (except '[]') -sp_before_square = remove # ignore/add/remove/force +sp_before_square = remove # Add or remove space before '[]' -sp_before_squares = remove # ignore/add/remove/force +sp_before_squares = remove # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # Add or remove space between 'operator' and operator sign -sp_after_operator = remove # ignore/add/remove/force +sp_after_operator = remove # Add or remove space after cast -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # Add or remove spaces inside cast parens -sp_inside_paren_cast = remove # ignore/add/remove/force +sp_inside_paren_cast = remove # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = remove # ignore/add/remove/force +sp_inside_braces_enum = remove # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = remove # ignore/add/remove/force +sp_inside_braces_struct = remove # Add or remove space inside '{' and '}' -sp_inside_braces = remove # ignore/add/remove/force +sp_inside_braces = remove # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = force # ignore/add/remove/force +sp_type_func = force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # Add or remove space between ')' and '{' of function -sp_fparen_brace = force # ignore/add/remove/force +sp_fparen_brace = force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # Add or remove space between 'return' and '(' -sp_return_paren = force # ignore/add/remove/force +sp_return_paren = force # Add or remove space between macro and value -sp_macro = force # ignore/add/remove/force +sp_macro = force # Add or remove space between macro function ')' and value -sp_macro_func = force # ignore/add/remove/force +sp_macro_func = force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = force # ignore/add/remove/force +sp_else_brace = force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = force # ignore/add/remove/force +sp_brace_else = force # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = force # ignore/add/remove/force +sp_catch_brace = force # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = force # ignore/add/remove/force +sp_brace_catch = force # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = force # ignore/add/remove/force +sp_finally_brace = force # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = force # ignore/add/remove/force +sp_brace_finally = force # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = force # ignore/add/remove/force +sp_try_brace = force # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = force # ignore/add/remove/force +sp_getset_brace = force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # Align variable definitions in prototypes and functions -align_func_params = false # false/true +align_func_params = false # The span for aligning variable definitions (0=don't align) -align_var_def_span = 0 # number +align_var_def_span = 0 # How to align the star in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_star_style = 0 # number +align_var_def_star_style = 0 # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = false # false/true +align_var_def_inline = false # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 0 # number +align_assign_span = 0 # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 0 # number +align_enum_equ_span = 0 # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # The span for aligning struct/union (0=don't align) -align_var_struct_span = 0 # number +align_var_struct_span = 0 # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 0 # number +align_struct_init_span = 0 # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number +align_typedef_gap = 0 # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 0 # number +align_typedef_span = 0 # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 0 # number +align_right_cmt_span = 0 # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # Whether to align macros wrapped with a backslash and a newline -align_nl_cont = true # false/true +align_nl_cont = true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 1 # number +align_pp_define_gap = 1 # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 0 # number +align_pp_define_span = 0 # # Newline adding and removing options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = true # false/true +nl_collapse_empty_body = true # Don't touch one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = false # false/true +nl_assign_leave_one_liners = false # Don't touch one-line function bodies inside a class xx { } body -nl_class_leave_one_liners = false # false/true +nl_class_leave_one_liners = false # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # Add or remove newline between '=' and '{' -nl_assign_brace = remove # ignore/add/remove/force +nl_assign_brace = remove # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 0 # number +nl_func_var_def_blk = 0 # Add or remove newline between function call and '(' -nl_fcall_brace = remove # ignore/add/remove/force +nl_fcall_brace = remove # Add or remove newline between 'enum' and '{' -nl_enum_brace = remove # ignore/add/remove/force +nl_enum_brace = remove # Add or remove newline between 'struct and '{' -nl_struct_brace = remove # ignore/add/remove/force +nl_struct_brace = remove # Add or remove newline between 'union' and '{' -nl_union_brace = remove # ignore/add/remove/force +nl_union_brace = remove # Add or remove newline between 'if' and '{' -nl_if_brace = remove # ignore/add/remove/force +nl_if_brace = remove # Add or remove newline between '}' and 'else' -nl_brace_else = remove # ignore/add/remove/force +nl_brace_else = remove # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = remove # ignore/add/remove/force +nl_elseif_brace = remove # Add or remove newline between 'else' and '{' -nl_else_brace = remove # ignore/add/remove/force +nl_else_brace = remove # Add or remove newline between '}' and 'finally' -nl_brace_finally = remove # ignore/add/remove/force +nl_brace_finally = remove # Add or remove newline between 'finally' and '{' -nl_finally_brace = remove # ignore/add/remove/force +nl_finally_brace = remove # Add or remove newline between 'try' and '{' -nl_try_brace = remove # ignore/add/remove/force +nl_try_brace = remove # Add or remove newline between get/set and '{' -nl_getset_brace = remove # ignore/add/remove/force +nl_getset_brace = remove # Add or remove newline between 'for' and '{' -nl_for_brace = remove # ignore/add/remove/force +nl_for_brace = remove # Add or remove newline between 'catch' and '{' -nl_catch_brace = remove # ignore/add/remove/force +nl_catch_brace = remove # Add or remove newline between '}' and 'catch' -nl_brace_catch = remove # ignore/add/remove/force +nl_brace_catch = remove # Add or remove newline between 'while' and '{' -nl_while_brace = remove # ignore/add/remove/force +nl_while_brace = remove # Add or remove newline between 'do' and '{' -nl_do_brace = remove # ignore/add/remove/force +nl_do_brace = remove # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # Add or remove newline between 'switch' and '{' -nl_switch_brace = remove # ignore/add/remove/force +nl_switch_brace = remove # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # Newline between namespace and { -nl_namespace_brace = remove # ignore/add/remove/force +nl_namespace_brace = remove # Add or remove newline between 'template<>' and 'class' -nl_template_class = force # ignore/add/remove/force +nl_template_class = force # Add or remove newline between 'class' and '{' -nl_class_brace = force # ignore/add/remove/force +nl_class_brace = force # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = force # ignore/add/remove/force +nl_class_init_args = force # Add or remove newline between return type and function name in definition -nl_func_type_name = remove # ignore/add/remove/force +nl_func_type_name = remove # Add or remove newline after '(' in a function declaration -nl_func_decl_start = remove # ignore/add/remove/force +nl_func_decl_start = remove # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = remove # ignore/add/remove/force +nl_func_decl_args = remove # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = remove # ignore/add/remove/force +nl_func_decl_end = remove # Add or remove newline between function signature and '{' -nl_fdef_brace = force # ignore/add/remove/force +nl_fdef_brace = force # Whether to put a newline after 'return' statement -nl_after_return = false # false/true +nl_after_return = false # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # Whether to put a newline after brace open -nl_after_brace_open = true # false/true +nl_after_brace_open = true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = true # false/true +nl_squeeze_ifdef = true # Add or remove newline before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # Add or remove newline after 'if' -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # Add or remove newline before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # Add or remove newline after 'for' -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # Add or remove newline before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # Add or remove newline after 'while' -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # Add or remove newline before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # Add or remove newline after 'switch' -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # Add or remove newline before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # Add or remove newline after 'do' -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = true # false/true +nl_ds_struct_enum_cmt = true # # Positioning options # # The position of boolean operators in wrapped expressions -pos_bool = ignore # ignore/lead/trail +pos_bool = ignore # The position of the comma in wrapped expressions -pos_comma = trail # ignore/lead/trail -pos_class_comma = trail # ignore/lead/trail +pos_comma = trail +pos_class_comma = trail # The position of colons between constructor and member initialization -pos_class_colon = lead # ignore/lead/trail +pos_class_colon = lead # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true +ls_for_split_full = false # Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true +ls_func_split_full = false # # Blank line options # # The maximum consecutive newlines -nl_max = 3 # number +nl_max = 3 # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 1 # number +nl_after_func_proto = 1 # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 1 # number +nl_after_func_body_one_liner = 1 # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = false # false/true +eat_blanks_after_open_brace = false # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = false # false/true +eat_blanks_before_close_brace = false # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # Add or remove braces on single-line 'if' statement -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = remove # ignore/add/remove/force +mod_paren_on_return = remove # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = true # false/true +mod_pawn_semicolon = true # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = false # false/true +mod_full_paren_if_bool = false # # Comment modifications # # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # # Preprocessor options # # Add or remove indent of preprocessor directives -pp_indent = remove # ignore/add/remove/force +pp_indent = remove # Add or remove space between # and, say, define -pp_space = remove # ignore/add/remove/force +pp_space = remove # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/blc-1.cfg b/tests/config/blc-1.cfg index f8fd034d0a..6a63b4bd92 100644 --- a/tests/config/blc-1.cfg +++ b/tests/config/blc-1.cfg @@ -2,9 +2,9 @@ # Blank Line Count test 1 # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 3 indent_columns = output_tab_size nl_max = 4 diff --git a/tests/config/bool-pos-eol-break.cfg b/tests/config/bool-pos-eol-break.cfg index 87f4682953..af5158a726 100644 --- a/tests/config/bool-pos-eol-break.cfg +++ b/tests/config/bool-pos-eol-break.cfg @@ -4,9 +4,9 @@ # $Id: bool-pos-eol.cfg 803 2007-07-25 00:36:25Z bengardner $ # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 3 indent_columns = output_tab_size pos_bool = trail_break diff --git a/tests/config/bool-pos-eol-force.cfg b/tests/config/bool-pos-eol-force.cfg index 033149b548..28441bd718 100644 --- a/tests/config/bool-pos-eol-force.cfg +++ b/tests/config/bool-pos-eol-force.cfg @@ -4,9 +4,9 @@ # $Id: bool-pos-eol.cfg 803 2007-07-25 00:36:25Z bengardner $ # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 3 indent_columns = output_tab_size pos_bool = trail_force diff --git a/tests/config/bool-pos-eol.cfg b/tests/config/bool-pos-eol.cfg index 951be6033e..8de5f81de6 100644 --- a/tests/config/bool-pos-eol.cfg +++ b/tests/config/bool-pos-eol.cfg @@ -2,9 +2,9 @@ # moves boolean ops to the end of line # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 3 indent_columns = output_tab_size pos_bool = Trail diff --git a/tests/config/bool-pos-sol-break.cfg b/tests/config/bool-pos-sol-break.cfg index 79b226d016..0a03ca1efc 100644 --- a/tests/config/bool-pos-sol-break.cfg +++ b/tests/config/bool-pos-sol-break.cfg @@ -4,9 +4,9 @@ # $Id: bool-pos-sol.cfg 803 2007-07-25 00:36:25Z bengardner $ # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 3 indent_columns = output_tab_size pos_bool = Lead_break diff --git a/tests/config/bool-pos-sol-force.cfg b/tests/config/bool-pos-sol-force.cfg index eaf5bde000..057308906c 100644 --- a/tests/config/bool-pos-sol-force.cfg +++ b/tests/config/bool-pos-sol-force.cfg @@ -4,9 +4,9 @@ # $Id: bool-pos-sol.cfg 803 2007-07-25 00:36:25Z bengardner $ # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 3 indent_columns = output_tab_size pos_bool = Lead_force diff --git a/tests/config/bool-pos-sol.cfg b/tests/config/bool-pos-sol.cfg index dc7db0d38a..16e395b968 100644 --- a/tests/config/bool-pos-sol.cfg +++ b/tests/config/bool-pos-sol.cfg @@ -2,9 +2,9 @@ # moves boolean ops to the end of line # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 3 indent_columns = output_tab_size pos_bool = Lead diff --git a/tests/config/brace-allman.cfg b/tests/config/brace-allman.cfg index bb1c512010..6fc31c11e1 100644 --- a/tests/config/brace-allman.cfg +++ b/tests/config/brace-allman.cfg @@ -2,24 +2,24 @@ # Allman style # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 8 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 8 indent_columns = output_tab_size # brace settings -nl_assign_brace = add # "= {" vs "= \n {" -nl_enum_brace = add # "enum {" vs "enum \n {" -nl_union_brace = add # "union {" vs "union \n {" -nl_struct_brace = add # "struct {" vs "struct \n {" -nl_do_brace = add # "do {" vs "do \n {" -nl_if_brace = add # "if () {" vs "if () \n {" -nl_for_brace = add # "for () {" vs "for () \n {" -nl_else_brace = add # "else {" vs "else \n {" -nl_while_brace = add # "while () {" vs "while () \n {" -nl_switch_brace = add # "switch () {" vs "switch () \n {" -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_assign_brace = add +nl_enum_brace = add +nl_union_brace = add +nl_struct_brace = add +nl_do_brace = add +nl_if_brace = add +nl_for_brace = add +nl_else_brace = add +nl_while_brace = add +nl_switch_brace = add +nl_fcall_brace = add +nl_fdef_brace = add nl_brace_while = remove nl_brace_else = add diff --git a/tests/config/brace-banner.cfg b/tests/config/brace-banner.cfg index dbe8f64fba..d55104a4f8 100644 --- a/tests/config/brace-banner.cfg +++ b/tests/config/brace-banner.cfg @@ -2,33 +2,33 @@ # Banner style # -indent_with_tabs = 1 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 2 # new tab size +indent_with_tabs = 1 +input_tab_size = 8 +output_tab_size = 2 indent_columns = output_tab_size indent_braces = TRUE indent_braces_no_func = TRUE # brace settings -nl_assign_brace = remove # "= {" vs "= \n {" -nl_enum_brace = remove # "enum {" vs "enum \n {" -nl_union_brace = remove # "union {" vs "union \n {" -nl_struct_brace = remove # "struct {" vs "struct \n {" -nl_do_brace = remove # "do {" vs "do \n {" -nl_if_brace = remove # "if () {" vs "if () \n {" -nl_for_brace = remove # "for () {" vs "for () \n {" -nl_else_brace = remove # "else {" vs "else \n {" -nl_while_brace = remove # "while () {" vs "while () \n {" -nl_switch_brace = remove # "switch () {" vs "switch () \n {" -nl_fcall_brace = remove # "foo() {" vs "foo()\n{" -nl_fdef_brace = remove # "int foo() {" vs "int foo()\n{" +nl_assign_brace = remove +nl_enum_brace = remove +nl_union_brace = remove +nl_struct_brace = remove +nl_do_brace = remove +nl_if_brace = remove +nl_for_brace = remove +nl_else_brace = remove +nl_while_brace = remove +nl_switch_brace = remove +nl_fcall_brace = remove +nl_fdef_brace = remove nl_brace_while = add nl_brace_else = add # spaces around braces -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" +sp_before_sparen = force +sp_after_sparen = force sp_assign = add sp_fparen_brace = add diff --git a/tests/config/brace-gnu.cfg b/tests/config/brace-gnu.cfg index 53db33769e..ff624c1fac 100644 --- a/tests/config/brace-gnu.cfg +++ b/tests/config/brace-gnu.cfg @@ -2,9 +2,9 @@ # GNU style # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 2 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 2 indent_columns = 2 # indent extra 2 spaces per brace pair @@ -15,20 +15,20 @@ indent_brace = 2 # nl_enum_brace = add # "enum {" vs "enum \n {" # nl_union_brace = add # "union {" vs "union \n {" # nl_struct_brace = add # "struct {" vs "struct \n {" -nl_do_brace = add # "do {" vs "do \n {" -nl_if_brace = add # "if () {" vs "if () \n {" -nl_for_brace = add # "for () {" vs "for () \n {" -nl_else_brace = add # "else {" vs "else \n {" -nl_while_brace = add # "while () {" vs "while () \n {" -nl_switch_brace = add # "switch () {" vs "switch () \n {" -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_do_brace = add +nl_if_brace = add +nl_for_brace = add +nl_else_brace = add +nl_while_brace = add +nl_switch_brace = add +nl_fcall_brace = add +nl_fdef_brace = add nl_brace_while = add nl_brace_else = add # spaces around braces -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" +sp_before_sparen = force +sp_after_sparen = force sp_assign = add sp_else_brace = force diff --git a/tests/config/brace-kr-br.cfg b/tests/config/brace-kr-br.cfg index 4b221ee9df..458bf68c54 100644 --- a/tests/config/brace-kr-br.cfg +++ b/tests/config/brace-kr-br.cfg @@ -4,30 +4,30 @@ # $Id: brace-kr.cfg 803 2007-07-25 00:36:25Z bengardner $ # -indent_with_tabs = 1 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 8 # new tab size +indent_with_tabs = 1 +input_tab_size = 8 +output_tab_size = 8 indent_columns = output_tab_size # brace placement -nl_assign_brace = remove # "= {" vs "= \n {" -nl_enum_brace = remove # "enum {" vs "enum \n {" -nl_union_brace = remove # "union {" vs "union \n {" -nl_struct_brace = remove # "struct {" vs "struct \n {" -nl_do_brace = remove # "do {" vs "do \n {" -nl_if_brace = remove # "if () {" vs "if () \n {" -nl_for_brace = remove # "for () {" vs "for () \n {" -nl_else_brace = remove # "else {" vs "else \n {" -nl_while_brace = remove # "while () {" vs "while () \n {" -nl_switch_brace = remove # "switch () {" vs "switch () \n {" -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_assign_brace = remove +nl_enum_brace = remove +nl_union_brace = remove +nl_struct_brace = remove +nl_do_brace = remove +nl_if_brace = remove +nl_for_brace = remove +nl_else_brace = remove +nl_while_brace = remove +nl_switch_brace = remove +nl_fcall_brace = add +nl_fdef_brace = add nl_brace_while = remove nl_brace_else = remove # spaces around braces -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" +sp_before_sparen = force +sp_after_sparen = force sp_assign = add sp_else_brace = force diff --git a/tests/config/brace-kr-nobr.cfg b/tests/config/brace-kr-nobr.cfg index eca4de2510..efab1eb79d 100644 --- a/tests/config/brace-kr-nobr.cfg +++ b/tests/config/brace-kr-nobr.cfg @@ -2,30 +2,30 @@ # K&R style # -indent_with_tabs = 1 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 8 # new tab size +indent_with_tabs = 1 +input_tab_size = 8 +output_tab_size = 8 indent_columns = output_tab_size # brace placement -nl_assign_brace = remove # "= {" vs "= \n {" -nl_enum_brace = remove # "enum {" vs "enum \n {" -nl_union_brace = remove # "union {" vs "union \n {" -nl_struct_brace = remove # "struct {" vs "struct \n {" -nl_do_brace = remove # "do {" vs "do \n {" -nl_if_brace = remove # "if () {" vs "if () \n {" -nl_for_brace = remove # "for () {" vs "for () \n {" -nl_else_brace = remove # "else {" vs "else \n {" -nl_while_brace = remove # "while () {" vs "while () \n {" -nl_switch_brace = remove # "switch () {" vs "switch () \n {" -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_assign_brace = remove +nl_enum_brace = remove +nl_union_brace = remove +nl_struct_brace = remove +nl_do_brace = remove +nl_if_brace = remove +nl_for_brace = remove +nl_else_brace = remove +nl_while_brace = remove +nl_switch_brace = remove +nl_fcall_brace = add +nl_fdef_brace = add nl_brace_while = remove nl_brace_else = remove # spaces around braces -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" +sp_before_sparen = force +sp_after_sparen = force sp_assign = add sp_else_brace = force diff --git a/tests/config/brace-kr.cfg b/tests/config/brace-kr.cfg index 381f9b5c5e..515ff61c13 100644 --- a/tests/config/brace-kr.cfg +++ b/tests/config/brace-kr.cfg @@ -2,30 +2,30 @@ # K&R style # -indent_with_tabs = 1 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 8 # new tab size +indent_with_tabs = 1 +input_tab_size = 8 +output_tab_size = 8 indent_columns = output_tab_size # brace placement -nl_assign_brace = remove # "= {" vs "= \n {" -nl_enum_brace = remove # "enum {" vs "enum \n {" -nl_union_brace = remove # "union {" vs "union \n {" -nl_struct_brace = remove # "struct {" vs "struct \n {" -nl_do_brace = remove # "do {" vs "do \n {" -nl_if_brace = remove # "if () {" vs "if () \n {" -nl_for_brace = remove # "for () {" vs "for () \n {" -nl_else_brace = remove # "else {" vs "else \n {" -nl_while_brace = remove # "while () {" vs "while () \n {" -nl_switch_brace = remove # "switch () {" vs "switch () \n {" -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_assign_brace = remove +nl_enum_brace = remove +nl_union_brace = remove +nl_struct_brace = remove +nl_do_brace = remove +nl_if_brace = remove +nl_for_brace = remove +nl_else_brace = remove +nl_while_brace = remove +nl_switch_brace = remove +nl_fcall_brace = add +nl_fdef_brace = add nl_brace_while = remove nl_brace_else = remove # spaces around braces -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" +sp_before_sparen = force +sp_after_sparen = force sp_assign = add sp_else_brace = force diff --git a/tests/config/brace-remove-2.cfg b/tests/config/brace-remove-2.cfg index d010c558cf..9e0916058a 100644 --- a/tests/config/brace-remove-2.cfg +++ b/tests/config/brace-remove-2.cfg @@ -3,10 +3,10 @@ # -mod_paren_on_return = remove # "return 1;" vs "return (1);" -mod_full_brace_if = remove # "if (a) a--;" vs "if (a) { a--; }" -mod_full_brace_for = remove # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = remove # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = remove # "while (a) a--;" vs "while (a) { a--; }" -mod_full_brace_nl = 2 # don't remove if more than 3 newlines +mod_paren_on_return = remove +mod_full_brace_if = remove +mod_full_brace_for = remove +mod_full_brace_do = remove +mod_full_brace_while = remove +mod_full_brace_nl = 2 diff --git a/tests/config/brace-remove-all.cfg b/tests/config/brace-remove-all.cfg index 6135a7ecd3..7a3375d14a 100644 --- a/tests/config/brace-remove-all.cfg +++ b/tests/config/brace-remove-all.cfg @@ -3,11 +3,11 @@ # -mod_paren_on_return = remove # "return 1;" vs "return (1);" -mod_full_brace_if = remove # "if (a) a--;" vs "if (a) { a--; }" -mod_full_brace_for = remove # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = remove # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = remove # "while (a) a--;" vs "while (a) { a--; }" +mod_paren_on_return = remove +mod_full_brace_if = remove +mod_full_brace_for = remove +mod_full_brace_do = remove +mod_full_brace_while = remove nl_else_if = remove diff --git a/tests/config/brace-ws.cfg b/tests/config/brace-ws.cfg index d21da04dd3..be66d343da 100644 --- a/tests/config/brace-ws.cfg +++ b/tests/config/brace-ws.cfg @@ -2,26 +2,26 @@ # Whitesmith style # -indent_with_tabs = 1 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 8 # new tab size +indent_with_tabs = 1 +input_tab_size = 8 +output_tab_size = 8 indent_columns = output_tab_size indent_braces = TRUE # brace settings -nl_assign_brace = add # "= {" vs "= \n {" -nl_enum_brace = add # "enum {" vs "enum \n {" -nl_union_brace = add # "union {" vs "union \n {" -nl_struct_brace = add # "struct {" vs "struct \n {" -nl_do_brace = add # "do {" vs "do \n {" -nl_if_brace = add # "if () {" vs "if () \n {" -nl_for_brace = add # "for () {" vs "for () \n {" -nl_else_brace = add # "else {" vs "else \n {" -nl_while_brace = add # "while () {" vs "while () \n {" -nl_switch_brace = add # "switch () {" vs "switch () \n {" -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_assign_brace = add +nl_enum_brace = add +nl_union_brace = add +nl_struct_brace = add +nl_do_brace = add +nl_if_brace = add +nl_for_brace = add +nl_else_brace = add +nl_while_brace = add +nl_switch_brace = add +nl_fcall_brace = add +nl_fdef_brace = add nl_brace_while = add nl_brace_else = add diff --git a/tests/config/brace-ws2.cfg b/tests/config/brace-ws2.cfg index 699bed5b31..fbf531bbb9 100644 --- a/tests/config/brace-ws2.cfg +++ b/tests/config/brace-ws2.cfg @@ -2,27 +2,27 @@ # Whitesmith style # -indent_with_tabs = 1 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 8 # new tab size +indent_with_tabs = 1 +input_tab_size = 8 +output_tab_size = 8 indent_columns = output_tab_size indent_braces = TRUE indent_braces_no_func = TRUE # brace settings -nl_assign_brace = add # "= {" vs "= \n {" -nl_enum_brace = add # "enum {" vs "enum \n {" -nl_union_brace = add # "union {" vs "union \n {" -nl_struct_brace = add # "struct {" vs "struct \n {" -nl_do_brace = add # "do {" vs "do \n {" -nl_if_brace = add # "if () {" vs "if () \n {" -nl_for_brace = add # "for () {" vs "for () \n {" -nl_else_brace = add # "else {" vs "else \n {" -nl_while_brace = add # "while () {" vs "while () \n {" -nl_switch_brace = add # "switch () {" vs "switch () \n {" -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_assign_brace = add +nl_enum_brace = add +nl_union_brace = add +nl_struct_brace = add +nl_do_brace = add +nl_if_brace = add +nl_for_brace = add +nl_else_brace = add +nl_while_brace = add +nl_switch_brace = add +nl_fcall_brace = add +nl_fdef_brace = add nl_brace_while = add nl_brace_else = add diff --git a/tests/config/bug_340.cfg b/tests/config/bug_340.cfg index c4307aec68..82fc971211 100644 --- a/tests/config/bug_340.cfg +++ b/tests/config/bug_340.cfg @@ -5,19 +5,19 @@ # # The type of line endings -newlines = lf # auto/lf/crlf/cr +newlines = lf # The original size of tabs in the input -input_tab_size = 2 # number +input_tab_size = 2 # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 2 # number +output_tab_size = 2 # The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # # Indenting @@ -25,1286 +25,1286 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 2 # number +indent_columns = 2 # The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents. # For FreeBSD, this is set to 4. -indent_continue = 0 # number +indent_continue = 0 # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs to brace level, align with spaces # 2=indent and align with tabs, using spaces when not on a tabstop -indent_with_tabs = 0 # number +indent_with_tabs = 0 # Comments that are not a brace level are indented with tabs on a tabstop. # Requires indent_with_tabs=2. If false, will use spaces. -indent_cmt_with_tabs = false # false/true +indent_cmt_with_tabs = false # Whether to indent strings broken by '\' so that they line up -indent_align_string = false # false/true +indent_align_string = false # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # Disabled indenting class braces if indent_braces is true -indent_braces_no_class = false # false/true +indent_braces_no_class = false # Disabled indenting struct braces if indent_braces is true -indent_braces_no_struct = false # false/true +indent_braces_no_struct = false # Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # The number of spaces to indent a namespace block -indent_namespace_level = 0 # number +indent_namespace_level = 0 # If the body of the namespace is longer than this number, it won't be indented. # Requires indent_namespace=true. Default=0 (no limit) -indent_namespace_limit = 0 # number +indent_namespace_limit = 0 # Whether the 'extern "C"' body is indented -indent_extern = false # false/true +indent_extern = false # Whether the 'class' body is indented -indent_class = false # false/true +indent_class = false # Whether to indent the stuff after a leading class colon -indent_class_colon = false # false/true +indent_class_colon = false # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level -indent_else_if = false # false/true +indent_else_if = false # Amount to indent variable declarations after a open brace. neg=relative, pos=absolute -indent_var_def_blk = 0 # number +indent_var_def_blk = 0 # Indent continued variable declarations instead of aligning. -indent_var_def_cont = false # false/true +indent_var_def_cont = false # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = false # false/true +indent_func_call_param = false # Same as indent_func_call_param, but for function defs -indent_func_def_param = false # false/true +indent_func_def_param = false # Same as indent_func_call_param, but for function protos -indent_func_proto_param = false # false/true +indent_func_proto_param = false # Same as indent_func_call_param, but for class declarations -indent_func_class_param = false # false/true +indent_func_class_param = false # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = false # false/true +indent_func_ctor_var_param = false # Same as indent_func_call_param, but for templates -indent_template_param = false # false/true +indent_template_param = false # Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true +indent_func_param_double = false # Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 0 # number +indent_func_const = 0 # Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 0 # number +indent_func_throw = 0 # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 0 # number +indent_member = 0 # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = false # false/true +indent_relative_single_line_comments = false # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 2 # number +indent_switch_case = 2 # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 0 # number +indent_case_brace = 0 # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 0 # number +indent_access_spec = 0 # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 0 # number +indent_paren_close = 0 # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # If 'indent_bool_paren' is true, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones -indent_first_bool_expr = false # false/true +indent_first_bool_expr = false # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # Align continued statements at the '='. Default=True # If FALSE or the '=' is followed by a newline, the next line is indent one tab. -indent_align_assign = true # false/true +indent_align_assign = true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = add # ignore/add/remove/force +sp_arith = add # Add or remove space around assignment operator '=', '+=', etc -sp_assign = add # ignore/add/remove/force +sp_assign = add # Add or remove space around assignment operator '=' in a prototype -sp_assign_default = ignore # ignore/add/remove/force +sp_assign_default = ignore # Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. -sp_before_assign = ignore # ignore/add/remove/force +sp_before_assign = ignore # Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. -sp_after_assign = ignore # ignore/add/remove/force +sp_after_assign = ignore # Add or remove space around assignment '=' in enum -sp_enum_assign = add # ignore/add/remove/force +sp_enum_assign = add # Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_before_assign = ignore # ignore/add/remove/force +sp_enum_before_assign = ignore # Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_after_assign = ignore # ignore/add/remove/force +sp_enum_after_assign = ignore # Add or remove space around preprocessor '##' concatenation operator. Default=Add -sp_pp_concat = add # ignore/add/remove/force +sp_pp_concat = add # Add or remove space after preprocessor '#' stringify operator. Default=Add -sp_pp_stringify = add # ignore/add/remove/force +sp_pp_stringify = add # Add or remove space around boolean operators '&&' and '||' -sp_bool = add # ignore/add/remove/force +sp_bool = add # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = add # ignore/add/remove/force +sp_compare = add # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # Add or remove space between ')' and '{' -sp_paren_brace = add # ignore/add/remove/force +sp_paren_brace = add # Add or remove space before pointer star '*' -sp_before_ptr_star = add # ignore/add/remove/force +sp_before_ptr_star = add # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = add # ignore/add/remove/force +sp_before_unnamed_ptr_star = add # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = remove # ignore/add/remove/force +sp_after_ptr_star_func = remove # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = ignore # ignore/add/remove/force +sp_before_ptr_star_func = ignore # Add or remove space before a reference sign '&' -sp_before_byref = add # ignore/add/remove/force +sp_before_byref = add # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force +sp_before_unnamed_byref = ignore # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = ignore # ignore/add/remove/force +sp_after_byref = ignore # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = ignore # ignore/add/remove/force +sp_after_byref_func = ignore # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = ignore # ignore/add/remove/force +sp_before_byref_func = ignore # Add or remove space between type and word. Default=Force -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. -sp_template_angle = ignore # ignore/add/remove/force +sp_template_angle = ignore # Add or remove space before '<>' -sp_before_angle = force # ignore/add/remove/force +sp_before_angle = force # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # Add or remove space after '<>' -sp_after_angle = ignore # ignore/add/remove/force +sp_after_angle = ignore # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = ignore # ignore/add/remove/force +sp_angle_paren = ignore # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = ignore # ignore/add/remove/force +sp_angle_word = ignore # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = add # ignore/add/remove/force +sp_before_sparen = add # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # Add or remove space before if-condition ')'. Overrides sp_inside_sparen. -sp_inside_sparen_close = remove # ignore/add/remove/force +sp_inside_sparen_close = remove # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = add # ignore/add/remove/force +sp_sparen_brace = add # Add or remove space between 'invariant' and '(' in the D language. -sp_invariant_paren = ignore # ignore/add/remove/force +sp_invariant_paren = ignore # Add or remove space after the ')' in 'invariant (C) c' in the D language. -sp_after_invariant_paren = ignore # ignore/add/remove/force +sp_after_invariant_paren = ignore # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # Add or remove space before ';'. Default=Remove -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = remove # ignore/add/remove/force +sp_before_semi_for = remove # Add or remove space before a semicolon of an empty part of a for statement. -sp_before_semi_for_empty = remove # ignore/add/remove/force +sp_before_semi_for_empty = remove # Add or remove space after ';', except when followed by a comment. Default=Add -sp_after_semi = add # ignore/add/remove/force +sp_after_semi = add # Add or remove space after ';' in non-empty 'for' statements. Default=Force -sp_after_semi_for = force # ignore/add/remove/force +sp_after_semi_for = force # Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; ). -sp_after_semi_for_empty = remove # ignore/add/remove/force +sp_after_semi_for_empty = remove # Add or remove space before '[' (except '[]') -sp_before_square = add # ignore/add/remove/force +sp_before_square = add # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # Add or remove space after ',' -sp_after_comma = add # ignore/add/remove/force +sp_after_comma = add # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # Add or remove space before the variadic '...' when preceded by a non-punctuator -sp_before_ellipsis = add # ignore/add/remove/force +sp_before_ellipsis = add # Add or remove space after class ':' -sp_after_class_colon = add # ignore/add/remove/force +sp_after_class_colon = add # Add or remove space before class ':' -sp_before_class_colon = add # ignore/add/remove/force +sp_before_class_colon = add # Add or remove space before case ':'. Default=Remove -sp_before_case_colon = remove # ignore/add/remove/force +sp_before_case_colon = remove # Add or remove space between 'operator' and operator sign -sp_after_operator = remove # ignore/add/remove/force +sp_after_operator = remove # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = force # ignore/add/remove/force +sp_after_operator_sym = force # Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = ignore # ignore/add/remove/force +sp_after_cast = ignore # Add or remove spaces inside cast parens -sp_inside_paren_cast = ignore # ignore/add/remove/force +sp_inside_paren_cast = ignore # Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = ignore # ignore/add/remove/force +sp_cpp_cast_paren = ignore # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = ignore # ignore/add/remove/force +sp_inside_braces_enum = ignore # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = ignore # ignore/add/remove/force +sp_inside_braces_struct = ignore # Add or remove space inside '{' and '}' -sp_inside_braces = ignore # ignore/add/remove/force +sp_inside_braces = ignore # Add or remove space inside '{}' -sp_inside_braces_empty = add # ignore/add/remove/force +sp_inside_braces_empty = add # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = force # ignore/add/remove/force +sp_type_func = force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = remove # ignore/add/remove/force +sp_square_fparen = remove # Add or remove space between ')' and '{' of function -sp_fparen_brace = add # ignore/add/remove/force +sp_fparen_brace = add # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = remove # ignore/add/remove/force +sp_func_call_user_paren = remove # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # Add or remove space between 'return' and '(' -sp_return_paren = ignore # ignore/add/remove/force +sp_return_paren = ignore # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = ignore # ignore/add/remove/force +sp_defined_paren = ignore # Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = ignore # ignore/add/remove/force +sp_throw_paren = ignore # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = add # ignore/add/remove/force +sp_else_brace = add # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = add # ignore/add/remove/force +sp_brace_typedef = add # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = force # ignore/add/remove/force +sp_try_brace = force # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # Add or remove space before the '::' operator -sp_before_dc = ignore # ignore/add/remove/force +sp_before_dc = ignore # Add or remove space after the '::' operator -sp_after_dc = ignore # ignore/add/remove/force +sp_after_dc = ignore # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # Add or remove space after the '!' (not) operator. Default=Remove -sp_not = remove # ignore/add/remove/force +sp_not = remove # Add or remove space after the '~' (invert) operator. Default=Remove -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # Add or remove space after the '&' (address-of) operator. Default=Remove # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # Add or remove space around the '.' or '->' operators. Default=Remove -sp_member = remove # ignore/add/remove/force +sp_member = remove # Add or remove space after the '*' (dereference) operator. Default=Remove # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # Add or remove space before a backslash-newline at the end of a line. Default=Add -sp_before_nl_cont = add # ignore/add/remove/force +sp_before_nl_cont = add # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = add # ignore/add/remove/force +sp_after_oc_scope = add # Add or remove space after the colon in message specs # '-(int) f:(int) x;' vs '-(int) f: (int) x;' -sp_after_oc_colon = remove # ignore/add/remove/force +sp_after_oc_colon = remove # Add or remove space before the colon in message specs # '-(int) f: (int) x;' vs '-(int) f : (int) x;' -sp_before_oc_colon = remove # ignore/add/remove/force +sp_before_oc_colon = remove # Add or remove space after the colon in message specs # '[object setValue:1];' vs '[object setValue: 1];' -sp_after_send_oc_colon = remove # ignore/add/remove/force +sp_after_send_oc_colon = remove # Add or remove space before the colon in message specs # '[object setValue:1];' vs '[object setValue :1];' -sp_before_send_oc_colon = remove # ignore/add/remove/force +sp_before_send_oc_colon = remove # Add or remove space after the (type) in message specs # '-(int)f: (int) x;' vs '-(int)f: (int)x;' -sp_after_oc_type = remove # ignore/add/remove/force +sp_after_oc_type = remove # Add or remove space after the first (type) in message specs # '-(int) f:(int)x;' vs '-(int)f:(int)x;' -sp_after_oc_return_type = force # ignore/add/remove/force +sp_after_oc_return_type = force # Add or remove space between '@selector' and '(' # '@selector(msgName)' vs '@selector (msgName)' # Also applies to @protocol() constructs -sp_after_oc_at_sel = remove # ignore/add/remove/force +sp_after_oc_at_sel = remove # Add or remove space between '@selector(x)' and the following word # '@selector(foo) a:' vs '@selector(foo)a:' -sp_after_oc_at_sel_parens = add # ignore/add/remove/force +sp_after_oc_at_sel_parens = add # Add or remove space inside '@selector' parens # '@selector(foo)' vs '@selector( foo )' # Also applies to @protocol() constructs -sp_inside_oc_at_sel_parens = remove # ignore/add/remove/force +sp_inside_oc_at_sel_parens = remove # Add or remove space before a block pointer caret # '^int (int arg){...}' vs. ' ^int (int arg){...}' -sp_before_oc_block_caret = add # ignore/add/remove/force +sp_before_oc_block_caret = add # Add or remove space after a block pointer caret # '^int (int arg){...}' vs. '^ int (int arg){...}' -sp_after_oc_block_caret = ignore # ignore/add/remove/force +sp_after_oc_block_caret = ignore # Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = add # ignore/add/remove/force +sp_cond_colon = add # Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = add # ignore/add/remove/force +sp_cond_question = add # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = force # ignore/add/remove/force +sp_case_label = force # Control the space around the D '..' operator. -sp_range = ignore # ignore/add/remove/force +sp_range = ignore # Control the space after the opening of a C++ comment '// A' vs '//A' -sp_cmt_cpp_start = ignore # ignore/add/remove/force +sp_cmt_cpp_start = ignore # Controls the spaces between #else or #endif and a trailing comment -sp_endif_cmt = ignore # ignore/add/remove/force +sp_endif_cmt = ignore # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # Whether to use tabs for aligning -align_with_tabs = false # false/true +align_with_tabs = false # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # Align variable definitions in prototypes and functions -align_func_params = false # false/true +align_func_params = false # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = true # false/true +align_same_func_call_params = true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 0 # number +align_var_def_span = 0 # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 1 # number +align_var_def_star_style = 1 # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 1 # number +align_var_def_amp_style = 1 # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # Whether to align any attribute after the variable name -align_var_def_attribute = false # false/true +align_var_def_attribute = false # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = false # false/true +align_var_def_inline = false # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 0 # number +align_assign_span = 0 # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 2 # number +align_enum_equ_span = 2 # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # The span for aligning struct/union (0=don't align) -align_var_struct_span = 0 # number +align_var_struct_span = 0 # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 0 # number +align_struct_init_span = 0 # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number +align_typedef_gap = 0 # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 0 # number +align_typedef_span = 0 # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typedef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typedef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 0 # number +align_right_cmt_span = 0 # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. This has to be > 0 to do anything. -align_right_cmt_gap = 0 # number +align_right_cmt_gap = 0 # Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore) -align_right_cmt_at_col = 0 # number +align_right_cmt_at_col = 0 # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # Align function protos on the 'operator' keyword instead of what follows -align_on_operator = false # false/true +align_on_operator = false # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true +align_single_line_func = false # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # The span for aligning ObjC msg spec (0=don't align) -align_oc_msg_spec_span = 0 # number +align_oc_msg_spec_span = 0 # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = false # false/true +align_nl_cont = false # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 0 # number +align_pp_define_gap = 0 # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 0 # number +align_pp_define_span = 0 # Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = true # false/true +align_left_shift = true # Span for aligning parameters in an Obj-C message call on the ':' (0=don't align) -align_oc_msg_colon_span = 1 # number +align_oc_msg_colon_span = 1 # Aligning parameters in an Obj-C '+' or '-' declaration on the ':' -align_oc_decl_colon = true # false/true +align_oc_decl_colon = true # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = false # false/true +nl_assign_leave_one_liners = false # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = true # false/true +nl_class_leave_one_liners = true # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = true # false/true +nl_enum_leave_one_liners = true # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # Add or remove newlines at the start of the file -nl_start_of_file = ignore # ignore/add/remove/force +nl_start_of_file = ignore # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # Add or remove newline at the end of the file -nl_end_of_file = ignore # ignore/add/remove/force +nl_end_of_file = ignore # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 0 # number +nl_end_of_file_min = 0 # Add or remove newline between '=' and '{' -nl_assign_brace = remove # ignore/add/remove/force +nl_assign_brace = remove # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # The number of blank lines after a block of variable definitions -nl_func_var_def_blk = 0 # number +nl_func_var_def_blk = 0 # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = remove # ignore/add/remove/force +nl_fcall_brace = remove # Add or remove newline between 'enum' and '{' -nl_enum_brace = remove # ignore/add/remove/force +nl_enum_brace = remove # Add or remove newline between 'struct and '{' -nl_struct_brace = remove # ignore/add/remove/force +nl_struct_brace = remove # Add or remove newline between 'union' and '{' -nl_union_brace = remove # ignore/add/remove/force +nl_union_brace = remove # Add or remove newline between 'if' and '{' -nl_if_brace = remove # ignore/add/remove/force +nl_if_brace = remove # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = ignore # ignore/add/remove/force +nl_elseif_brace = ignore # Add or remove newline between 'else' and '{' -nl_else_brace = remove # ignore/add/remove/force +nl_else_brace = remove # Add or remove newline between 'else' and 'if' -nl_else_if = ignore # ignore/add/remove/force +nl_else_if = ignore # Add or remove newline between '}' and 'finally' -nl_brace_finally = ignore # ignore/add/remove/force +nl_brace_finally = ignore # Add or remove newline between 'finally' and '{' -nl_finally_brace = ignore # ignore/add/remove/force +nl_finally_brace = ignore # Add or remove newline between 'try' and '{' -nl_try_brace = remove # ignore/add/remove/force +nl_try_brace = remove # Add or remove newline between get/set and '{' -nl_getset_brace = remove # ignore/add/remove/force +nl_getset_brace = remove # Add or remove newline between 'for' and '{' -nl_for_brace = remove # ignore/add/remove/force +nl_for_brace = remove # Add or remove newline between 'catch' and '{' -nl_catch_brace = remove # ignore/add/remove/force +nl_catch_brace = remove # Add or remove newline between '}' and 'catch' -nl_brace_catch = add # ignore/add/remove/force +nl_brace_catch = add # Add or remove newline between 'while' and '{' -nl_while_brace = remove # ignore/add/remove/force +nl_while_brace = remove # Add or remove newline between 'using' and '{' -nl_using_brace = ignore # ignore/add/remove/force +nl_using_brace = ignore # Add or remove newline between two open or close braces. # Due to general newline/brace handling, REMOVE may not work. -nl_brace_brace = ignore # ignore/add/remove/force +nl_brace_brace = ignore # Add or remove newline between 'do' and '{' -nl_do_brace = remove # ignore/add/remove/force +nl_do_brace = remove # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = ignore # ignore/add/remove/force +nl_brace_while = ignore # Add or remove newline between 'switch' and '{' -nl_switch_brace = remove # ignore/add/remove/force +nl_switch_brace = remove # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = false # false/true +nl_multi_line_define = false # Whether to put a newline before 'case' statement -nl_before_case = false # false/true +nl_before_case = false # Add or remove newline between ')' and 'throw' -nl_before_throw = ignore # ignore/add/remove/force +nl_before_throw = ignore # Whether to put a newline after 'case' statement -nl_after_case = false # false/true +nl_after_case = false # Newline between namespace and { -nl_namespace_brace = ignore # ignore/add/remove/force +nl_namespace_brace = ignore # Add or remove newline between 'template<>' and whatever follows. -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # Add or remove newline between return type and function name in a function definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # Add or remove newline between return type and function name inside a class {} # Uses nl_func_type_name or nl_func_proto_type_name if set to ignore. -nl_func_type_name_class = ignore # ignore/add/remove/force +nl_func_type_name_class = ignore # Add or remove newline between function scope and name in a definition # Controls the newline after '::' in 'void A::f() { }' -nl_func_scope_name = ignore # ignore/add/remove/force +nl_func_scope_name = ignore # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = ignore # ignore/add/remove/force +nl_func_proto_type_name = ignore # Add or remove newline between a function name and the opening '(' -nl_func_paren = remove # ignore/add/remove/force +nl_func_paren = remove # Add or remove newline after '(' in a function declaration -nl_func_decl_start = remove # ignore/add/remove/force +nl_func_decl_start = remove # Overrides nl_func_decl_start when there is only one paramter. -nl_func_decl_start_single = ignore # ignore/add/remove/force +nl_func_decl_start_single = ignore # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = remove # ignore/add/remove/force +nl_func_decl_end = remove # Overrides nl_func_decl_end when there is only one paramter. -nl_func_decl_end_single = ignore # ignore/add/remove/force +nl_func_decl_end_single = ignore # Add or remove newline between '()' in a function declaration. -nl_func_decl_empty = ignore # ignore/add/remove/force +nl_func_decl_empty = ignore # Add or remove newline between function signature and '{' -nl_fdef_brace = remove # ignore/add/remove/force +nl_fdef_brace = remove # Whether to put a newline after 'return' statement -nl_after_return = false # false/true +nl_after_return = false # Add or remove a newline between the return keyword and return expression. -nl_return_expr = ignore # ignore/add/remove/force +nl_return_expr = ignore # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = true # false/true +nl_after_brace_open = true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true +nl_after_brace_open_cmt = false # Whether to put a newline after a virtual brace open with a non-empty body. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = false # false/true +nl_after_vbrace_open = false # Whether to put a newline after a virtual brace open with an empty body. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open_empty = false # false/true +nl_after_vbrace_open_empty = false # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. -nl_after_brace_close = true # false/true +nl_after_brace_close = true # Whether to put a newline after a virtual brace close. # Would add a newline before return in: 'if (foo) a++; return;' -nl_after_vbrace_close = false # false/true +nl_after_vbrace_close = false # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = true # false/true +nl_squeeze_ifdef = true # Add or remove blank line before 'if' -nl_before_if = remove # ignore/add/remove/force +nl_before_if = remove # Add or remove blank line after 'if' statement -nl_after_if = remove # ignore/add/remove/force +nl_after_if = remove # Add or remove blank line before 'for' -nl_before_for = add # ignore/add/remove/force +nl_before_for = add # Add or remove blank line after 'for' statement -nl_after_for = remove # ignore/add/remove/force +nl_after_for = remove # Add or remove blank line before 'while' -nl_before_while = add # ignore/add/remove/force +nl_before_while = add # Add or remove blank line after 'while' statement -nl_after_while = remove # ignore/add/remove/force +nl_after_while = remove # Add or remove blank line before 'switch' -nl_before_switch = add # ignore/add/remove/force +nl_before_switch = add # Add or remove blank line after 'switch' statement -nl_after_switch = remove # ignore/add/remove/force +nl_after_switch = remove # Add or remove blank line before 'do' -nl_before_do = add # ignore/add/remove/force +nl_before_do = add # Add or remove blank line after 'do/while' statement -nl_after_do = remove # ignore/add/remove/force +nl_after_do = remove # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # Whether to double-space before the close brace of a struct/union/enum # (lower priority than 'eat_blanks_before_close_brace') -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # # Positioning options # # The position of arithmetic operators in wrapped expressions -pos_arith = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_arith = ignore # The position of assignment in wrapped expressions. # Do not affect '=' followed by '{' -pos_assign = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_assign = ignore # The position of boolean operators in wrapped expressions -pos_bool = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_bool = ignore # The position of comparison operators in wrapped expressions -pos_compare = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_compare = ignore # The position of conditional (b ? t : f) operators in wrapped expressions -pos_conditional = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_conditional = ignore # The position of the comma in wrapped expressions -pos_comma = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_comma = ignore # The position of the comma in the constructor initialization list -pos_class_comma = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_comma = ignore # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_colon = ignore # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = true # false/true +ls_for_split_full = true # Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true +ls_func_split_full = false # # Blank line options # # The maximum consecutive newlines -nl_max = 2 # number +nl_max = 2 # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 0 # number +nl_after_func_proto_group = 0 # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 0 # number +nl_after_func_body = 0 # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 0 # number +nl_after_func_body_one_liner = 0 # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 0 # number +nl_before_block_comment = 0 # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # Whether to force a newline after a multi-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 1 # number +nl_before_access_spec = 1 # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # The number of newlines between a function def and the function comment. # 0 = No change. -nl_comment_func_def = 0 # number +nl_comment_func_def = 0 # The number of newlines after a try-catch-finally block that isn't followed by a brace close. # 0 = No change. -nl_after_try_catch_finally = 0 # number +nl_after_try_catch_finally = 0 # The number of newlines before and after a property, indexer or event decl. # 0 = No change. -nl_around_cs_property = 0 # number +nl_around_cs_property = 0 # The number of newlines between the get/set/add/remove handlers in C#. # 0 = No change. -nl_between_get_set = 0 # number +nl_between_get_set = 0 # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # Add or remove braces on single-line function definitions. (Pawn) -mod_full_brace_function = add # ignore/add/remove/force +mod_full_brace_function = add # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if. # If any must be braced, they are all braced. If all can be unbraced, then the braces are removed. -mod_full_brace_if_chain = false # false/true +mod_full_brace_if_chain = false # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # Add or remove braces on single-line 'using ()' statement -mod_full_brace_using = ignore # ignore/add/remove/force +mod_full_brace_using = ignore # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = remove # ignore/add/remove/force +mod_paren_on_return = remove # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = false # false/true +mod_full_paren_if_bool = false # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = true # false/true +mod_remove_extra_semicolon = true # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 10 # number +mod_add_long_function_closebrace_comment = 10 # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number +mod_add_long_switch_closebrace_comment = 0 # If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after # the #else, a comment will be added. -mod_add_long_ifdef_endif_comment = 0 # number +mod_add_long_ifdef_endif_comment = 0 # If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after # the #endif, a comment will be added. -mod_add_long_ifdef_else_comment = 0 # number +mod_add_long_ifdef_else_comment = 0 # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = true # false/true +mod_move_case_break = true # Will add or remove the braces around a fully braced case statement. # Will only remove the braces if there are no variable declarations in the block. -mod_case_brace = force # ignore/add/remove/force +mod_case_brace = force # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = true # false/true +mod_remove_empty_return = true # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # Set the comment reflow mode (default: 0) # 0: no reflowing (apart from the line wrapping due to cmt_width) # 1: no touching at all # 2: full reflow -cmt_reflow_mode = 0 # number +cmt_reflow_mode = 0 # If false, disable all multi-line comment changes, including cmt_width. keyword substitution, and leading chars. # Default is true. -cmt_indent_multi = false # false/true +cmt_indent_multi = false # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_footer = "" # string +cmt_insert_file_footer = "" # The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment. # Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment. # Will substitute $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true +cmt_insert_before_preproc = false # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. -pp_indent_count = 1 # number +pp_indent_count = 1 # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true +pp_if_indent_code = false # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/bug_472.cfg b/tests/config/bug_472.cfg index 1cc878ba4f..7d781fd770 100644 --- a/tests/config/bug_472.cfg +++ b/tests/config/bug_472.cfg @@ -1,5 +1,5 @@ -nl_func_type_name = remove # ignore/add/remove/force -nl_func_proto_type_name = remove # ignore/add/remove/force -nl_after_func_proto = 0 # number -nl_after_func_proto_group = 0 # number +nl_func_type_name = remove +nl_func_proto_type_name = remove +nl_after_func_proto = 0 +nl_after_func_proto_group = 0 set type dbgTrace diff --git a/tests/config/bug_671.cfg b/tests/config/bug_671.cfg index cc20daa55b..0a5ebdc129 100644 --- a/tests/config/bug_671.cfg +++ b/tests/config/bug_671.cfg @@ -5,33 +5,33 @@ # # The type of line endings -newlines = auto # auto/lf/crlf/cr +newlines = auto # The original size of tabs in the input -input_tab_size = 8 # number +input_tab_size = 8 # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 8 # number +output_tab_size = 8 # The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # Allow interpreting '>=' and '>>=' as part of a template in 'void f(list>=val);'. # If true (default), 'assert(x<0 && y>=3)' will be broken. # Improvements to template detection may make this option obsolete. -tok_split_gte = false # false/true +tok_split_gte = false # Control what to do with the UTF-8 BOM (recommend 'remove') -utf8_bom = ignore # ignore/add/remove/force +utf8_bom = ignore # If the file contains bytes with values between 128 and 255, but is not UTF-8, then output as UTF-8 -utf8_byte = false # false/true +utf8_byte = false # Force the output encoding to UTF-8 -utf8_force = false # false/true +utf8_force = false # # Indenting @@ -39,1615 +39,1615 @@ utf8_force = false # false/true # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 4 # number +indent_columns = 4 # The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents. # For FreeBSD, this is set to 4. Negative value is absolute and not increased for each ( level -indent_continue = 0 # number +indent_continue = 0 # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs to brace level, align with spaces # 2=indent and align with tabs, using spaces when not on a tabstop -indent_with_tabs = 0 # number +indent_with_tabs = 0 # Comments that are not a brace level are indented with tabs on a tabstop. # Requires indent_with_tabs=2. If false, will use spaces. -indent_cmt_with_tabs = false # false/true +indent_cmt_with_tabs = false # Whether to indent strings broken by '\' so that they line up -indent_align_string = false # false/true +indent_align_string = false # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # Disabled indenting class braces if indent_braces is true -indent_braces_no_class = false # false/true +indent_braces_no_class = false # Disabled indenting struct braces if indent_braces is true -indent_braces_no_struct = false # false/true +indent_braces_no_struct = false # Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # Indent based on the paren open instead of the brace open in '({\n', default is to indent by brace. -indent_paren_open_brace = false # false/true +indent_paren_open_brace = false # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # Only indent one namespace and no sub-namepaces. # Requires indent_namespace=true. -indent_namespace_single_indent = false # false/true +indent_namespace_single_indent = false # The number of spaces to indent a namespace block -indent_namespace_level = 0 # number +indent_namespace_level = 0 # If the body of the namespace is longer than this number, it won't be indented. # Requires indent_namespace=true. Default=0 (no limit) -indent_namespace_limit = 0 # number +indent_namespace_limit = 0 # Whether the 'extern "C"' body is indented -indent_extern = false # false/true +indent_extern = false # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # Whether to indent the stuff after a leading base class colon -indent_class_colon = true # false/true +indent_class_colon = true # Whether to indent the stuff after a leading class initializer colon -indent_constr_colon = false # false/true +indent_constr_colon = false # Virtual indent from the ':' for member initializers. Default is 2 -indent_ctor_init_leading = 2 # number +indent_ctor_init_leading = 2 # Additional indenting for constructor initializer list -indent_ctor_init = 0 # number +indent_ctor_init = 0 # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level -indent_else_if = false # false/true +indent_else_if = false # Amount to indent variable declarations after a open brace. neg=relative, pos=absolute -indent_var_def_blk = 0 # number +indent_var_def_blk = 0 # Indent continued variable declarations instead of aligning. -indent_var_def_cont = false # false/true +indent_var_def_cont = false # True: force indentation of function definition to start in column 1 # False: use the default behavior -indent_func_def_force_col1 = false # false/true +indent_func_def_force_col1 = false # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = false # false/true +indent_func_call_param = false # Same as indent_func_call_param, but for function defs -indent_func_def_param = false # false/true +indent_func_def_param = false # Same as indent_func_call_param, but for function protos -indent_func_proto_param = false # false/true +indent_func_proto_param = false # Same as indent_func_call_param, but for class declarations -indent_func_class_param = false # false/true +indent_func_class_param = false # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = false # false/true +indent_func_ctor_var_param = false # Same as indent_func_call_param, but for templates -indent_template_param = false # false/true +indent_template_param = false # Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true +indent_func_param_double = false # Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 0 # number +indent_func_const = 0 # Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 0 # number +indent_func_throw = 0 # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 0 # number +indent_member = 0 # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = false # false/true +indent_relative_single_line_comments = false # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 4 # number +indent_switch_case = 4 # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 0 # number +indent_case_brace = 0 # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 0 # number +indent_paren_close = 0 # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # If 'indent_bool_paren' is true, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones -indent_first_bool_expr = false # false/true +indent_first_bool_expr = false # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # Align continued statements at the '='. Default=True # If FALSE or the '=' is followed by a newline, the next line is indent one tab. -indent_align_assign = true # false/true +indent_align_assign = true # Indent OC blocks at brace level instead of usual rules. -indent_oc_block = false # false/true +indent_oc_block = false # Indent OC blocks in a message relative to the parameter name. # 0=use indent_oc_block rules, 1+=spaces to indent -indent_oc_block_msg = 0 # number +indent_oc_block_msg = 0 # Minimum indent for subsequent parameters -indent_oc_msg_colon = 0 # number +indent_oc_msg_colon = 0 # If true, prioritize aligning with initial colon (and stripping spaces from lines, if necessary). # Default is true. -indent_oc_msg_prioritize_first_colon = true # false/true +indent_oc_msg_prioritize_first_colon = true # If indent_oc_block_msg and this option are on, blocks will be indented the way that Xcode does by default (from keyword if the parameter is on its own line; otherwise, from the previous indentation level). -indent_oc_block_msg_xcode_style = false # false/true +indent_oc_block_msg_xcode_style = false # If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is relative to a msg keyword. -indent_oc_block_msg_from_keyword = false # false/true +indent_oc_block_msg_from_keyword = false # If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is relative to a msg colon. -indent_oc_block_msg_from_colon = false # false/true +indent_oc_block_msg_from_colon = false # If indent_oc_block_msg and this option are on, blocks will be indented from where the block caret is. -indent_oc_block_msg_from_caret = false # false/true +indent_oc_block_msg_from_caret = false # If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is. -indent_oc_block_msg_from_brace = false # false/true +indent_oc_block_msg_from_brace = false # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = add # ignore/add/remove/force +sp_arith = add # Add or remove space around assignment operator '=', '+=', etc -sp_assign = add # ignore/add/remove/force +sp_assign = add # Add or remove space around '=' in C++11 lambda capture specifications. Overrides sp_assign -sp_cpp_lambda_assign = ignore # ignore/add/remove/force +sp_cpp_lambda_assign = ignore # Add or remove space after the capture specification in C++11 lambda. -sp_cpp_lambda_paren = ignore # ignore/add/remove/force +sp_cpp_lambda_paren = ignore # Add or remove space around assignment operator '=' in a prototype -sp_assign_default = ignore # ignore/add/remove/force +sp_assign_default = ignore # Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. -sp_before_assign = ignore # ignore/add/remove/force +sp_before_assign = ignore # Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. -sp_after_assign = ignore # ignore/add/remove/force +sp_after_assign = ignore # Add or remove space in 'NS_ENUM (' -sp_enum_paren = ignore # ignore/add/remove/force +sp_enum_paren = ignore # Add or remove space around assignment '=' in enum -sp_enum_assign = add # ignore/add/remove/force +sp_enum_assign = add # Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_before_assign = ignore # ignore/add/remove/force +sp_enum_before_assign = ignore # Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_after_assign = ignore # ignore/add/remove/force +sp_enum_after_assign = ignore # Add or remove space around preprocessor '##' concatenation operator. Default=Add -sp_pp_concat = ignore # ignore/add/remove/force +sp_pp_concat = ignore # Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator. -sp_pp_stringify = ignore # ignore/add/remove/force +sp_pp_stringify = ignore # Add or remove space before preprocessor '#' stringify operator as in '#define x(y) L#y'. -sp_before_pp_stringify = ignore # ignore/add/remove/force +sp_before_pp_stringify = ignore # Add or remove space around boolean operators '&&' and '||' -sp_bool = add # ignore/add/remove/force +sp_bool = add # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = add # ignore/add/remove/force +sp_compare = add # Add or remove space inside '(' and ')' -sp_inside_paren = add # ignore/add/remove/force +sp_inside_paren = add # Add or remove space between nested parens: '((' vs ') )' -sp_paren_paren = add # ignore/add/remove/force +sp_paren_paren = add # Add or remove space between back-to-back parens: ')(' vs ') (' -sp_cparen_oparen = ignore # ignore/add/remove/force +sp_cparen_oparen = ignore # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # Add or remove space before pointer star '*' -sp_before_ptr_star = remove # ignore/add/remove/force +sp_before_ptr_star = remove # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force +sp_before_unnamed_ptr_star = ignore # Add or remove space between pointer stars '*' -sp_between_ptr_star = ignore # ignore/add/remove/force +sp_between_ptr_star = ignore # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = add # ignore/add/remove/force +sp_after_ptr_star = add # Add or remove space after pointer star '*', if followed by a qualifier. -sp_after_ptr_star_qualifier = ignore # ignore/add/remove/force +sp_after_ptr_star_qualifier = ignore # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = ignore # ignore/add/remove/force +sp_after_ptr_star_func = ignore # Add or remove space after a pointer star '*', if followed by an open paren (function types). -sp_ptr_star_paren = ignore # ignore/add/remove/force +sp_ptr_star_paren = ignore # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = ignore # ignore/add/remove/force +sp_before_ptr_star_func = ignore # Add or remove space before a reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force +sp_before_unnamed_byref = ignore # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = add # ignore/add/remove/force +sp_after_byref = add # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = ignore # ignore/add/remove/force +sp_after_byref_func = ignore # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = ignore # ignore/add/remove/force +sp_before_byref_func = ignore # Add or remove space between type and word. Default=Force -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # Add or remove space before the paren in the D constructs 'template Foo(' and 'class Foo('. -sp_before_template_paren = ignore # ignore/add/remove/force +sp_before_template_paren = ignore # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. -sp_template_angle = ignore # ignore/add/remove/force +sp_template_angle = ignore # Add or remove space before '<>' -sp_before_angle = ignore # ignore/add/remove/force +sp_before_angle = ignore # Add or remove space inside '<' and '>' -sp_inside_angle = ignore # ignore/add/remove/force +sp_inside_angle = ignore # Add or remove space after '<>' -sp_after_angle = ignore # ignore/add/remove/force +sp_after_angle = ignore # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = ignore # ignore/add/remove/force +sp_angle_paren = ignore # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = ignore # ignore/add/remove/force +sp_angle_word = ignore # Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add -sp_angle_shift = add # ignore/add/remove/force +sp_angle_shift = add # Permit removal of the space between '>>' in 'foo >' (C++11 only). Default=False # sp_angle_shift cannot remove the space without this option. -sp_permit_cpp11_shift = false # false/true +sp_permit_cpp11_shift = false # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = add # ignore/add/remove/force +sp_inside_sparen = add # Add or remove space before if-condition ')'. Overrides sp_inside_sparen. -sp_inside_sparen_close = ignore # ignore/add/remove/force +sp_inside_sparen_close = ignore # Add or remove space before if-condition '('. Overrides sp_inside_sparen. -sp_inside_sparen_open = ignore # ignore/add/remove/force +sp_inside_sparen_open = ignore # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = ignore # ignore/add/remove/force +sp_after_sparen = ignore # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = ignore # ignore/add/remove/force +sp_sparen_brace = ignore # Add or remove space between 'invariant' and '(' in the D language. -sp_invariant_paren = ignore # ignore/add/remove/force +sp_invariant_paren = ignore # Add or remove space after the ')' in 'invariant (C) c' in the D language. -sp_after_invariant_paren = ignore # ignore/add/remove/force +sp_after_invariant_paren = ignore # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # Add or remove space before ';'. Default=Remove -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = ignore # ignore/add/remove/force +sp_before_semi_for = ignore # Add or remove space before a semicolon of an empty part of a for statement. -sp_before_semi_for_empty = ignore # ignore/add/remove/force +sp_before_semi_for_empty = ignore # Add or remove space after ';', except when followed by a comment. Default=Add -sp_after_semi = add # ignore/add/remove/force +sp_after_semi = add # Add or remove space after ';' in non-empty 'for' statements. Default=Force -sp_after_semi_for = force # ignore/add/remove/force +sp_after_semi_for = force # Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; ). -sp_after_semi_for_empty = ignore # ignore/add/remove/force +sp_after_semi_for_empty = ignore # Add or remove space before '[' (except '[]') -sp_before_square = remove # ignore/add/remove/force +sp_before_square = remove # Add or remove space before '[]' -sp_before_squares = remove # ignore/add/remove/force +sp_before_squares = remove # Add or remove space inside a non-empty '[' and ']' -sp_inside_square = add # ignore/add/remove/force +sp_inside_square = add # Add or remove space after ',' -sp_after_comma = add # ignore/add/remove/force +sp_after_comma = add # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # Add or remove space between an open paren and comma: '(,' vs '( ,' -sp_paren_comma = force # ignore/add/remove/force +sp_paren_comma = force # Add or remove space before the variadic '...' when preceded by a non-punctuator -sp_before_ellipsis = ignore # ignore/add/remove/force +sp_before_ellipsis = ignore # Add or remove space after class ':' -sp_after_class_colon = ignore # ignore/add/remove/force +sp_after_class_colon = ignore # Add or remove space before class ':' -sp_before_class_colon = ignore # ignore/add/remove/force +sp_before_class_colon = ignore # Add or remove space after class constructor ':' -sp_after_constr_colon = ignore # ignore/add/remove/force +sp_after_constr_colon = ignore # Add or remove space before class constructor ':' -sp_before_constr_colon = ignore # ignore/add/remove/force +sp_before_constr_colon = ignore # Add or remove space before case ':'. Default=Remove -sp_before_case_colon = remove # ignore/add/remove/force +sp_before_case_colon = remove # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = ignore # ignore/add/remove/force +sp_after_operator_sym = ignore # Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # Add or remove spaces inside cast parens -sp_inside_paren_cast = add # ignore/add/remove/force +sp_inside_paren_cast = add # Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = ignore # ignore/add/remove/force +sp_cpp_cast_paren = ignore # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = force # ignore/add/remove/force +sp_inside_braces_enum = force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = force # ignore/add/remove/force +sp_inside_braces_struct = force # Add or remove space inside '{' and '}' -sp_inside_braces = force # ignore/add/remove/force +sp_inside_braces = force # Add or remove space inside '{}' -sp_inside_braces_empty = ignore # ignore/add/remove/force +sp_inside_braces_empty = ignore # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = ignore # ignore/add/remove/force +sp_type_func = ignore # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # Add or remove space inside function '(' and ')' -sp_inside_fparen = add # ignore/add/remove/force +sp_inside_fparen = add # Add or remove space inside the first parens in the function type: 'void (*x)(...)' -sp_inside_tparen = ignore # ignore/add/remove/force +sp_inside_tparen = ignore # Add or remove between the parens in the function type: 'void (*x)(...)' -sp_after_tparen_close = ignore # ignore/add/remove/force +sp_after_tparen_close = ignore # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = remove # ignore/add/remove/force +sp_square_fparen = remove # Add or remove space between ')' and '{' of function -sp_fparen_brace = ignore # ignore/add/remove/force +sp_fparen_brace = ignore # Java: Add or remove space between ')' and '{{' of double brace initializer. -sp_fparen_dbrace = ignore # ignore/add/remove/force +sp_fparen_dbrace = ignore # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # Add or remove space between function name and '()' on function calls without parameters. # If set to 'ignore' (the default), sp_func_call_paren is used. -sp_func_call_paren_empty = ignore # ignore/add/remove/force +sp_func_call_paren_empty = ignore # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = ignore # ignore/add/remove/force +sp_func_call_user_paren = ignore # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = ignore # ignore/add/remove/force +sp_func_class_paren = ignore # Add or remove space between 'return' and '(' -sp_return_paren = add # ignore/add/remove/force +sp_return_paren = add # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = ignore # ignore/add/remove/force +sp_defined_paren = ignore # Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = ignore # ignore/add/remove/force +sp_throw_paren = ignore # Add or remove space between 'throw' and anything other than '(' as in '@throw [...];' -sp_after_throw = ignore # ignore/add/remove/force +sp_after_throw = ignore # Add or remove space between 'catch' and '(' in 'catch (something) { }' # If set to ignore, sp_before_sparen is used. -sp_catch_paren = ignore # ignore/add/remove/force +sp_catch_paren = ignore # Add or remove space between 'version' and '(' in 'version (something) { }' (D language) # If set to ignore, sp_before_sparen is used. -sp_version_paren = ignore # ignore/add/remove/force +sp_version_paren = ignore # Add or remove space between 'scope' and '(' in 'scope (something) { }' (D language) # If set to ignore, sp_before_sparen is used. -sp_scope_paren = ignore # ignore/add/remove/force +sp_scope_paren = ignore # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = ignore # ignore/add/remove/force +sp_else_brace = ignore # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = ignore # ignore/add/remove/force +sp_brace_typedef = ignore # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # Add or remove space between a variable and '{' for C++ uniform initialization -sp_word_brace = add # ignore/add/remove/force +sp_word_brace = add # Add or remove space between a variable and '{' for a namespace -sp_word_brace_ns = add # ignore/add/remove/force +sp_word_brace_ns = add # Add or remove space before the '::' operator -sp_before_dc = ignore # ignore/add/remove/force +sp_before_dc = ignore # Add or remove space after the '::' operator -sp_after_dc = ignore # ignore/add/remove/force +sp_after_dc = ignore # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # Add or remove space after the '!' (not) operator. Default=Remove -sp_not = remove # ignore/add/remove/force +sp_not = remove # Add or remove space after the '~' (invert) operator. Default=Remove -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # Add or remove space after the '&' (address-of) operator. Default=Remove # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # Add or remove space around the '.' or '->' operators. Default=Remove -sp_member = remove # ignore/add/remove/force +sp_member = remove # Add or remove space after the '*' (dereference) operator. Default=Remove # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # Add or remove space before a backslash-newline at the end of a line. Default=Add -sp_before_nl_cont = add # ignore/add/remove/force +sp_before_nl_cont = add # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force +sp_after_oc_scope = ignore # Add or remove space after the colon in message specs # '-(int) f:(int) x;' vs '-(int) f: (int) x;' -sp_after_oc_colon = ignore # ignore/add/remove/force +sp_after_oc_colon = ignore # Add or remove space before the colon in message specs # '-(int) f: (int) x;' vs '-(int) f : (int) x;' -sp_before_oc_colon = ignore # ignore/add/remove/force +sp_before_oc_colon = ignore # Add or remove space after the colon in immutable dictionary expression # 'NSDictionary *test = @{@"foo" :@"bar"};' -sp_after_oc_dict_colon = ignore # ignore/add/remove/force +sp_after_oc_dict_colon = ignore # Add or remove space before the colon in immutable dictionary expression # 'NSDictionary *test = @{@"foo" :@"bar"};' -sp_before_oc_dict_colon = ignore # ignore/add/remove/force +sp_before_oc_dict_colon = ignore # Add or remove space after the colon in message specs # '[object setValue:1];' vs '[object setValue: 1];' -sp_after_send_oc_colon = ignore # ignore/add/remove/force +sp_after_send_oc_colon = ignore # Add or remove space before the colon in message specs # '[object setValue:1];' vs '[object setValue :1];' -sp_before_send_oc_colon = ignore # ignore/add/remove/force +sp_before_send_oc_colon = ignore # Add or remove space after the (type) in message specs # '-(int)f: (int) x;' vs '-(int)f: (int)x;' -sp_after_oc_type = ignore # ignore/add/remove/force +sp_after_oc_type = ignore # Add or remove space after the first (type) in message specs # '-(int) f:(int)x;' vs '-(int)f:(int)x;' -sp_after_oc_return_type = ignore # ignore/add/remove/force +sp_after_oc_return_type = ignore # Add or remove space between '@selector' and '(' # '@selector(msgName)' vs '@selector (msgName)' # Also applies to @protocol() constructs -sp_after_oc_at_sel = ignore # ignore/add/remove/force +sp_after_oc_at_sel = ignore # Add or remove space between '@selector(x)' and the following word # '@selector(foo) a:' vs '@selector(foo)a:' -sp_after_oc_at_sel_parens = ignore # ignore/add/remove/force +sp_after_oc_at_sel_parens = ignore # Add or remove space inside '@selector' parens # '@selector(foo)' vs '@selector( foo )' # Also applies to @protocol() constructs -sp_inside_oc_at_sel_parens = ignore # ignore/add/remove/force +sp_inside_oc_at_sel_parens = ignore # Add or remove space before a block pointer caret # '^int (int arg){...}' vs. ' ^int (int arg){...}' -sp_before_oc_block_caret = ignore # ignore/add/remove/force +sp_before_oc_block_caret = ignore # Add or remove space after a block pointer caret # '^int (int arg){...}' vs. '^ int (int arg){...}' -sp_after_oc_block_caret = ignore # ignore/add/remove/force +sp_after_oc_block_caret = ignore # Add or remove space between the receiver and selector in a message. # '[receiver selector ...]' -sp_after_oc_msg_receiver = ignore # ignore/add/remove/force +sp_after_oc_msg_receiver = ignore # Add or remove space after @property. -sp_after_oc_property = ignore # ignore/add/remove/force +sp_after_oc_property = ignore # Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = add # ignore/add/remove/force +sp_cond_colon = add # Add or remove space before the ':' in 'b ? t : f'. Overrides sp_cond_colon. -sp_cond_colon_before = ignore # ignore/add/remove/force +sp_cond_colon_before = ignore # Add or remove space after the ':' in 'b ? t : f'. Overrides sp_cond_colon. -sp_cond_colon_after = ignore # ignore/add/remove/force +sp_cond_colon_after = ignore # Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = add # ignore/add/remove/force +sp_cond_question = add # Add or remove space before the '?' in 'b ? t : f'. Overrides sp_cond_question. -sp_cond_question_before = ignore # ignore/add/remove/force +sp_cond_question_before = ignore # Add or remove space after the '?' in 'b ? t : f'. Overrides sp_cond_question. -sp_cond_question_after = ignore # ignore/add/remove/force +sp_cond_question_after = ignore # In the abbreviated ternary form (a ?: b), add/remove space between ? and :.'. Overrides all other sp_cond_* options. -sp_cond_ternary_short = ignore # ignore/add/remove/force +sp_cond_ternary_short = ignore # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = ignore # ignore/add/remove/force +sp_case_label = ignore # Control the space around the D '..' operator. -sp_range = ignore # ignore/add/remove/force +sp_range = ignore # Control the spacing after ':' in 'for (TYPE VAR : EXPR)' (Java) -sp_after_for_colon = ignore # ignore/add/remove/force +sp_after_for_colon = ignore # Control the spacing before ':' in 'for (TYPE VAR : EXPR)' (Java) -sp_before_for_colon = ignore # ignore/add/remove/force +sp_before_for_colon = ignore # Control the spacing in 'extern (C)' (D) -sp_extern_paren = ignore # ignore/add/remove/force +sp_extern_paren = ignore # Control the space after the opening of a C++ comment '// A' vs '//A' -sp_cmt_cpp_start = ignore # ignore/add/remove/force +sp_cmt_cpp_start = ignore # Controls the spaces between #else or #endif and a trailing comment -sp_endif_cmt = ignore # ignore/add/remove/force +sp_endif_cmt = ignore # Controls the spaces after 'new', 'delete', and 'delete[]' -sp_after_new = ignore # ignore/add/remove/force +sp_after_new = ignore # Controls the spaces before a trailing or embedded comment -sp_before_tr_emb_cmt = ignore # ignore/add/remove/force +sp_before_tr_emb_cmt = ignore # Number of spaces before a trailing or embedded comment -sp_num_before_tr_emb_cmt = 0 # number +sp_num_before_tr_emb_cmt = 0 # Control space between a Java annotation and the open paren. -sp_annotation_paren = ignore # ignore/add/remove/force +sp_annotation_paren = ignore # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # Whether to use tabs for aligning -align_with_tabs = false # false/true +align_with_tabs = false # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # Whether to keep whitespace not required for alignment. -align_keep_extra_space = false # false/true +align_keep_extra_space = false # Align variable definitions in prototypes and functions -align_func_params = true # false/true +align_func_params = true # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = false # false/true +align_same_func_call_params = false # The span for aligning variable definitions (0=don't align) -align_var_def_span = 1 # number +align_var_def_span = 1 # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 0 # number +align_var_def_star_style = 0 # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # Whether to align any attribute after the variable name -align_var_def_attribute = false # false/true +align_var_def_attribute = false # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = false # false/true +align_var_def_inline = false # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 1 # number +align_assign_span = 1 # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 4 # number +align_enum_equ_span = 4 # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # The span for aligning struct/union (0=don't align) -align_var_struct_span = 2 # number +align_var_struct_span = 2 # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 3 # number +align_struct_init_span = 3 # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number +align_typedef_gap = 0 # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 2 # number +align_typedef_span = 2 # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typedef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typedef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 3 # number +align_right_cmt_span = 3 # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. This has to be > 0 to do anything. -align_right_cmt_gap = 0 # number +align_right_cmt_gap = 0 # Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore) -align_right_cmt_at_col = 0 # number +align_right_cmt_at_col = 0 # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # Align function protos on the 'operator' keyword instead of what follows -align_on_operator = false # false/true +align_on_operator = false # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true +align_single_line_func = false # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # The span for aligning ObjC msg spec (0=don't align) -align_oc_msg_spec_span = 0 # number +align_oc_msg_spec_span = 0 # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = false # false/true +align_nl_cont = false # # Align macro functions and variables together -align_pp_define_together = false # false/true +align_pp_define_together = false # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 0 # number +align_pp_define_gap = 0 # The span for aligning on '#define' bodies (0=don't align, other=number of lines including comments between blocks) -align_pp_define_span = 0 # number +align_pp_define_span = 0 # Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = true # false/true +align_left_shift = true # Span for aligning parameters in an Obj-C message call on the ':' (0=don't align) -align_oc_msg_colon_span = 0 # number +align_oc_msg_colon_span = 0 # If true, always align with the first parameter, even if it is too short. -align_oc_msg_colon_first = false # false/true +align_oc_msg_colon_first = false # Aligning parameters in an Obj-C '+' or '-' declaration on the ':' -align_oc_decl_colon = false # false/true +align_oc_decl_colon = false # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = false # false/true +nl_assign_leave_one_liners = false # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = false # false/true +nl_class_leave_one_liners = false # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = false # false/true +nl_enum_leave_one_liners = false # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # Don't split one-line C++11 lambdas - '[]() { return 0; }' -nl_cpp_lambda_leave_one_liners = false # false/true +nl_cpp_lambda_leave_one_liners = false # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # Don't split one-line OC messages -nl_oc_msg_leave_one_liner = false # false/true +nl_oc_msg_leave_one_liner = false # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # Add or remove newline between '=' and '{' -nl_assign_brace = ignore # ignore/add/remove/force +nl_assign_brace = ignore # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # The number of blank lines after a block of variable definitions at the top of a function body # 0 = No change (default) -nl_func_var_def_blk = 0 # number +nl_func_var_def_blk = 0 # The number of newlines before a block of typedefs # 0 = No change (default) -nl_typedef_blk_start = 0 # number +nl_typedef_blk_start = 0 # The number of newlines after a block of typedefs # 0 = No change (default) -nl_typedef_blk_end = 0 # number +nl_typedef_blk_end = 0 # The maximum consecutive newlines within a block of typedefs # 0 = No change (default) -nl_typedef_blk_in = 0 # number +nl_typedef_blk_in = 0 # The number of newlines before a block of variable definitions not at the top of a function body # 0 = No change (default) -nl_var_def_blk_start = 0 # number +nl_var_def_blk_start = 0 # The number of newlines after a block of variable definitions not at the top of a function body # 0 = No change (default) -nl_var_def_blk_end = 0 # number +nl_var_def_blk_end = 0 # The maximum consecutive newlines within a block of variable definitions # 0 = No change (default) -nl_var_def_blk_in = 0 # number +nl_var_def_blk_in = 0 # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = add # ignore/add/remove/force +nl_fcall_brace = add # Add or remove newline between 'enum' and '{' -nl_enum_brace = add # ignore/add/remove/force +nl_enum_brace = add # Add or remove newline between 'struct and '{' -nl_struct_brace = add # ignore/add/remove/force +nl_struct_brace = add # Add or remove newline between 'union' and '{' -nl_union_brace = add # ignore/add/remove/force +nl_union_brace = add # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = ignore # ignore/add/remove/force +nl_elseif_brace = ignore # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # Add or remove newline between 'else' and 'if' -nl_else_if = ignore # ignore/add/remove/force +nl_else_if = ignore # Add or remove newline between '}' and 'finally' -nl_brace_finally = ignore # ignore/add/remove/force +nl_brace_finally = ignore # Add or remove newline between 'finally' and '{' -nl_finally_brace = ignore # ignore/add/remove/force +nl_finally_brace = ignore # Add or remove newline between 'try' and '{' -nl_try_brace = ignore # ignore/add/remove/force +nl_try_brace = ignore # Add or remove newline between get/set and '{' -nl_getset_brace = ignore # ignore/add/remove/force +nl_getset_brace = ignore # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # Add or remove newline between 'catch' and '{' -nl_catch_brace = add # ignore/add/remove/force +nl_catch_brace = add # Add or remove newline between '}' and 'catch' -nl_brace_catch = add # ignore/add/remove/force +nl_brace_catch = add # Add or remove newline between '}' and ']' -nl_brace_square = ignore # ignore/add/remove/force +nl_brace_square = ignore # Add or remove newline between '}' and ')' in a function invocation -nl_brace_fparen = ignore # ignore/add/remove/force +nl_brace_fparen = ignore # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # Add or remove newline between 'scope (x)' and '{' (D) -nl_scope_brace = ignore # ignore/add/remove/force +nl_scope_brace = ignore # Add or remove newline between 'unittest' and '{' (D) -nl_unittest_brace = ignore # ignore/add/remove/force +nl_unittest_brace = ignore # Add or remove newline between 'version (x)' and '{' (D) -nl_version_brace = ignore # ignore/add/remove/force +nl_version_brace = ignore # Add or remove newline between 'using' and '{' -nl_using_brace = ignore # ignore/add/remove/force +nl_using_brace = ignore # Add or remove newline between two open or close braces. # Due to general newline/brace handling, REMOVE may not work. -nl_brace_brace = ignore # ignore/add/remove/force +nl_brace_brace = ignore # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = add # ignore/add/remove/force +nl_brace_while = add # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = false # false/true +nl_multi_line_define = false # Whether to put a newline before 'case' statement -nl_before_case = false # false/true +nl_before_case = false # Add or remove newline between ')' and 'throw' -nl_before_throw = ignore # ignore/add/remove/force +nl_before_throw = ignore # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # Add or remove a newline between a case ':' and '{'. Overrides nl_after_case. -nl_case_colon_brace = ignore # ignore/add/remove/force +nl_case_colon_brace = ignore # Newline between namespace and { -nl_namespace_brace = add # ignore/add/remove/force +nl_namespace_brace = add # Add or remove newline between 'template<>' and whatever follows. -nl_template_class = add # ignore/add/remove/force +nl_template_class = add # Add or remove newline between 'class' and '{' -nl_class_brace = add # ignore/add/remove/force +nl_class_brace = add # Add or remove newline after each ',' in the class base list -nl_class_init_args = add # ignore/add/remove/force +nl_class_init_args = add # Add or remove newline after each ',' in the constructor member initialization -nl_constr_init_args = ignore # ignore/add/remove/force +nl_constr_init_args = ignore # Add or remove newline between return type and function name in a function definition -nl_func_type_name = add # ignore/add/remove/force +nl_func_type_name = add # Add or remove newline between return type and function name inside a class {} # Uses nl_func_type_name or nl_func_proto_type_name if set to ignore. -nl_func_type_name_class = ignore # ignore/add/remove/force +nl_func_type_name_class = ignore # Add or remove newline between function scope and name in a definition # Controls the newline after '::' in 'void A::f() { }' -nl_func_scope_name = ignore # ignore/add/remove/force +nl_func_scope_name = ignore # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = add # ignore/add/remove/force +nl_func_proto_type_name = add # Add or remove newline between a function name and the opening '(' -nl_func_paren = ignore # ignore/add/remove/force +nl_func_paren = ignore # Add or remove newline between a function name and the opening '(' in the definition -nl_func_def_paren = ignore # ignore/add/remove/force +nl_func_def_paren = ignore # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # Add or remove newline after '(' in a function definition -nl_func_def_start = ignore # ignore/add/remove/force +nl_func_def_start = ignore # Overrides nl_func_decl_start when there is only one parameter. -nl_func_decl_start_single = ignore # ignore/add/remove/force +nl_func_decl_start_single = ignore # Overrides nl_func_def_start when there is only one parameter. -nl_func_def_start_single = ignore # ignore/add/remove/force +nl_func_def_start_single = ignore # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = add # ignore/add/remove/force +nl_func_decl_args = add # Add or remove newline after each ',' in a function definition -nl_func_def_args = ignore # ignore/add/remove/force +nl_func_def_args = ignore # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # Add or remove newline before the ')' in a function definition -nl_func_def_end = ignore # ignore/add/remove/force +nl_func_def_end = ignore # Overrides nl_func_decl_end when there is only one parameter. -nl_func_decl_end_single = ignore # ignore/add/remove/force +nl_func_decl_end_single = ignore # Overrides nl_func_def_end when there is only one parameter. -nl_func_def_end_single = ignore # ignore/add/remove/force +nl_func_def_end_single = ignore # Add or remove newline between '()' in a function declaration. -nl_func_decl_empty = ignore # ignore/add/remove/force +nl_func_decl_empty = ignore # Add or remove newline between '()' in a function definition. -nl_func_def_empty = ignore # ignore/add/remove/force +nl_func_def_empty = ignore # Whether to put each OC message parameter on a separate line # See nl_oc_msg_leave_one_liner -nl_oc_msg_args = false # false/true +nl_oc_msg_args = false # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # Add or remove newline between C++11 lambda signature and '{' -nl_cpp_ldef_brace = ignore # ignore/add/remove/force +nl_cpp_ldef_brace = ignore # Add or remove a newline between the return keyword and return expression. -nl_return_expr = ignore # ignore/add/remove/force +nl_return_expr = ignore # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # Java: Control the newline between the ')' and '{{' of the double brace initializer. -nl_paren_dbrace_open = ignore # ignore/add/remove/force +nl_paren_dbrace_open = ignore # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = false # false/true +nl_after_brace_open = false # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true +nl_after_brace_open_cmt = false # Whether to put a newline after a virtual brace open with a non-empty body. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = false # false/true +nl_after_vbrace_open = false # Whether to put a newline after a virtual brace open with an empty body. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open_empty = false # false/true +nl_after_vbrace_open_empty = false # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. -nl_after_brace_close = false # false/true +nl_after_brace_close = false # Whether to put a newline after a virtual brace close. # Would add a newline before return in: 'if (foo) a++; return;' -nl_after_vbrace_close = false # false/true +nl_after_vbrace_close = false # Control the newline between the close brace and 'b' in: 'struct { int a; } b;' # Affects enums, unions, and structures. If set to ignore, uses nl_after_brace_close -nl_brace_struct_var = ignore # ignore/add/remove/force +nl_brace_struct_var = ignore # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true +nl_squeeze_ifdef = false # Add or remove blank line before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # Add or remove blank line after 'if' statement -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # Add or remove blank line before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # Add or remove blank line after 'for' statement -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # Add or remove blank line before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # Add or remove blank line after 'while' statement -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # Add or remove blank line before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # Add or remove blank line after 'switch' statement -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # Add or remove blank line before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # Add or remove blank line after 'do/while' statement -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # Whether to double-space before the close brace of a struct/union/enum # (lower priority than 'eat_blanks_before_close_brace') -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_class_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # Add or remove a newline around a class constructor colon. # Related to pos_constr_colon, nl_constr_init_args, and pos_constr_comma. -nl_constr_colon = ignore # ignore/add/remove/force +nl_constr_colon = ignore # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # # Positioning options # # The position of arithmetic operators in wrapped expressions -pos_arith = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_arith = ignore # The position of assignment in wrapped expressions. # Do not affect '=' followed by '{' -pos_assign = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_assign = ignore # The position of boolean operators in wrapped expressions -pos_bool = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_bool = ignore # The position of comparison operators in wrapped expressions -pos_compare = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_compare = ignore # The position of conditional (b ? t : f) operators in wrapped expressions -pos_conditional = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_conditional = ignore # The position of the comma in wrapped expressions -pos_comma = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_comma = ignore # The position of the comma in the class base list -pos_class_comma = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_comma = ignore # The position of the comma in the constructor initialization list -pos_constr_comma = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_constr_comma = ignore # The position of colons between class and base class list -pos_class_colon = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_colon = ignore # The position of colons between constructor and member initialization -pos_constr_colon = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_constr_colon = ignore # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true +ls_for_split_full = false # Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true +ls_func_split_full = false # Whether to split lines as close to code_width as possible and ignore some groupings -ls_code_width = false # false/true +ls_code_width = false # # Blank line options # # The maximum consecutive newlines -nl_max = 0 # number +nl_max = 0 # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 0 # number +nl_after_func_body = 0 # The number of newlines after '}' of a multi-line function body in a class declaration -nl_after_func_body_class = 0 # number +nl_after_func_body_class = 0 # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 0 # number +nl_after_func_body_one_liner = 0 # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 0 # number +nl_before_block_comment = 0 # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # Whether to force a newline after a multi-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # The number of newlines after '}' or ';' of a struct/enum/union definition -nl_after_struct = 0 # number +nl_after_struct = 0 # The number of newlines after '}' or ';' of a class definition -nl_after_class = 0 # number +nl_after_class = 0 # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 0 # number +nl_before_access_spec = 0 # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # The number of newlines between a function def and the function comment. # 0 = No change. -nl_comment_func_def = 0 # number +nl_comment_func_def = 0 # The number of newlines after a try-catch-finally block that isn't followed by a brace close. # 0 = No change. -nl_after_try_catch_finally = 0 # number +nl_after_try_catch_finally = 0 # The number of newlines before and after a property, indexer or event decl. # 0 = No change. -nl_around_cs_property = 0 # number +nl_around_cs_property = 0 # The number of newlines between the get/set/add/remove handlers in C#. # 0 = No change. -nl_between_get_set = 0 # number +nl_between_get_set = 0 # Add or remove newline between C# property and the '{' -nl_property_brace = ignore # ignore/add/remove/force +nl_property_brace = ignore # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # How aggressively to remove extra newlines not in preproc. # 0: No change # 1: Remove most newlines not handled by other config # 2: Remove all newlines and reformat completely by config -nl_remove_extra_newlines = 0 # number +nl_remove_extra_newlines = 0 # Whether to put a blank line before 'return' statements, unless after an open brace. -nl_before_return = false # false/true +nl_before_return = false # Whether to put a blank line after 'return' statements, unless followed by a close brace. -nl_after_return = false # false/true +nl_after_return = false # Whether to put a newline after a Java annotation statement. # Only affects annotations that are after a newline. -nl_after_annotation = ignore # ignore/add/remove/force +nl_after_annotation = ignore # Controls the newline between two annotations. -nl_between_annotation = ignore # ignore/add/remove/force +nl_between_annotation = ignore # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # Add or remove braces on single-line function definitions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if. # If any must be braced, they are all braced. If all can be unbraced, then the braces are removed. -mod_full_brace_if_chain = false # false/true +mod_full_brace_if_chain = false # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # Add or remove braces on single-line 'using ()' statement -mod_full_brace_using = ignore # ignore/add/remove/force +mod_full_brace_using = ignore # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = remove # ignore/add/remove/force +mod_paren_on_return = remove # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = false # false/true +mod_full_paren_if_bool = false # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = false # false/true +mod_remove_extra_semicolon = false # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 0 # number +mod_add_long_function_closebrace_comment = 0 # If a namespace body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_namespace_closebrace_comment = 0 # number +mod_add_long_namespace_closebrace_comment = 0 # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number +mod_add_long_switch_closebrace_comment = 0 # If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after # the #endif, a comment will be added. -mod_add_long_ifdef_endif_comment = 0 # number +mod_add_long_ifdef_endif_comment = 0 # If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after # the #else, a comment will be added. -mod_add_long_ifdef_else_comment = 0 # number +mod_add_long_ifdef_else_comment = 0 # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = false # false/true +mod_move_case_break = false # Will add or remove the braces around a fully braced case statement. # Will only remove the braces if there are no variable declarations in the block. -mod_case_brace = ignore # ignore/add/remove/force +mod_case_brace = ignore # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = false # false/true +mod_remove_empty_return = false # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # Set the comment reflow mode (default: 0) # 0: no reflowing (apart from the line wrapping due to cmt_width) # 1: no touching at all # 2: full reflow -cmt_reflow_mode = 0 # number +cmt_reflow_mode = 0 # Whether to convert all tabs to spaces in comments. Default is to leave tabs inside comments alone, unless used for indenting. -cmt_convert_tab_to_spaces = false # false/true +cmt_convert_tab_to_spaces = false # If false, disable all multi-line comment changes, including cmt_width. keyword substitution, and leading chars. # Default is true. -cmt_indent_multi = true # false/true +cmt_indent_multi = true # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_footer = "" # string +cmt_insert_file_footer = "" # The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment. # Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment. # Will substitute $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # The filename that contains text to insert before a Obj-C message specification if the method isn't preceded with a C/C++ comment. # Will substitute $(message) with the function name and $(javaparam) with the javadoc @param and @return stuff. -cmt_insert_oc_msg_header = "" # string +cmt_insert_oc_msg_header = "" # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_oc_msg_header, cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true +cmt_insert_before_preproc = false # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 (file-level) -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # Specifies the number of columns to indent preprocessors per level at brace level 0 (file-level). # If pp_indent_at_level=false, specifies the number of columns to indent preprocessors per level at brace level > 0 (function-level). # Default=1. -pp_indent_count = 1 # number +pp_indent_count = 1 # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level. # 0: indent preprocessors using output_tab_size. # >0: column at which all preprocessors will be indented. -pp_indent_if = 0 # number +pp_indent_if = 0 # Control whether to indent the code between #if, #else and #endif. -pp_if_indent_code = false # false/true +pp_if_indent_code = false # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/bug_i_408.cfg b/tests/config/bug_i_408.cfg index 515a5d724a..f13731f3f1 100644 --- a/tests/config/bug_i_408.cfg +++ b/tests/config/bug_i_408.cfg @@ -1,2 +1,2 @@ -sp_arith = add # ignore/add/remove/force -sp_before_ptr_star = remove # ignore/add/remove/force +sp_arith = add +sp_before_ptr_star = remove diff --git a/tests/config/case-1.cfg b/tests/config/case-1.cfg index 3d6a1c65af..8ce2f015e1 100644 --- a/tests/config/case-1.cfg +++ b/tests/config/case-1.cfg @@ -2,9 +2,9 @@ # My favorite format # -indent_with_tabs = 1 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size +indent_with_tabs = 1 +input_tab_size = 8 +output_tab_size = 3 indent_columns = output_tab_size indent_switch_case = 0 diff --git a/tests/config/case-2.cfg b/tests/config/case-2.cfg index d393a02eff..9554e43437 100644 --- a/tests/config/case-2.cfg +++ b/tests/config/case-2.cfg @@ -2,9 +2,9 @@ # My favorite format # -indent_with_tabs = 1 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size +indent_with_tabs = 1 +input_tab_size = 8 +output_tab_size = 3 indent_columns = output_tab_size indent_switch_case = indent_columns diff --git a/tests/config/case-3.cfg b/tests/config/case-3.cfg index 5aeebf6387..806c43e8b5 100644 --- a/tests/config/case-3.cfg +++ b/tests/config/case-3.cfg @@ -2,9 +2,9 @@ # My favorite format # -indent_with_tabs = 1 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size +indent_with_tabs = 1 +input_tab_size = 8 +output_tab_size = 3 indent_columns = output_tab_size indent_switch_case = indent_columns diff --git a/tests/config/clark.cfg b/tests/config/clark.cfg index 82caac5392..0875dbd9e3 100644 --- a/tests/config/clark.cfg +++ b/tests/config/clark.cfg @@ -4,504 +4,504 @@ # # The type of line endings -newlines = auto # auto/lf/crlf/cr +newlines = auto # The original size of tabs in the input -input_tab_size = 2 # number +input_tab_size = 2 # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 2 # number +output_tab_size = 2 # The ascii value of the string escape char, usually 92 (\). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # # Indenting # # The number of columns to indent per level (usually 2, 3, 4, or 8) -indent_columns = 2 # number +indent_columns = 2 # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # Whether to indent strings broken by '\' so that they line up -indent_align_string = false # false/true +indent_align_string = false # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # Whether braces are indented to the body level -indent_braces = true # false/true +indent_braces = true # Whether the 'namespace' body is indented -indent_namespace = true # false/true +indent_namespace = true # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # Whether to indent the stuff after a leading class colon -indent_class_colon = false # false/true +indent_class_colon = false # Whether to indent continued function call parameters one indent level (true) or aligns instead of indent (false) -indent_func_call_param = false # false/true +indent_func_call_param = false # The number of spaces to indent a continued '->' or '.' # Usually set to indent_columns. -indent_member = 2 # number +indent_member = 2 # indent single line ('//') comments on lines before code -indent_sing_line_comments = 2 # number +indent_sing_line_comments = 2 # Spaces to indent 'case' from 'switch' -indent_switch_case = 2 # number +indent_switch_case = 2 # Spaces to indent '{' from 'case' -indent_case_brace = 2 # number +indent_case_brace = 2 # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # How to indent goto labels (>0=absolute column where 1 is the leftmost column, <=0=subtract from brace indent) -indent_label = 1 # number +indent_label = 1 # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = add # ignore/add/remove/force +sp_arith = add # Add or remove space around assignment operator '=', '+=', etc -sp_assign = add # ignore/add/remove/force +sp_assign = add # Add or remove space around boolean operators '&&' and '||' -sp_bool = add # ignore/add/remove/force +sp_bool = add # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = add # ignore/add/remove/force +sp_compare = add # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # Add or remove space before pointer star '*' -sp_before_ptr_star = ignore # ignore/add/remove/force +sp_before_ptr_star = ignore # Add or remove space between pointer stars '*' -sp_between_ptr_star = ignore # ignore/add/remove/force +sp_between_ptr_star = ignore # Add or remove space after pointer star '*' -sp_after_ptr_star = ignore # ignore/add/remove/force +sp_after_ptr_star = ignore # Add or remove space before reference sign '&' -sp_before_byref = ignore # ignore/add/remove/force +sp_before_byref = ignore # Add or remove space after reference sign '&' -sp_after_byref = ignore # ignore/add/remove/force +sp_after_byref = ignore # Add or remove space before '<>' -sp_before_angle = add # ignore/add/remove/force +sp_before_angle = add # Add or remove space after '<>' -sp_after_angle = add # ignore/add/remove/force +sp_after_angle = add # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = add # ignore/add/remove/force +sp_before_sparen = add # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = ignore # ignore/add/remove/force +sp_after_sparen = ignore # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = ignore # ignore/add/remove/force +sp_sparen_brace = ignore # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # Add or remove space before ';' -sp_before_semi = ignore # ignore/add/remove/force +sp_before_semi = ignore # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # Add or remove space after ',' -sp_after_comma = add # ignore/add/remove/force +sp_after_comma = add # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # Add or remove space after cast -sp_after_cast = ignore # ignore/add/remove/force +sp_after_cast = ignore # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = ignore # ignore/add/remove/force +sp_sizeof_paren = ignore # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = ignore # ignore/add/remove/force +sp_inside_braces_enum = ignore # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = ignore # ignore/add/remove/force +sp_inside_braces_struct = ignore # Add or remove space inside '{' and '}' -sp_inside_braces = force # ignore/add/remove/force +sp_inside_braces = force # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # Add or remove space between return type and function name (a minimum of 1 is forced except for pointer return types) -sp_type_func = ignore # ignore/add/remove/force +sp_type_func = ignore # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = ignore # ignore/add/remove/force +sp_func_proto_paren = ignore # Add or remove space between function name and '(' on function definition -sp_func_def_paren = ignore # ignore/add/remove/force +sp_func_def_paren = ignore # Add or remove space inside empty function '()' -sp_inside_fparens = ignore # ignore/add/remove/force +sp_inside_fparens = ignore # Add or remove space inside function '(' and ')' -sp_inside_fparen = ignore # ignore/add/remove/force +sp_inside_fparen = ignore # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # Add or remove space between ')' and '{' of function -sp_fparen_brace = ignore # ignore/add/remove/force +sp_fparen_brace = ignore # Add or remove space between function name and '(' on function calls -sp_func_call_paren = ignore # ignore/add/remove/force +sp_func_call_paren = ignore # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = ignore # ignore/add/remove/force +sp_func_class_paren = ignore # Add or remove space between 'return' and '(' -sp_return_paren = ignore # ignore/add/remove/force +sp_return_paren = ignore # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # The span for aligning variable definitions (0=don't align) -align_var_def_span = 0 # number +align_var_def_span = 0 # Whether the pointer star is part of the variable name or not -align_var_def_star_style = 2 # false/true +align_var_def_star_style = 2 # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = false # false/true +align_var_def_inline = false # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 0 # number +align_assign_span = 0 # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 0 # number +align_enum_equ_span = 0 # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # The span for aligning struct/union (0=don't align) -align_var_struct_span = 0 # number +align_var_struct_span = 0 # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 0 # number +align_struct_init_span = 0 # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number +align_typedef_gap = 0 # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 0 # number +align_typedef_span = 0 # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type: typedef int * pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 0 # number +align_right_cmt_span = 0 # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # Whether to align macros wrapped with a backslash and a newline -align_nl_cont = false # false/true +align_nl_cont = false # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 0 # number +align_pp_define_gap = 0 # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 0 # number +align_pp_define_span = 0 # # Newline adding and removing options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # Add or remove newlines at the start of the file -nl_start_of_file = ignore # ignore/add/remove/force +nl_start_of_file = ignore # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # Add or remove newline at the end of the file -nl_end_of_file = ignore # ignore/add/remove/force +nl_end_of_file = ignore # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 0 # number +nl_end_of_file_min = 0 # Add or remove newline between '=' and '{' -nl_assign_brace = ignore # ignore/add/remove/force +nl_assign_brace = ignore # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # Add or remove newline between function call and '(' -nl_fcall_brace = ignore # ignore/add/remove/force +nl_fcall_brace = ignore # Add or remove newline between 'enum' and '{' -nl_enum_brace = ignore # ignore/add/remove/force +nl_enum_brace = ignore # Add or remove newline between 'struct and '{' -nl_struct_brace = add # ignore/add/remove/force +nl_struct_brace = add # Add or remove newline between 'union' and '{' -nl_union_brace = add # ignore/add/remove/force +nl_union_brace = add # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = add # ignore/add/remove/force - -nl_before_if = force # ignore/add/remove/force -nl_after_if = force # ignore/add/remove/force -nl_before_for = force # ignore/add/remove/force -nl_after_for = force # ignore/add/remove/force -nl_before_while = force # ignore/add/remove/force -nl_after_while = force # ignore/add/remove/force -nl_before_switch = force # ignore/add/remove/force -nl_after_switch = force # ignore/add/remove/force -nl_before_do = force # ignore/add/remove/force -nl_after_do = force # ignore/add/remove/force +nl_elseif_brace = add + +nl_before_if = force +nl_after_if = force +nl_before_for = force +nl_after_for = force +nl_before_while = force +nl_after_while = force +nl_before_switch = force +nl_after_switch = force +nl_before_do = force +nl_after_do = force # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = add # ignore/add/remove/force +nl_brace_while = add # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # Whether to put a newline after 'case' statement -nl_after_case = false # false/true +nl_after_case = false # Newline between namespace and { -nl_namespace_brace = add # ignore/add/remove/force +nl_namespace_brace = add # Add or remove newline between 'template<>' and 'class' -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # Add or remove newline between 'class' and '{' -nl_class_brace = add # ignore/add/remove/force +nl_class_brace = add # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # Add or remove newline between return type and function name in definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # Whether to put a newline after 'return' statement -nl_after_return = false # false/true +nl_after_return = false # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = false # false/true +nl_after_semicolon = false # Whether to put a newline after brace open -nl_after_brace_open = true # false/true +nl_after_brace_open = true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true +nl_squeeze_ifdef = false # # Positioning options # # The position of boolean operators in wrapped expressions -pos_bool = ignore # ignore/lead/trail +pos_bool = ignore # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # # Blank line options # # The maximum consecutive newlines -nl_max = 0 # number +nl_max = 0 # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 0 # number +nl_after_func_proto_group = 0 # The number of newlines after '}' of the function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # The minimum number of newlines before a multi-line comment (doesn't apply if after a brace open) -nl_before_block_comment = 1 # number +nl_before_block_comment = 1 # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = false # false/true +eat_blanks_after_open_brace = false # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = false # false/true +eat_blanks_before_close_brace = false # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = remove # ignore/add/remove/force +mod_full_brace_do = remove # Add or remove braces on single-line 'for' statement -mod_full_brace_for = remove # ignore/add/remove/force +mod_full_brace_for = remove # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # Add or remove braces on single-line 'if' statement -mod_full_brace_if = remove # ignore/add/remove/force +mod_full_brace_if = remove # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 3 # number +mod_full_brace_nl = 3 # Add or remove braces on single-line 'while' statement -mod_full_brace_while = remove # ignore/add/remove/force +mod_full_brace_while = remove # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = remove # ignore/add/remove/force +mod_paren_on_return = remove # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # # Comment modifications # # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # # Preprocessor options # # Add or remove indent of preprocessor directives -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # Add or remove space between # and, say, define -pp_space = ignore # ignore/add/remove/force +pp_space = ignore sp_after_tparen_close = remove diff --git a/tests/config/class-colon-pos-eol-add.cfg b/tests/config/class-colon-pos-eol-add.cfg index e9d06030b9..ca3e8bf91b 100644 --- a/tests/config/class-colon-pos-eol-add.cfg +++ b/tests/config/class-colon-pos-eol-add.cfg @@ -2,9 +2,9 @@ # moves class colon ops to the end of line # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 3 indent_columns = output_tab_size pos_class_colon = Trail diff --git a/tests/config/class-colon-pos-eol.cfg b/tests/config/class-colon-pos-eol.cfg index 6513f697eb..d7ae1a67a4 100644 --- a/tests/config/class-colon-pos-eol.cfg +++ b/tests/config/class-colon-pos-eol.cfg @@ -2,9 +2,9 @@ # moves class colon ops to the end of line # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 3 indent_columns = output_tab_size pos_class_colon = Trail diff --git a/tests/config/class-colon-pos-sol-add.cfg b/tests/config/class-colon-pos-sol-add.cfg index ad95f4852b..1b0938ac5c 100644 --- a/tests/config/class-colon-pos-sol-add.cfg +++ b/tests/config/class-colon-pos-sol-add.cfg @@ -2,9 +2,9 @@ # moves class colon ops to the end of line # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 3 indent_columns = output_tab_size pos_class_colon = Lead diff --git a/tests/config/class-colon-pos-sol.cfg b/tests/config/class-colon-pos-sol.cfg index 1205d47fee..0d33fc2b43 100644 --- a/tests/config/class-colon-pos-sol.cfg +++ b/tests/config/class-colon-pos-sol.cfg @@ -2,9 +2,9 @@ # moves class colon ops to the end of line # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 3 indent_columns = output_tab_size pos_class_colon = Lead diff --git a/tests/config/class-nl_func-add.cfg b/tests/config/class-nl_func-add.cfg index 3646daaf8c..d2ef0a79b7 100644 --- a/tests/config/class-nl_func-add.cfg +++ b/tests/config/class-nl_func-add.cfg @@ -2,9 +2,9 @@ # moves class colon ops to the end of line # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 3 indent_columns = output_tab_size pos_class_colon = Trail diff --git a/tests/config/class-nl_func-add2.cfg b/tests/config/class-nl_func-add2.cfg index 5599d87038..776ed0d4de 100644 --- a/tests/config/class-nl_func-add2.cfg +++ b/tests/config/class-nl_func-add2.cfg @@ -3,9 +3,9 @@ # include ben.cfg -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 3 indent_columns = output_tab_size pos_class_colon = Trail diff --git a/tests/config/class-nl_func-del.cfg b/tests/config/class-nl_func-del.cfg index 5ab7689504..45879bec51 100644 --- a/tests/config/class-nl_func-del.cfg +++ b/tests/config/class-nl_func-del.cfg @@ -2,9 +2,9 @@ # moves class colon ops to the end of line # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 3 indent_columns = output_tab_size pos_class_colon = Trail diff --git a/tests/config/class-on-colon-indent.cfg b/tests/config/class-on-colon-indent.cfg index 7c72ae9c44..6d13e65482 100644 --- a/tests/config/class-on-colon-indent.cfg +++ b/tests/config/class-on-colon-indent.cfg @@ -2,9 +2,9 @@ # moves class colon ops to the end of line # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 3 indent_columns = output_tab_size pos_class_colon = join diff --git a/tests/config/cmt_nl_end.cfg b/tests/config/cmt_nl_end.cfg index 03a114a9a0..68e52c4414 100644 --- a/tests/config/cmt_nl_end.cfg +++ b/tests/config/cmt_nl_end.cfg @@ -2,6 +2,6 @@ indent_columns = 3 indent_with_tabs = 0 input_tab_size = 3 nl_end_of_file_min = 1 -nl_after_if = force # X+1 -nl_before_if = force # x+y +nl_after_if = force +nl_before_if = force diff --git a/tests/config/const_throw.cfg b/tests/config/const_throw.cfg index c93e2675fc..d8b8f071a1 100644 --- a/tests/config/const_throw.cfg +++ b/tests/config/const_throw.cfg @@ -1,10 +1,10 @@ # Indentation column for standalone 'const' function decl/proto qualifier # e.g., int GetFoo(void)\n const\n { return (m_Foo); } -indent_func_const = 69 # number +indent_func_const = 69 # Indentation column for standalone 'throw' function decl/proto qualifier # e.g., int GetFoo(void)\n throw (std::bad_alloc)\n { return (m_Foo); } -indent_func_throw = 41 # number +indent_func_throw = 41 #indent class memeber function declarations. This is to test #that a 'const' qualifier is continuation indented diff --git a/tests/config/cu.cfg b/tests/config/cu.cfg index af6caf3010..5db1ce52bd 100644 --- a/tests/config/cu.cfg +++ b/tests/config/cu.cfg @@ -9,9 +9,9 @@ # # -input_tab_size = 2 # original tab size +input_tab_size = 2 -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +indent_with_tabs = 0 indent_columns = 2 indent_align_string = true indent_braces = false diff --git a/tests/config/custom-open.cfg b/tests/config/custom-open.cfg index 269e28a937..a0eb3dae3a 100644 --- a/tests/config/custom-open.cfg +++ b/tests/config/custom-open.cfg @@ -6,7 +6,7 @@ output_tab_size = indent_columns indent_with_tabs = 1 # Spaces to indent 'case' from 'switch' -indent_switch_case = indent_columns # number +indent_switch_case = indent_columns # Spaces to indent '{' from 'case' indent_case_brace = 0 # indent_columns # number diff --git a/tests/config/custom-open2.cfg b/tests/config/custom-open2.cfg index ff78c7effa..c3763ae815 100644 --- a/tests/config/custom-open2.cfg +++ b/tests/config/custom-open2.cfg @@ -6,7 +6,7 @@ output_tab_size = indent_columns indent_with_tabs = 0 # Spaces to indent 'case' from 'switch' -indent_switch_case = indent_columns # number +indent_switch_case = indent_columns # Spaces to indent '{' from 'case' indent_case_brace = 0 # indent_columns # number diff --git a/tests/config/custom_types_ssl.cfg b/tests/config/custom_types_ssl.cfg index 0ad14386ab..32ca3339fb 100644 --- a/tests/config/custom_types_ssl.cfg +++ b/tests/config/custom_types_ssl.cfg @@ -24,14 +24,14 @@ sp_pp_stringify = remove # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = true # false/true +align_right_cmt_mix = true # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. -align_right_cmt_gap = 1 # number +align_right_cmt_gap = 1 # Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore) -align_right_cmt_at_col = 0 # number +align_right_cmt_at_col = 0 @@ -64,63 +64,63 @@ sp_inside_fparen = add # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 3 # number +align_enum_equ_span = 3 # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 5 # number +align_enum_equ_thresh = 5 # The span for aligning struct/union (0=don't align) -align_var_struct_span = 2 # number +align_var_struct_span = 2 # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 5 # number +align_var_struct_thresh = 5 # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 3 # number +align_struct_init_span = 3 # If false, disable all multi-line comment changes, including cmt_width and leading chars. # Default is true. -cmt_indent_multi = true # false/true +cmt_indent_multi = true # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = true # false/true +cmt_c_nl_start = true # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = true # false/true +cmt_c_nl_end = true # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = true # false/true +cmt_cpp_group = true # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # Whether to put a star on subsequent comment lines -cmt_star_cont = true # false/true +cmt_star_cont = true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true set type_wrap STACK_OF LHASH_OF diff --git a/tests/config/d-tst2.cfg b/tests/config/d-tst2.cfg index e723ffcd9e..e6b44a3da9 100644 --- a/tests/config/d-tst2.cfg +++ b/tests/config/d-tst2.cfg @@ -2,14 +2,14 @@ # My favorite format # -newlines = LF # AUTO (default), DOS, MAC, or UNIX +newlines = LF -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 4 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 4 indent_columns = output_tab_size -indent_label = 1 # pos: absolute col, neg: relative column -indent_align_string = False # align broken strings +indent_label = 1 +indent_align_string = False indent_brace = 0 indent_func_call_param = TRUE @@ -18,43 +18,43 @@ nl_start_of_file = remove nl_end_of_file = force nl_end_of_file_min = 1 -nl_assign_brace = remove # "= {" vs "= \n {" -nl_enum_brace = remove # "enum {" vs "enum \n {" -nl_union_brace = remove # "union {" vs "union \n {" -nl_struct_brace = remove # "struct {" vs "struct \n {" -nl_do_brace = remove # "do {" vs "do \n {" -nl_if_brace = remove # "if () {" vs "if () \n {" -nl_for_brace = remove # "for () {" vs "for () \n {" -nl_else_brace = remove # "else {" vs "else \n {" -nl_while_brace = remove # "while () {" vs "while () \n {" -nl_switch_brace = remove # "switch () {" vs "switch () \n {" +nl_assign_brace = remove +nl_enum_brace = remove +nl_union_brace = remove +nl_struct_brace = remove +nl_do_brace = remove +nl_if_brace = remove +nl_for_brace = remove +nl_else_brace = remove +nl_while_brace = remove +nl_switch_brace = remove nl_func_var_def_blk = 1 nl_before_case = 1 -nl_fcall_brace = remove # "foo() {" vs "foo()\n{" -nl_fdef_brace = remove # "int foo() {" vs "int foo()\n{" +nl_fcall_brace = remove +nl_fdef_brace = remove nl_after_return = TRUE nl_brace_while = remove nl_brace_else = add nl_squeeze_ifdef = TRUE nl_after_case = TRUE -mod_paren_on_return = add # "return 1;" vs "return (1);" -mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" -mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" +mod_paren_on_return = add +mod_full_brace_if = add +mod_full_brace_for = add +mod_full_brace_do = add +mod_full_brace_while = add sp_before_byref = remove sp_before_semi = remove -sp_paren_paren = remove # space between (( and )) -sp_return_paren = remove # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_paren_paren = remove +sp_return_paren = remove +sp_sizeof_paren = remove +sp_before_sparen = force +sp_after_sparen = force +sp_after_cast = remove +sp_inside_braces = force +sp_inside_braces_struct = force +sp_inside_braces_enum = force sp_inside_paren = remove sp_inside_fparen = remove sp_inside_sparen = remove @@ -66,16 +66,16 @@ sp_bool = force sp_compare = force sp_assign = force sp_after_comma = force -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_func_def_paren = remove +sp_func_call_paren = remove +sp_func_proto_paren = remove sp_func_class_paren = remove sp_before_angle = force sp_after_angle = force sp_inside_angle = remove -align_with_tabs = FALSE # use tabs to align -align_on_tabstop = FALSE # align on tabstops +align_with_tabs = FALSE +align_on_tabstop = FALSE align_enum_equ_span = 4 align_nl_cont = TRUE align_var_def_span = 2 diff --git a/tests/config/d.cfg b/tests/config/d.cfg index 5b142ef176..30f348f964 100644 --- a/tests/config/d.cfg +++ b/tests/config/d.cfg @@ -2,30 +2,30 @@ # My favorite format # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 4 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 4 indent_columns = output_tab_size -indent_label = 2 # pos: absolute col, neg: relative column -indent_align_string = False # align broken strings +indent_label = 2 +indent_align_string = False indent_brace = 0 indent_case_brace = indent_columns indent_class = true -nl_enum_brace = add # "enum {" vs "enum \n {" -nl_union_brace = add # "union {" vs "union \n {" -nl_struct_brace = add # "struct {" vs "struct \n {" -nl_do_brace = add # "do {" vs "do \n {" -nl_if_brace = add # "if () {" vs "if () \n {" -nl_for_brace = add # "for () {" vs "for () \n {" -nl_else_brace = add # "else {" vs "else \n {" +nl_enum_brace = add +nl_union_brace = add +nl_struct_brace = add +nl_do_brace = add +nl_if_brace = add +nl_for_brace = add +nl_else_brace = add nl_else_if = remove -nl_while_brace = add # "while () {" vs "while () \n {" -nl_switch_brace = add # "switch () {" vs "switch () \n {" +nl_while_brace = add +nl_switch_brace = add nl_func_var_def_blk = 1 nl_before_case = 1 -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_fcall_brace = add +nl_fdef_brace = add nl_after_return = TRUE nl_brace_while = remove nl_brace_else = add @@ -43,15 +43,15 @@ nl_after_brace_open = TRUE sp_before_square = remove sp_before_squares = remove sp_before_semi = remove -sp_paren_paren = remove # space between (( and )) -sp_return_paren = remove # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_paren_paren = remove +sp_return_paren = remove +sp_sizeof_paren = remove +sp_before_sparen = force +sp_after_sparen = force +sp_after_cast = remove +sp_inside_braces = force +sp_inside_braces_struct = force +sp_inside_braces_enum = force sp_inside_paren = remove sp_inside_fparen = remove sp_inside_sparen = remove @@ -62,17 +62,17 @@ sp_bool = force sp_compare = force sp_assign = force sp_after_comma = force -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_func_def_paren = remove +sp_func_call_paren = remove +sp_func_proto_paren = remove sp_after_ptr_star = remove sp_before_ptr_star = force sp_between_ptr_star = remove sp_range = force sp_before_template_paren = remove -align_with_tabs = FALSE # use tabs to align -align_on_tabstop = FALSE # align on tabstops +align_with_tabs = FALSE +align_on_tabstop = FALSE align_enum_equ_span = 4 align_nl_cont = TRUE align_var_def_span = 2 diff --git a/tests/config/d2.cfg b/tests/config/d2.cfg index 119c08afaf..bd10cbe5ca 100644 --- a/tests/config/d2.cfg +++ b/tests/config/d2.cfg @@ -2,14 +2,14 @@ # My favorite format # -newlines = auto # AUTO (default), DOS, MAC, or UNIX +newlines = auto -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 4 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 4 indent_columns = output_tab_size -indent_label = 1 # pos: absolute col, neg: relative column -indent_align_string = False # align broken strings +indent_label = 1 +indent_align_string = False indent_brace = 0 indent_case_brace = indent_columns indent_class = true @@ -19,43 +19,43 @@ nl_start_of_file = remove nl_end_of_file = force nl_end_of_file_min = 1 -nl_assign_brace = remove # "= {" vs "= \n {" -nl_enum_brace = remove # "enum {" vs "enum \n {" -nl_union_brace = remove # "union {" vs "union \n {" -nl_struct_brace = remove # "struct {" vs "struct \n {" -nl_do_brace = remove # "do {" vs "do \n {" -nl_if_brace = remove # "if () {" vs "if () \n {" -nl_for_brace = remove # "for () {" vs "for () \n {" -nl_else_brace = remove # "else {" vs "else \n {" -nl_while_brace = remove # "while () {" vs "while () \n {" -nl_switch_brace = remove # "switch () {" vs "switch () \n {" +nl_assign_brace = remove +nl_enum_brace = remove +nl_union_brace = remove +nl_struct_brace = remove +nl_do_brace = remove +nl_if_brace = remove +nl_for_brace = remove +nl_else_brace = remove +nl_while_brace = remove +nl_switch_brace = remove nl_func_var_def_blk = 1 nl_before_case = 1 -nl_fcall_brace = remove # "foo() {" vs "foo()\n{" -nl_fdef_brace = remove # "int foo() {" vs "int foo()\n{" +nl_fcall_brace = remove +nl_fdef_brace = remove nl_after_return = TRUE nl_brace_while = remove nl_brace_else = add nl_squeeze_ifdef = TRUE nl_after_brace_open = TRUE -mod_paren_on_return = add # "return 1;" vs "return (1);" -mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" -mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" +mod_paren_on_return = add +mod_full_brace_if = add +mod_full_brace_for = add +mod_full_brace_do = add +mod_full_brace_while = add sp_before_byref = remove sp_before_semi = remove -sp_paren_paren = remove # space between (( and )) -sp_return_paren = remove # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_paren_paren = remove +sp_return_paren = remove +sp_sizeof_paren = remove +sp_before_sparen = force +sp_after_sparen = force +sp_after_cast = remove +sp_inside_braces = force +sp_inside_braces_struct = force +sp_inside_braces_enum = force sp_inside_paren = remove sp_inside_fparen = remove sp_inside_sparen = remove @@ -67,9 +67,9 @@ sp_bool = force sp_compare = force sp_assign = force sp_after_comma = force -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_func_def_paren = remove +sp_func_call_paren = remove +sp_func_proto_paren = remove sp_func_class_paren = remove sp_before_angle = force sp_after_angle = force @@ -80,8 +80,8 @@ sp_fparen_brace = force sp_range = remove sp_before_template_paren = force -align_with_tabs = FALSE # use tabs to align -align_on_tabstop = FALSE # align on tabstops +align_with_tabs = FALSE +align_on_tabstop = FALSE align_enum_equ_span = 4 align_nl_cont = TRUE align_var_def_span = 2 diff --git a/tests/config/d3.cfg b/tests/config/d3.cfg index f8d8ab3681..1c581c947e 100644 --- a/tests/config/d3.cfg +++ b/tests/config/d3.cfg @@ -2,28 +2,28 @@ # $Id: d.cfg 803 2007-07-25 00:36:25Z bengardner $ # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 4 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 4 indent_columns = output_tab_size -indent_label = 2 # pos: absolute col, neg: relative column -indent_align_string = False # align broken strings +indent_label = 2 +indent_align_string = False indent_brace = 0 indent_case_brace = indent_columns -nl_enum_brace = add # "enum {" vs "enum \n {" -nl_union_brace = add # "union {" vs "union \n {" -nl_struct_brace = add # "struct {" vs "struct \n {" -nl_do_brace = add # "do {" vs "do \n {" -nl_if_brace = add # "if () {" vs "if () \n {" -nl_for_brace = add # "for () {" vs "for () \n {" -nl_else_brace = add # "else {" vs "else \n {" -nl_while_brace = add # "while () {" vs "while () \n {" -nl_switch_brace = add # "switch () {" vs "switch () \n {" +nl_enum_brace = add +nl_union_brace = add +nl_struct_brace = add +nl_do_brace = add +nl_if_brace = add +nl_for_brace = add +nl_else_brace = add +nl_while_brace = add +nl_switch_brace = add nl_func_var_def_blk = 1 nl_before_case = 1 -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_fcall_brace = add +nl_fdef_brace = add nl_after_return = TRUE nl_brace_while = remove nl_brace_else = add @@ -38,15 +38,15 @@ nl_squeeze_ifdef = TRUE sp_before_square = remove sp_before_squares = remove sp_before_semi = remove -sp_paren_paren = remove # space between (( and )) -sp_return_paren = remove # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_paren_paren = remove +sp_return_paren = remove +sp_sizeof_paren = remove +sp_before_sparen = force +sp_after_sparen = force +sp_after_cast = remove +sp_inside_braces = force +sp_inside_braces_struct = force +sp_inside_braces_enum = force sp_inside_paren = remove sp_inside_fparen = remove sp_inside_sparen = remove @@ -57,15 +57,15 @@ sp_bool = force sp_compare = force sp_assign = force sp_after_comma = force -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_func_def_paren = remove +sp_func_call_paren = remove +sp_func_proto_paren = remove sp_after_ptr_star = remove sp_before_ptr_star = force sp_between_ptr_star = remove -align_with_tabs = FALSE # use tabs to align -align_on_tabstop = FALSE # align on tabstops +align_with_tabs = FALSE +align_on_tabstop = FALSE align_enum_equ_span = 4 align_nl_cont = TRUE align_var_def_span = 2 diff --git a/tests/config/d3a.cfg b/tests/config/d3a.cfg index 731f9badf8..7cf48358fb 100644 --- a/tests/config/d3a.cfg +++ b/tests/config/d3a.cfg @@ -2,28 +2,28 @@ # $Id: d.cfg 803 2007-07-25 00:36:25Z bengardner $ # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 4 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 4 indent_columns = output_tab_size -indent_label = 2 # pos: absolute col, neg: relative column -indent_align_string = False # align broken strings +indent_label = 2 +indent_align_string = False indent_brace = 0 indent_case_brace = indent_columns -nl_enum_brace = add # "enum {" vs "enum \n {" -nl_union_brace = add # "union {" vs "union \n {" -nl_struct_brace = add # "struct {" vs "struct \n {" -nl_do_brace = add # "do {" vs "do \n {" -nl_if_brace = add # "if () {" vs "if () \n {" -nl_for_brace = add # "for () {" vs "for () \n {" -nl_else_brace = add # "else {" vs "else \n {" -nl_while_brace = add # "while () {" vs "while () \n {" -nl_switch_brace = add # "switch () {" vs "switch () \n {" +nl_enum_brace = add +nl_union_brace = add +nl_struct_brace = add +nl_do_brace = add +nl_if_brace = add +nl_for_brace = add +nl_else_brace = add +nl_while_brace = add +nl_switch_brace = add nl_func_var_def_blk = 1 nl_before_case = 1 -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_fcall_brace = add +nl_fdef_brace = add nl_after_return = TRUE nl_brace_while = remove nl_brace_else = add @@ -38,15 +38,15 @@ nl_squeeze_ifdef = TRUE sp_before_square = remove sp_before_squares = remove sp_before_semi = remove -sp_paren_paren = remove # space between (( and )) -sp_return_paren = remove # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_paren_paren = remove +sp_return_paren = remove +sp_sizeof_paren = remove +sp_before_sparen = force +sp_after_sparen = force +sp_after_cast = remove +sp_inside_braces = force +sp_inside_braces_struct = force +sp_inside_braces_enum = force sp_inside_paren = remove sp_inside_fparen = remove sp_inside_sparen = remove @@ -57,15 +57,15 @@ sp_bool = force sp_compare = force sp_assign = force sp_after_comma = force -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_func_def_paren = remove +sp_func_call_paren = remove +sp_func_proto_paren = remove sp_after_ptr_star = remove sp_before_ptr_star = force sp_between_ptr_star = remove -align_with_tabs = FALSE # use tabs to align -align_on_tabstop = FALSE # align on tabstops +align_with_tabs = FALSE +align_on_tabstop = FALSE align_enum_equ_span = 4 align_nl_cont = TRUE align_var_def_span = 2 diff --git a/tests/config/enum_comma-1.cfg b/tests/config/enum_comma-1.cfg index 33bbdb9d37..b6c19b7253 100644 --- a/tests/config/enum_comma-1.cfg +++ b/tests/config/enum_comma-1.cfg @@ -1,2 +1,2 @@ -pos_comma = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force -pos_enum_comma = trail_force # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_comma = ignore +pos_enum_comma = trail_force diff --git a/tests/config/enum_comma-2.cfg b/tests/config/enum_comma-2.cfg index 4f6d7d0722..45f2aa1dec 100644 --- a/tests/config/enum_comma-2.cfg +++ b/tests/config/enum_comma-2.cfg @@ -1,2 +1,2 @@ -pos_comma = lead_force # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force -pos_enum_comma = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_comma = lead_force +pos_enum_comma = ignore diff --git a/tests/config/enum_comma-3.cfg b/tests/config/enum_comma-3.cfg index 5eec9719c6..dfdb5edf3a 100644 --- a/tests/config/enum_comma-3.cfg +++ b/tests/config/enum_comma-3.cfg @@ -1,2 +1,2 @@ -pos_comma = lead_break # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force -pos_enum_comma = trail_break # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_comma = lead_break +pos_enum_comma = trail_break diff --git a/tests/config/enum_comma-4.cfg b/tests/config/enum_comma-4.cfg index 5cbe21e0d2..1a70fc91ef 100644 --- a/tests/config/enum_comma-4.cfg +++ b/tests/config/enum_comma-4.cfg @@ -1,2 +1,2 @@ -pos_comma = trail_force # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force -pos_enum_comma = lead # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_comma = trail_force +pos_enum_comma = lead diff --git a/tests/config/enum_comma-5.cfg b/tests/config/enum_comma-5.cfg index 5e2e4a768a..cb40392c1c 100644 --- a/tests/config/enum_comma-5.cfg +++ b/tests/config/enum_comma-5.cfg @@ -1,2 +1,2 @@ -pos_comma = trail_break # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force -pos_enum_comma = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_comma = trail_break +pos_enum_comma = ignore diff --git a/tests/config/enum_comma-6.cfg b/tests/config/enum_comma-6.cfg index c38beca22f..912e941306 100644 --- a/tests/config/enum_comma-6.cfg +++ b/tests/config/enum_comma-6.cfg @@ -1,3 +1,3 @@ -pos_comma = trail_break # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force -pos_enum_comma = lead_break # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_comma = trail_break +pos_enum_comma = lead_break sp_after_comma = Force diff --git a/tests/config/freebsd.cfg b/tests/config/freebsd.cfg index ed20b3bd98..8b99c36b10 100644 --- a/tests/config/freebsd.cfg +++ b/tests/config/freebsd.cfg @@ -5,19 +5,19 @@ # # The type of line endings -newlines = lf # auto/lf/crlf/cr +newlines = lf # The original size of tabs in the input -input_tab_size = 8 # number +input_tab_size = 8 # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 8 # number +output_tab_size = 8 # The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # # Indenting @@ -25,1232 +25,1232 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 8 # number +indent_columns = 8 # The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents. # For FreeBSD, this is set to 4. -indent_continue = 4 # number +indent_continue = 4 # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 2 # number +indent_with_tabs = 2 # Whether to indent strings broken by '\' so that they line up -indent_align_string = false # false/true +indent_align_string = false # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # The number of spaces to indent a namespace block -indent_namespace_level = 0 # number +indent_namespace_level = 0 # If the body of the namespace is longer than this number, it won't be indented. # Requires indent_namespace=true. Default=0 (no limit) -indent_namespace_limit = 0 # number +indent_namespace_limit = 0 # Whether the 'extern "C"' body is indented -indent_extern = false # false/true +indent_extern = false # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # Whether to indent the stuff after a leading class colon -indent_class_colon = true # false/true +indent_class_colon = true # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level -indent_else_if = false # false/true +indent_else_if = false # Amount to indent variable declarations after a open brace. neg=relative, pos=absolute -indent_var_def_blk = 0 # number +indent_var_def_blk = 0 # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = false # false/true +indent_func_call_param = false # Same as indent_func_call_param, but for function defs -indent_func_def_param = false # false/true +indent_func_def_param = false # Same as indent_func_call_param, but for function protos -indent_func_proto_param = false # false/true +indent_func_proto_param = false # Same as indent_func_call_param, but for class declarations -indent_func_class_param = false # false/true +indent_func_class_param = false # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = false # false/true +indent_func_ctor_var_param = false # Same as indent_func_call_param, but for templates -indent_template_param = false # false/true +indent_template_param = false # Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true +indent_func_param_double = false # Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 0 # number +indent_func_const = 0 # Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 0 # number +indent_func_throw = 0 # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 0 # number +indent_member = 0 # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = false # false/true +indent_relative_single_line_comments = false # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 0 # number +indent_switch_case = 0 # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 0 # number +indent_case_brace = 0 # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 0 # number +indent_paren_close = 0 # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # Align continued statements at the '='. Default=True # If FALSE or the '=' is followed by a newline, the next line is indent one tab. -indent_align_assign = true # false/true +indent_align_assign = true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. -sp_before_assign = ignore # ignore/add/remove/force +sp_before_assign = ignore # Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. -sp_after_assign = ignore # ignore/add/remove/force +sp_after_assign = ignore # Add or remove space around assignment '=' in enum -sp_enum_assign = ignore # ignore/add/remove/force +sp_enum_assign = ignore # Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_before_assign = ignore # ignore/add/remove/force +sp_enum_before_assign = ignore # Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_after_assign = ignore # ignore/add/remove/force +sp_enum_after_assign = ignore # Add or remove space around preprocessor '##' concatenation operator. Default=Add -sp_pp_concat = add # ignore/add/remove/force +sp_pp_concat = add # Add or remove space after preprocessor '#' stringify operator. Default=Add -sp_pp_stringify = add # ignore/add/remove/force +sp_pp_stringify = add # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force +sp_before_unnamed_ptr_star = ignore # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = ignore # ignore/add/remove/force +sp_after_ptr_star_func = ignore # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = ignore # ignore/add/remove/force +sp_before_ptr_star_func = ignore # Add or remove space before a reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force +sp_before_unnamed_byref = ignore # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = force # ignore/add/remove/force +sp_after_byref = force # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = ignore # ignore/add/remove/force +sp_after_byref_func = ignore # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = ignore # ignore/add/remove/force +sp_before_byref_func = ignore # Add or remove space between type and word. Default=Force -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. -sp_template_angle = ignore # ignore/add/remove/force +sp_template_angle = ignore # Add or remove space before '<>' -sp_before_angle = remove # ignore/add/remove/force +sp_before_angle = remove # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # Add or remove space after '<>' -sp_after_angle = force # ignore/add/remove/force +sp_after_angle = force # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = ignore # ignore/add/remove/force +sp_angle_paren = ignore # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = ignore # ignore/add/remove/force +sp_angle_word = ignore # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # Add or remove space before if-condition ')'. Overrides sp_inside_sparen. -sp_inside_sparen_close = ignore # ignore/add/remove/force +sp_inside_sparen_close = ignore # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = add # ignore/add/remove/force +sp_sparen_brace = add # Add or remove space between 'invariant' and '(' in the D language. -sp_invariant_paren = ignore # ignore/add/remove/force +sp_invariant_paren = ignore # Add or remove space after the ')' in 'invariant (C) c' in the D language. -sp_after_invariant_paren = ignore # ignore/add/remove/force +sp_after_invariant_paren = ignore # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # Add or remove space before ';'. Default=Remove -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = ignore # ignore/add/remove/force +sp_before_semi_for = ignore # Add or remove space before a semicolon of an empty part of a for statement. -sp_before_semi_for_empty = force # ignore/add/remove/force +sp_before_semi_for_empty = force # Add or remove space after ';', except when followed by a comment. Default=Add -sp_after_semi = add # ignore/add/remove/force +sp_after_semi = add # Add or remove space after ';' in non-empty 'for' statements. Default=Force -sp_after_semi_for = force # ignore/add/remove/force +sp_after_semi_for = force # Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; ). -sp_after_semi_for_empty = force # ignore/add/remove/force +sp_after_semi_for_empty = force # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # Add or remove space before the variadic '...' when preceded by a non-punctuator -sp_before_ellipsis = ignore # ignore/add/remove/force +sp_before_ellipsis = ignore # Add or remove space after class ':' -sp_after_class_colon = ignore # ignore/add/remove/force +sp_after_class_colon = ignore # Add or remove space before class ':' -sp_before_class_colon = ignore # ignore/add/remove/force +sp_before_class_colon = ignore # Add or remove space before case ':'. Default=Remove -sp_before_case_colon = remove # ignore/add/remove/force +sp_before_case_colon = remove # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = ignore # ignore/add/remove/force +sp_after_operator_sym = ignore # Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # Add or remove spaces inside cast parens -sp_inside_paren_cast = ignore # ignore/add/remove/force +sp_inside_paren_cast = ignore # Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = ignore # ignore/add/remove/force +sp_cpp_cast_paren = ignore # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = force # ignore/add/remove/force +sp_inside_braces_enum = force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = force # ignore/add/remove/force +sp_inside_braces_struct = force # Add or remove space inside '{' and '}' -sp_inside_braces = force # ignore/add/remove/force +sp_inside_braces = force # Add or remove space inside '{}' -sp_inside_braces_empty = ignore # ignore/add/remove/force +sp_inside_braces_empty = ignore # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = force # ignore/add/remove/force +sp_type_func = force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # Add or remove space inside empty function '()' -sp_inside_fparens = ignore # ignore/add/remove/force +sp_inside_fparens = ignore # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # Add or remove space between ')' and '{' of function -sp_fparen_brace = add # ignore/add/remove/force +sp_fparen_brace = add # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = ignore # ignore/add/remove/force +sp_func_call_user_paren = ignore # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # Add or remove space between 'return' and '(' -sp_return_paren = force # ignore/add/remove/force +sp_return_paren = force # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = ignore # ignore/add/remove/force +sp_defined_paren = ignore # Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = ignore # ignore/add/remove/force +sp_throw_paren = ignore # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = ignore # ignore/add/remove/force +sp_else_brace = ignore # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = force # ignore/add/remove/force +sp_brace_typedef = force # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # Add or remove space before the '::' operator -sp_before_dc = remove # ignore/add/remove/force +sp_before_dc = remove # Add or remove space after the '::' operator -sp_after_dc = remove # ignore/add/remove/force +sp_after_dc = remove # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # Add or remove space after the '!' (not) operator. Default=Remove -sp_not = remove # ignore/add/remove/force +sp_not = remove # Add or remove space after the '~' (invert) operator. Default=Remove -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # Add or remove space after the '&' (address-of) operator. Default=Remove # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # Add or remove space around the '.' or '->' operators. Default=Remove -sp_member = remove # ignore/add/remove/force +sp_member = remove # Add or remove space after the '*' (dereference) operator. Default=Remove # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # Add or remove space before a backslash-newline at the end of a line. Default=Add -sp_before_nl_cont = add # ignore/add/remove/force +sp_before_nl_cont = add # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force +sp_after_oc_scope = ignore # Add or remove space after the colon in message specs # '-(int) f:(int) x;' vs '-(int) f: (int) x;' -sp_after_oc_colon = ignore # ignore/add/remove/force +sp_after_oc_colon = ignore # Add or remove space before the colon in message specs # '-(int) f: (int) x;' vs '-(int) f : (int) x;' -sp_before_oc_colon = ignore # ignore/add/remove/force +sp_before_oc_colon = ignore # Add or remove space after the colon in message specs # '[object setValue:1];' vs '[object setValue: 1];' -sp_after_send_oc_colon = ignore # ignore/add/remove/force +sp_after_send_oc_colon = ignore # Add or remove space before the colon in message specs # '[object setValue:1];' vs '[object setValue :1];' -sp_before_send_oc_colon = ignore # ignore/add/remove/force +sp_before_send_oc_colon = ignore # Add or remove space after the (type) in message specs # '-(int)f: (int) x;' vs '-(int)f: (int)x;' -sp_after_oc_type = ignore # ignore/add/remove/force +sp_after_oc_type = ignore # Add or remove space after the first (type) in message specs # '-(int) f:(int)x;' vs '-(int)f:(int)x;' -sp_after_oc_return_type = ignore # ignore/add/remove/force +sp_after_oc_return_type = ignore # Add or remove space between '@selector' and '(' # '@selector(msgName).' vs '@selector (msgName)' -sp_after_oc_at_sel = ignore # ignore/add/remove/force +sp_after_oc_at_sel = ignore # Add or remove space before a block pointer caret # '^int (int arg){...}' vs. ' ^int (int arg){...}' -sp_before_oc_block_caret = ignore # ignore/add/remove/force +sp_before_oc_block_caret = ignore # Add or remove space after a block pointer caret # '^int (int arg){...}' vs. '^ int (int arg){...}' -sp_after_oc_block_caret = ignore # ignore/add/remove/force +sp_after_oc_block_caret = ignore # Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = ignore # ignore/add/remove/force +sp_cond_colon = ignore # Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = ignore # ignore/add/remove/force +sp_cond_question = ignore # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = remove # ignore/add/remove/force +sp_case_label = remove # Control the space around the D '..' operator. -sp_range = ignore # ignore/add/remove/force +sp_range = ignore # Control the space after the opening of a C++ comment '// A' vs '//A' -sp_cmt_cpp_start = ignore # ignore/add/remove/force +sp_cmt_cpp_start = ignore # Controls the spaces between #else or #endif and a trailing comment -sp_endif_cmt = ignore # ignore/add/remove/force +sp_endif_cmt = ignore # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # Whether to use tabs for aligning -align_with_tabs = false # false/true +align_with_tabs = false # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # Whether to right-align numbers -align_number_right = true # false/true +align_number_right = true # Align variable definitions in prototypes and functions -align_func_params = true # false/true +align_func_params = true # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = false # false/true +align_same_func_call_params = false # The span for aligning variable definitions (0=don't align) -align_var_def_span = 1 # number +align_var_def_span = 1 # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 1 # number +align_var_def_star_style = 1 # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 16 # number +align_var_def_thresh = 16 # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # Whether to align the colon in struct bit fields -align_var_def_colon = true # false/true +align_var_def_colon = true # Whether to align any attribute after the variable name -align_var_def_attribute = false # false/true +align_var_def_attribute = false # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = true # false/true +align_var_def_inline = true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 1 # number +align_assign_span = 1 # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 12 # number +align_assign_thresh = 12 # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 16 # number +align_enum_equ_span = 16 # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # The span for aligning struct/union (0=don't align) -align_var_struct_span = 99 # number +align_var_struct_span = 99 # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 3 # number +align_struct_init_span = 3 # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 3 # number +align_typedef_gap = 3 # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 5 # number +align_typedef_span = 5 # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typedef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typedef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 3 # number +align_right_cmt_span = 3 # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. -align_right_cmt_gap = 0 # number +align_right_cmt_gap = 0 # Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore) -align_right_cmt_at_col = 0 # number +align_right_cmt_at_col = 0 # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # Align function protos on the 'operator' keyword instead of what follows -align_on_operator = false # false/true +align_on_operator = false # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true +align_single_line_func = false # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # The span for aligning ObjC msg spec (0=don't align) -align_oc_msg_spec_span = 0 # number +align_oc_msg_spec_span = 0 # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = true # false/true +align_nl_cont = true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 4 # number +align_pp_define_gap = 4 # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 3 # number +align_pp_define_span = 3 # Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = true # false/true +align_left_shift = true # Span for aligning parameters in an Obj-C message call on the ':' (0=don't align) -align_oc_msg_colon_span = 0 # number +align_oc_msg_colon_span = 0 # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = true # false/true +nl_assign_leave_one_liners = true # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = true # false/true +nl_class_leave_one_liners = true # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = false # false/true +nl_enum_leave_one_liners = false # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # Add or remove newline between '=' and '{' -nl_assign_brace = add # ignore/add/remove/force +nl_assign_brace = add # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = add # ignore/add/remove/force +nl_fcall_brace = add # Add or remove newline between 'enum' and '{' -nl_enum_brace = remove # ignore/add/remove/force +nl_enum_brace = remove # Add or remove newline between 'struct and '{' -nl_struct_brace = remove # ignore/add/remove/force +nl_struct_brace = remove # Add or remove newline between 'union' and '{' -nl_union_brace = remove # ignore/add/remove/force +nl_union_brace = remove # Add or remove newline between 'if' and '{' -nl_if_brace = remove # ignore/add/remove/force +nl_if_brace = remove # Add or remove newline between '}' and 'else' -nl_brace_else = remove # ignore/add/remove/force +nl_brace_else = remove # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = ignore # ignore/add/remove/force +nl_elseif_brace = ignore # Add or remove newline between 'else' and '{' -nl_else_brace = remove # ignore/add/remove/force +nl_else_brace = remove # Add or remove newline between 'else' and 'if' -nl_else_if = remove # ignore/add/remove/force +nl_else_if = remove # Add or remove newline between '}' and 'finally' -nl_brace_finally = ignore # ignore/add/remove/force +nl_brace_finally = ignore # Add or remove newline between 'finally' and '{' -nl_finally_brace = ignore # ignore/add/remove/force +nl_finally_brace = ignore # Add or remove newline between 'try' and '{' -nl_try_brace = ignore # ignore/add/remove/force +nl_try_brace = ignore # Add or remove newline between get/set and '{' -nl_getset_brace = force # ignore/add/remove/force +nl_getset_brace = force # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # Add or remove newline between 'catch' and '{' -nl_catch_brace = ignore # ignore/add/remove/force +nl_catch_brace = ignore # Add or remove newline between '}' and 'catch' -nl_brace_catch = ignore # ignore/add/remove/force +nl_brace_catch = ignore # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # Add or remove newline between two open or close braces. # Due to general newline/brace handling, REMOVE may not work. -nl_brace_brace = ignore # ignore/add/remove/force +nl_brace_brace = ignore # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = true # false/true +nl_multi_line_define = true # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # Add or remove newline between ')' and 'throw' -nl_before_throw = ignore # ignore/add/remove/force +nl_before_throw = ignore # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # Newline between namespace and { -nl_namespace_brace = ignore # ignore/add/remove/force +nl_namespace_brace = ignore # Add or remove newline between 'template<>' and whatever follows. -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # Add or remove newline between return type and function name in a function definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # Add or remove newline between return type and function name inside a class {} # Uses nl_func_type_name or nl_func_proto_type_name if set to ignore. -nl_func_type_name_class = ignore # ignore/add/remove/force +nl_func_type_name_class = ignore # Add or remove newline between function scope and name in a definition # Controls the newline after '::' in 'void A::f() { }' -nl_func_scope_name = ignore # ignore/add/remove/force +nl_func_scope_name = ignore # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = ignore # ignore/add/remove/force +nl_func_proto_type_name = ignore # Add or remove newline between a function name and the opening '(' -nl_func_paren = remove # ignore/add/remove/force +nl_func_paren = remove # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # Add or remove newline between '()' in a function declaration. -nl_func_decl_empty = ignore # ignore/add/remove/force +nl_func_decl_empty = ignore # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # Whether to put a newline after 'return' statement -nl_after_return = true # false/true +nl_after_return = true # Add or remove a newline between the return keyword and return expression. -nl_return_expr = ignore # ignore/add/remove/force +nl_return_expr = ignore # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = true # false/true +nl_after_brace_open = true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true +nl_after_brace_open_cmt = false # Whether to put a newline after a virtual brace open. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = false # false/true +nl_after_vbrace_open = false # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. -nl_after_brace_close = true # false/true +nl_after_brace_close = true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = true # false/true +nl_squeeze_ifdef = true # Add or remove newline before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # Add or remove newline after 'if' -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # Add or remove newline before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # Add or remove newline after 'for' -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # Add or remove newline before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # Add or remove newline after 'while' -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # Add or remove newline before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # Add or remove newline after 'switch' -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # Add or remove newline before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # Add or remove newline after 'do' -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # Whether to double-space before the close brace of a struct/union/enum -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # # Positioning options # # The position of arithmetic operators in wrapped expressions -pos_arith = trail # ignore/lead/trail +pos_arith = trail # The position of assignment in wrapped expressions -pos_assign = ignore # ignore/lead/trail +pos_assign = ignore # The position of boolean operators in wrapped expressions -pos_bool = trail # ignore/lead/trail +pos_bool = trail # The position of comparison operators in wrapped expressions -pos_compare = ignore # ignore/lead/trail +pos_compare = ignore # The position of conditional (b ? t : f) operators in wrapped expressions -pos_conditional = ignore # ignore/lead/trail +pos_conditional = ignore # The position of the comma in wrapped expressions -pos_comma = ignore # ignore/lead/trail +pos_comma = ignore # The position of the comma in the constructor initialization list -pos_class_comma = ignore # ignore/lead/trail +pos_class_comma = ignore # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true +ls_for_split_full = false # Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true +ls_func_split_full = false # # Blank line options # # The maximum consecutive newlines -nl_max = 4 # number +nl_max = 4 # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 3 # number +nl_after_func_body = 3 # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 0 # number +nl_after_func_body_one_liner = 0 # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # Whether to force a newline after a mulit-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 0 # number +nl_before_access_spec = 0 # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # The number of newlines between a function def and the function comment. # 0 = No change. -nl_comment_func_def = 1 # number +nl_comment_func_def = 1 # The number of newlines after a try-catch-finally block that isn't followed by a brace close. # 0 = No change. -nl_after_try_catch_finally = 0 # number +nl_after_try_catch_finally = 0 # The number of newlines before and after a property, indexer or event decl. # 0 = No change. -nl_around_cs_property = 0 # number +nl_around_cs_property = 0 # The number of newlines between the get/set/add/remove handlers in C#. # 0 = No change. -nl_between_get_set = 0 # number +nl_between_get_set = 0 # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # Add or remove braces on single-line function definitions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if. # If any must be braced, they are all braced. If all can be unbraced, then the braces are removed. -mod_full_brace_if_chain = false # false/true +mod_full_brace_if_chain = false # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = add # ignore/add/remove/force +mod_paren_on_return = add # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = true # false/true +mod_full_paren_if_bool = true # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = true # false/true +mod_remove_extra_semicolon = true # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 0 # number +mod_add_long_function_closebrace_comment = 0 # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number +mod_add_long_switch_closebrace_comment = 0 # If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after # the #else, a comment will be added. -mod_add_long_ifdef_endif_comment = 0 # number +mod_add_long_ifdef_endif_comment = 0 # If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after # the #endif, a comment will be added. -mod_add_long_ifdef_else_comment = 0 # number +mod_add_long_ifdef_else_comment = 0 # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = false # false/true +mod_move_case_break = false # Will add or remove the braces around a fully braced case statement. # Will only remove the braces if there are no variable declarations in the block. -mod_case_brace = remove # ignore/add/remove/force +mod_case_brace = remove # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = true # false/true +mod_remove_empty_return = true # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # Set the comment reflow mode (default: 0) # 0: no reflowing (apart from the line wrapping due to cmt_width) # 1: no touching at all # 2: full reflow -cmt_reflow_mode = 0 # number +cmt_reflow_mode = 0 # If false, disable all multi-line comment changes, including cmt_width and leading chars. # Default is true. -cmt_indent_multi = true # false/true +cmt_indent_multi = true # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # Whether to put a star on subsequent comment lines -cmt_star_cont = true # false/true +cmt_star_cont = true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_footer = "" # string +cmt_insert_file_footer = "" # The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment. # Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment. # Will substitute $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true +cmt_insert_before_preproc = false # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = remove # ignore/add/remove/force +pp_indent = remove # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. -pp_indent_count = 1 # number +pp_indent_count = 1 # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true +pp_if_indent_code = false # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/func-def-1.cfg b/tests/config/func-def-1.cfg index 565483abd7..03ef889793 100644 --- a/tests/config/func-def-1.cfg +++ b/tests/config/func-def-1.cfg @@ -2,9 +2,9 @@ # My favorite format # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 3 indent_columns = output_tab_size nl_func_decl_start = Add # newline after the '(' in a function decl diff --git a/tests/config/func-def-2.cfg b/tests/config/func-def-2.cfg index 244507338b..eabdbbdecf 100644 --- a/tests/config/func-def-2.cfg +++ b/tests/config/func-def-2.cfg @@ -2,9 +2,9 @@ # My favorite format # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 3 indent_columns = output_tab_size nl_func_decl_start = Ignore # newline after the '(' in a function decl diff --git a/tests/config/func-def-3.cfg b/tests/config/func-def-3.cfg index a4a3e0aff4..93e047fc5d 100644 --- a/tests/config/func-def-3.cfg +++ b/tests/config/func-def-3.cfg @@ -2,9 +2,9 @@ # My favorite format # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 3 indent_columns = output_tab_size # everything on one line (TODO: line length checks) diff --git a/tests/config/func_call_user.cfg b/tests/config/func_call_user.cfg index 5a041b040a..6195c52fa1 100644 --- a/tests/config/func_call_user.cfg +++ b/tests/config/func_call_user.cfg @@ -3,19 +3,19 @@ # # The type of line endings -newlines = auto # auto/lf/crlf/cr +newlines = auto # The original size of tabs in the input -input_tab_size = 4 # number +input_tab_size = 4 # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 4 # number +output_tab_size = 4 # The ascii value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # # Indenting @@ -23,897 +23,897 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 4 # number +indent_columns = 4 # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # Whether the 'class' body is indented -indent_class = false # false/true +indent_class = false # Whether to indent the stuff after a leading class colon -indent_class_colon = false # false/true +indent_class_colon = false # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = false # false/true +indent_func_call_param = false # Same as indent_func_call_param, but for function defs -indent_func_def_param = false # false/true +indent_func_def_param = false # Same as indent_func_call_param, but for function protos -indent_func_proto_param = false # false/true +indent_func_proto_param = false # Same as indent_func_call_param, but for class declarations -indent_func_class_param = false # false/true +indent_func_class_param = false # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = false # false/true +indent_func_ctor_var_param = false # Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true +indent_func_param_double = false # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 4 # number +indent_member = 4 # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 4 # number +indent_switch_case = 4 # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 4 # number +indent_case_shift = 4 # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 4 # number +indent_case_brace = 4 # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 1 # number +indent_paren_close = 1 # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # Add or remove space inside '(' and ')' -sp_inside_paren = ignore # ignore/add/remove/force +sp_inside_paren = ignore # Add or remove space between nested parens -sp_paren_paren = force # ignore/add/remove/force +sp_paren_paren = force # Whether to balance spaces inside nested parens -sp_balance_nested_parens = true # false/true +sp_balance_nested_parens = true # Add or remove space between ')' and '{' -sp_paren_brace = remove # ignore/add/remove/force +sp_paren_brace = remove # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # Add or remove space before reference sign '&' -sp_before_byref = force # ignore/add/remove/force +sp_before_byref = force # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = remove # ignore/add/remove/force +sp_after_byref = remove # Add or remove space before '<>' -sp_before_angle = force # ignore/add/remove/force +sp_before_angle = force # Add or remove space after '<>' -sp_after_angle = force # ignore/add/remove/force +sp_after_angle = force # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = remove # ignore/add/remove/force +sp_angle_paren = remove sp_angle_paren_empty = remove # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = force # ignore/add/remove/force +sp_angle_word = force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = remove # ignore/add/remove/force +sp_after_sparen = remove # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = remove # ignore/add/remove/force +sp_sparen_brace = remove # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = force # ignore/add/remove/force +sp_special_semi = force # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = force # ignore/add/remove/force +sp_before_semi_for = force # Add or remove space before a semicolon of an empty part of a for statment. -sp_before_semi_for_empty = force # ignore/add/remove/force +sp_before_semi_for_empty = force # Add or remove space after the final semicolon of an empty part of a for statment: for ( ; ; ). -sp_after_semi_for_empty = force # ignore/add/remove/force +sp_after_semi_for_empty = force # Add or remove space before '[' (except '[]') -sp_before_square = remove # ignore/add/remove/force +sp_before_square = remove # Add or remove space before '[]' -sp_before_squares = remove # ignore/add/remove/force +sp_before_squares = remove # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # Add or remove space between 'operator' and operator sign -sp_after_operator = force # ignore/add/remove/force +sp_after_operator = force # Add or remove space after cast -sp_after_cast = force # ignore/add/remove/force +sp_after_cast = force # Add or remove spaces inside cast parens -sp_inside_paren_cast = remove # ignore/add/remove/force +sp_inside_paren_cast = remove # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = force # ignore/add/remove/force +sp_inside_braces_enum = force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = remove # ignore/add/remove/force +sp_inside_braces_struct = remove # Add or remove space inside '{' and '}' -sp_inside_braces = force # ignore/add/remove/force +sp_inside_braces = force # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = remove # ignore/add/remove/force +sp_type_func = remove # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = remove # ignore/add/remove/force +sp_square_fparen = remove # Add or remove space between ')' and '{' of function -sp_fparen_brace = remove # ignore/add/remove/force +sp_fparen_brace = remove # Add or remove space between function name and '(' on function calls -sp_func_call_paren = force # ignore/add/remove/force -sp_func_call_user_paren = remove # ignore/add/remove/force +sp_func_call_paren = force +sp_func_call_user_paren = remove set func_call_user _ N_ # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = ignore # ignore/add/remove/force +sp_func_class_paren = ignore # Add or remove space between 'return' and '(' -sp_return_paren = force # ignore/add/remove/force +sp_return_paren = force # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = force # ignore/add/remove/force +sp_attribute_paren = force # Add or remove space between macro and value -sp_macro = force # ignore/add/remove/force +sp_macro = force # Add or remove space between macro function ')' and value -sp_macro_func = force # ignore/add/remove/force +sp_macro_func = force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = ignore # ignore/add/remove/force +sp_else_brace = ignore # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # Add or remove space before the '::' operator -sp_before_dc = remove # ignore/add/remove/force +sp_before_dc = remove # Add or remove space after the '::' operator -sp_after_dc = remove # ignore/add/remove/force +sp_after_dc = remove # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # Add or remove space after the '!' (not) operator. -sp_not = remove # ignore/add/remove/force +sp_not = remove # Add or remove space after the '~' (invert) operator. -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # Add or remove space after the '&' (address-of) operator. # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # Add or remove space around the '.' or '->' operators -sp_member = remove # ignore/add/remove/force +sp_member = remove # Add or remove space after the '*' (dereference) operator. # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7' -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;' -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force +sp_after_oc_scope = ignore # Add or remove space after the colon in message specs # '-(int) f: (int) x;' vs '+(int) f : (int) x;' -sp_before_oc_colon = force # ignore/add/remove/force +sp_before_oc_colon = force # Add or remove space after the (type) in message specs # '-(int) f: (int) x;' vs '+(int)f : (int)x;' -sp_after_oc_type = force # ignore/add/remove/force +sp_after_oc_type = force # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # Align variable definitions in prototypes and functions -align_func_params = true # false/true +align_func_params = true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 20 # number +align_var_def_span = 20 # How to align the star in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_star_style = 0 # number +align_var_def_star_style = 0 # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = true # false/true +align_var_def_inline = true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 1 # number +align_assign_span = 1 # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 30 # number +align_assign_thresh = 30 # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 10 # number +align_enum_equ_span = 10 # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 12 # number +align_enum_equ_thresh = 12 # The span for aligning struct/union (0=don't align) -align_var_struct_span = 30 # number +align_var_struct_span = 30 # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 30 # number +align_var_struct_thresh = 30 # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 8 # number +align_struct_init_span = 8 # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 4 # number +align_typedef_gap = 4 # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 5 # number +align_typedef_span = 5 # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 2 # number +align_typedef_star_style = 2 # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typdef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 2 # number +align_typedef_amp_style = 2 # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 3 # number +align_right_cmt_span = 3 # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 3 # number +align_func_proto_span = 3 # The span for aligning function prototypes (0=don't align) -align_oc_msg_spec_span = 3 # number +align_oc_msg_spec_span = 3 # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = true # false/true +align_nl_cont = true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 2 # number +align_pp_define_gap = 2 # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 50 # number +align_pp_define_span = 50 # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = false # false/true +nl_assign_leave_one_liners = false # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = false # false/true +nl_class_leave_one_liners = false # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = false # false/true +nl_enum_leave_one_liners = false # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # Add or remove newline between '=' and '{' -nl_assign_brace = force # ignore/add/remove/force +nl_assign_brace = force # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = force # ignore/add/remove/force +nl_fcall_brace = force # Add or remove newline between 'enum' and '{' -nl_enum_brace = add # ignore/add/remove/force +nl_enum_brace = add # Add or remove newline between 'struct and '{' -nl_struct_brace = add # ignore/add/remove/force +nl_struct_brace = add # Add or remove newline between 'union' and '{' -nl_union_brace = add # ignore/add/remove/force +nl_union_brace = add # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = add # ignore/add/remove/force +nl_elseif_brace = add # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # Add or remove newline between '}' and 'finally' -nl_brace_finally = ignore # ignore/add/remove/force +nl_brace_finally = ignore # Add or remove newline between 'finally' and '{' -nl_finally_brace = ignore # ignore/add/remove/force +nl_finally_brace = ignore # Add or remove newline between 'try' and '{' -nl_try_brace = ignore # ignore/add/remove/force +nl_try_brace = ignore # Add or remove newline between get/set and '{' -nl_getset_brace = ignore # ignore/add/remove/force +nl_getset_brace = ignore # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # Add or remove newline between 'catch' and '{' -nl_catch_brace = ignore # ignore/add/remove/force +nl_catch_brace = ignore # Add or remove newline between '}' and 'catch' -nl_brace_catch = ignore # ignore/add/remove/force +nl_brace_catch = ignore # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = add # ignore/add/remove/force +nl_brace_while = add # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # Add or remove newline when condition spans two or more lines -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = true # false/true +nl_multi_line_define = true # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # Whether to put a newline after 'case' statement -nl_after_case = false # false/true +nl_after_case = false # Newline between namespace and { -nl_namespace_brace = add # ignore/add/remove/force +nl_namespace_brace = add # Add or remove newline between 'template<>' and 'class' -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # Add or remove newline between return type and function name in definition -nl_func_type_name = remove # ignore/add/remove/force +nl_func_type_name = remove # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = remove # ignore/add/remove/force +nl_func_proto_type_name = remove # Add or remove newline between a function name and the opening '(' -nl_func_paren = remove # ignore/add/remove/force +nl_func_paren = remove # Add or remove newline after '(' in a function declaration -nl_func_decl_start = remove # ignore/add/remove/force +nl_func_decl_start = remove # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # Whether to put a newline after 'return' statement -nl_after_return = true # false/true +nl_after_return = true # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = true # false/true +nl_after_brace_open = true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = true # false/true +nl_after_brace_open_cmt = true # Whether to put a newline after a virtual brace open. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = true # false/true +nl_after_vbrace_open = true # Whether to alter newlines in '#define' macros -nl_define_macro = true # false/true +nl_define_macro = true # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true +nl_squeeze_ifdef = false # Add or remove newline before 'if' -nl_before_if = add # ignore/add/remove/force +nl_before_if = add # Add or remove newline after 'if' -nl_after_if = add # ignore/add/remove/force +nl_after_if = add # Add or remove newline before 'for' -nl_before_for = add # ignore/add/remove/force +nl_before_for = add # Add or remove newline after 'for' -nl_after_for = add # ignore/add/remove/force +nl_after_for = add # Add or remove newline before 'while' -nl_before_while = add # ignore/add/remove/force +nl_before_while = add # Add or remove newline after 'while' -nl_after_while = add # ignore/add/remove/force +nl_after_while = add # Add or remove newline before 'switch' -nl_before_switch = add # ignore/add/remove/force +nl_before_switch = add # Add or remove newline after 'switch' -nl_after_switch = add # ignore/add/remove/force +nl_after_switch = add # Add or remove newline before 'do' -nl_before_do = add # ignore/add/remove/force +nl_before_do = add # Add or remove newline after 'do' -nl_after_do = add # ignore/add/remove/force +nl_after_do = add # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = true # false/true +nl_ds_struct_enum_cmt = true # Whether to double-space before the close brace of a struct/union/enum -nl_ds_struct_enum_close_brace = true # false/true +nl_ds_struct_enum_close_brace = true # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # # Positioning options # # The position of boolean operators in wrapped expressions -pos_bool = ignore # ignore/lead/trail +pos_bool = ignore # The position of the comma in wrapped expressions -pos_comma = trail # ignore/lead/trail +pos_comma = trail # The position of the comma in the constructor initialization list -pos_class_comma = ignore # ignore/lead/trail +pos_class_comma = ignore # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 80 # number +code_width = 80 # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = true # false/true +ls_for_split_full = true # Whether to fully split long function protos/calls at commas -ls_func_split_full = true # false/true +ls_func_split_full = true # # Blank line options # # The maximum consecutive newlines -nl_max = 3 # number +nl_max = 3 # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 1 # number +nl_after_func_proto = 1 # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 3 # number +nl_after_func_proto_group = 3 # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 5 # number +nl_after_func_body = 5 # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 5 # number +nl_after_func_body_one_liner = 5 # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 1 # number +nl_before_block_comment = 1 # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 1 # number +nl_before_c_comment = 1 # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 1 # number +nl_before_cpp_comment = 1 # Whether to force a newline after a mulit-line comment. -nl_after_multiline_comment = true # false/true +nl_after_multiline_comment = true # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 0 # number +nl_before_access_spec = 0 # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = false # false/true +eat_blanks_before_close_brace = false # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = add # ignore/add/remove/force +mod_full_brace_function = add # Add or remove braces on single-line 'if' statement -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 1 # number +mod_full_brace_nl = 1 # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = remove # ignore/add/remove/force +mod_paren_on_return = remove # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = false # false/true +mod_full_paren_if_bool = false # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = true # false/true +mod_remove_extra_semicolon = true # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 1 # number +mod_add_long_function_closebrace_comment = 1 # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 10 # number +mod_add_long_switch_closebrace_comment = 10 # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # # Comment modifications # # Try to wrap comments at cmt_witdth columns -cmt_width = 80 # number +cmt_width = 80 # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = true # false/true +cmt_cpp_to_c = true # Whether to put a star on subsequent comment lines -cmt_star_cont = true # false/true +cmt_star_cont = true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 1 # number +cmt_sp_before_star_cont = 1 # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitue $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # The filename that contains text to insert before a function implementation if the function isn't preceeded with a C/C++ comment. # Will substitue $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # The filename that contains text to insert before a class if the class isn't preceeded with a C/C++ comment. # Will substitue $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = remove # ignore/add/remove/force +pp_indent = remove # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true +pp_if_indent_code = false # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/getset.cfg b/tests/config/getset.cfg index 69ca3e3167..6ecbd3ca16 100644 --- a/tests/config/getset.cfg +++ b/tests/config/getset.cfg @@ -2,28 +2,28 @@ # Mono library format # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 8 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 8 indent_columns = output_tab_size -indent_label = 1 # pos: absolute col, neg: relative column +indent_label = 1 # indent_align_string = False # align broken strings # brace_indent = 0 indent_func_call_param = true # use indent tabstop -nl_enum_brace = remove # "enum {" vs "enum \n {" -nl_union_brace = remove # "union {" vs "union \n {" -nl_struct_brace = remove # "struct {" vs "struct \n {" -nl_do_brace = remove # "do {" vs "do \n {" -nl_if_brace = remove # "if () {" vs "if () \n {" -nl_for_brace = remove # "for () {" vs "for () \n {" -nl_else_brace = remove # "else {" vs "else \n {" -nl_while_brace = remove # "while () {" vs "while () \n {" -nl_switch_brace = remove # "switch () {" vs "switch () \n {" +nl_enum_brace = remove +nl_union_brace = remove +nl_struct_brace = remove +nl_do_brace = remove +nl_if_brace = remove +nl_for_brace = remove +nl_else_brace = remove +nl_while_brace = remove +nl_switch_brace = remove nl_func_var_def_blk = 1 nl_before_case = 1 -nl_fcall_brace = remove # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_fcall_brace = remove +nl_fdef_brace = add # nl_after_return = TRUE nl_brace_while = remove nl_brace_else = add @@ -36,15 +36,15 @@ nl_squeeze_ifdef = TRUE # mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" sp_before_semi = remove -sp_paren_paren = remove # space between (( and )) -sp_return_paren = remove # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_paren_paren = remove +sp_return_paren = remove +sp_sizeof_paren = remove +sp_before_sparen = force +sp_after_sparen = force +sp_after_cast = remove +sp_inside_braces = force +sp_inside_braces_struct = force +sp_inside_braces_enum = force sp_inside_paren = remove sp_inside_fparen = remove sp_inside_sparen = remove @@ -57,9 +57,9 @@ sp_bool = force sp_compare = force sp_assign = force sp_after_comma = force -sp_func_def_paren = force # "int foo (){" vs "int foo(){" -sp_func_call_paren = force # "foo (" vs "foo(" -sp_func_proto_paren = force # "int foo ();" vs "int foo();" +sp_func_def_paren = force +sp_func_call_paren = force +sp_func_proto_paren = force # align_with_tabs = FALSE # use tabs to align # align_on_tabstop = FALSE # align on tabstops diff --git a/tests/config/gh293.a.cfg b/tests/config/gh293.a.cfg index 34ec121ed2..f346b4473c 100644 --- a/tests/config/gh293.a.cfg +++ b/tests/config/gh293.a.cfg @@ -2,10 +2,10 @@ # uncrustify config file for objective-c and objective-c++ # -indent_with_tabs = 2 # 1=indent to level only, 2=indent with tabs -output_tab_size = 4 # new tab size +indent_with_tabs = 2 +output_tab_size = 4 indent_columns = output_tab_size -indent_label = 2 # pos : absolute col, neg : relative column +indent_label = 2 indent_align_assign = FALSE indent_oc_block = true indent_oc_block_msg_xcode_style = false @@ -25,45 +25,45 @@ indent_switch_case = indent_columns # Inter -symbol newlines # -nl_enum_brace = remove # "enum {" vs "enum \n {" -nl_union_brace = remove # "union {" vs "union \n {" -nl_struct_brace = remove # "struct {" vs "struct \n {" -nl_do_brace = remove # "do {" vs "do \n {" -nl_if_brace = remove # "if () {" vs "if () \n {" -nl_for_brace = remove # "for () {" vs "for () \n {" -nl_else_brace = remove # "else {" vs "else \n {" -nl_while_brace = remove # "while () {" vs "while () \n {" -nl_switch_brace = remove # "switch () {" vs "switch () \n {" -nl_brace_while = add # "} while" vs "} \n while" - cuddle while -nl_brace_else = add # "} else" vs "} \n else" - cuddle else +nl_enum_brace = remove +nl_union_brace = remove +nl_struct_brace = remove +nl_do_brace = remove +nl_if_brace = remove +nl_for_brace = remove +nl_else_brace = remove +nl_while_brace = remove +nl_switch_brace = remove +nl_brace_while = add +nl_brace_else = add nl_func_var_def_blk = 1 # add new lines after a block of variable decls -nl_fcall_brace = add # "list_for_each() {" vs "list_for_each()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_fcall_brace = add +nl_fdef_brace = add nl_after_return = false #nl_before_case = true #ml_after_case = true # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = true # false/true +nl_multi_line_define = true # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = true # false/true +nl_multi_line_cond = true # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 2 # number +nl_after_func_body_one_liner = 2 # # Source code modifications # -mod_paren_on_return = ignore # "return 1;" vs "return (1);" -mod_full_brace_if = force # "if (a) a--;" vs "if (a) { a--; }" -mod_full_brace_for = force # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = force # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = force # "while (a) a--;" vs "while (a) { a--; }" -mod_full_brace_nl = 3 # don 't remove if more than 3 newlines +mod_paren_on_return = ignore +mod_full_brace_if = force +mod_full_brace_for = force +mod_full_brace_do = force +mod_full_brace_while = force +mod_full_brace_nl = 3 mod_add_long_ifdef_endif_comment = 20 mod_add_long_ifdef_else_comment = mod_add_long_ifdef_else_comment mod_add_long_switch_closebrace_comment = mod_add_long_ifdef_else_comment @@ -74,27 +74,27 @@ mod_add_long_function_closebrace_comment = mod_add_long_ifdef_else_comment # # sp_return_paren = force # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = add # "{ 1 }" vs "{1}" -sp_inside_braces_struct = add # "{ 1 }" vs "{1}" -sp_inside_braces_enum = add # "{ 1 }" vs "{1}" -sp_inside_fparen = remove # "func( param )" vs "func(param)" +sp_sizeof_paren = remove +sp_before_sparen = force +sp_after_sparen = force +sp_after_cast = remove +sp_inside_braces = add +sp_inside_braces_struct = add +sp_inside_braces_enum = add +sp_inside_fparen = remove sp_inside_sparen = remove sp_paren_brace = force # Add or remove space between ') ' and ' {' of function -sp_fparen_brace = force # ignore/add/remove/force +sp_fparen_brace = force sp_assign = add sp_arith = add sp_bool = add sp_compare = add sp_assign = add sp_after_comma = add -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_func_def_paren = remove +sp_func_call_paren = remove +sp_func_proto_paren = remove sp_before_ptr_star = force sp_after_ptr_star = remove sp_before_unnamed_ptr_star = ignore @@ -128,8 +128,8 @@ sp_after_oc_block_caret = remove # Aligning stuff # -align_with_tabs = False # use tabs to align -align_on_tabstop = False # align on tabstops +align_with_tabs = False +align_on_tabstop = False # align_keep_tabs = True align_enum_equ_span = 4 # '=' in enum definition # align_nl_cont = True @@ -146,7 +146,7 @@ align_typedef_span = 5 align_typedef_gap = 3 # Objective-C specifics align_oc_msg_colon_span = 10 # align parameters in an Obj-C message on the ' : ' but stop after this many lines (0=don't align) -align_oc_msg_spec_span = 0 # the span for aligning ObjC msg spec (0=don 't align) +align_oc_msg_spec_span = 0 align_oc_decl_colon = true # # Line Splitting options @@ -158,7 +158,7 @@ align_oc_decl_colon = true # Comment modifications # -cmt_star_cont = True # Whether to put a star on subsequent comment lines +cmt_star_cont = True eat_blanks_before_close_brace = TRUE diff --git a/tests/config/gh293.b.cfg b/tests/config/gh293.b.cfg index 39da5d40b6..8b0295815e 100644 --- a/tests/config/gh293.b.cfg +++ b/tests/config/gh293.b.cfg @@ -2,10 +2,10 @@ # uncrustify config file for objective-c and objective-c++ # -indent_with_tabs = 2 # 1=indent to level only, 2=indent with tabs -output_tab_size = 4 # new tab size +indent_with_tabs = 2 +output_tab_size = 4 indent_columns = output_tab_size -indent_label = 2 # pos : absolute col, neg : relative column +indent_label = 2 indent_align_assign = FALSE indent_oc_block = true indent_oc_block_msg_xcode_style = false @@ -25,45 +25,45 @@ indent_switch_case = indent_columns # Inter -symbol newlines # -nl_enum_brace = remove # "enum {" vs "enum \n {" -nl_union_brace = remove # "union {" vs "union \n {" -nl_struct_brace = remove # "struct {" vs "struct \n {" -nl_do_brace = remove # "do {" vs "do \n {" -nl_if_brace = remove # "if () {" vs "if () \n {" -nl_for_brace = remove # "for () {" vs "for () \n {" -nl_else_brace = remove # "else {" vs "else \n {" -nl_while_brace = remove # "while () {" vs "while () \n {" -nl_switch_brace = remove # "switch () {" vs "switch () \n {" -nl_brace_while = add # "} while" vs "} \n while" - cuddle while -nl_brace_else = add # "} else" vs "} \n else" - cuddle else +nl_enum_brace = remove +nl_union_brace = remove +nl_struct_brace = remove +nl_do_brace = remove +nl_if_brace = remove +nl_for_brace = remove +nl_else_brace = remove +nl_while_brace = remove +nl_switch_brace = remove +nl_brace_while = add +nl_brace_else = add nl_func_var_def_blk = 1 # add new lines after a block of variable decls -nl_fcall_brace = add # "list_for_each() {" vs "list_for_each()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_fcall_brace = add +nl_fdef_brace = add nl_after_return = false #nl_before_case = true #ml_after_case = true # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = true # false/true +nl_multi_line_define = true # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = true # false/true +nl_multi_line_cond = true # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 2 # number +nl_after_func_body_one_liner = 2 # # Source code modifications # -mod_paren_on_return = ignore # "return 1;" vs "return (1);" -mod_full_brace_if = force # "if (a) a--;" vs "if (a) { a--; }" -mod_full_brace_for = force # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = force # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = force # "while (a) a--;" vs "while (a) { a--; }" -mod_full_brace_nl = 3 # don 't remove if more than 3 newlines +mod_paren_on_return = ignore +mod_full_brace_if = force +mod_full_brace_for = force +mod_full_brace_do = force +mod_full_brace_while = force +mod_full_brace_nl = 3 mod_add_long_ifdef_endif_comment = 20 mod_add_long_ifdef_else_comment = mod_add_long_ifdef_else_comment mod_add_long_switch_closebrace_comment = mod_add_long_ifdef_else_comment @@ -74,27 +74,27 @@ mod_add_long_function_closebrace_comment = mod_add_long_ifdef_else_comment # # sp_return_paren = force # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = add # "{ 1 }" vs "{1}" -sp_inside_braces_struct = add # "{ 1 }" vs "{1}" -sp_inside_braces_enum = add # "{ 1 }" vs "{1}" -sp_inside_fparen = remove # "func( param )" vs "func(param)" +sp_sizeof_paren = remove +sp_before_sparen = force +sp_after_sparen = force +sp_after_cast = remove +sp_inside_braces = add +sp_inside_braces_struct = add +sp_inside_braces_enum = add +sp_inside_fparen = remove sp_inside_sparen = remove sp_paren_brace = force # Add or remove space between ') ' and ' {' of function -sp_fparen_brace = force # ignore/add/remove/force +sp_fparen_brace = force sp_assign = add sp_arith = add sp_bool = add sp_compare = add sp_assign = add sp_after_comma = add -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_func_def_paren = remove +sp_func_call_paren = remove +sp_func_proto_paren = remove sp_before_ptr_star = force sp_after_ptr_star = remove sp_before_unnamed_ptr_star = ignore @@ -128,8 +128,8 @@ sp_after_oc_block_caret = remove # Aligning stuff # -align_with_tabs = False # use tabs to align -align_on_tabstop = False # align on tabstops +align_with_tabs = False +align_on_tabstop = False # align_keep_tabs = True align_enum_equ_span = 4 # '=' in enum definition # align_nl_cont = True @@ -146,7 +146,7 @@ align_typedef_span = 5 align_typedef_gap = 3 # Objective-C specifics align_oc_msg_colon_span = 10 # align parameters in an Obj-C message on the ' : ' but stop after this many lines (0=don't align) -align_oc_msg_spec_span = 0 # the span for aligning ObjC msg spec (0=don 't align) +align_oc_msg_spec_span = 0 align_oc_decl_colon = true # # Line Splitting options @@ -158,7 +158,7 @@ align_oc_decl_colon = true # Comment modifications # -cmt_star_cont = True # Whether to put a star on subsequent comment lines +cmt_star_cont = True eat_blanks_before_close_brace = TRUE diff --git a/tests/config/if_chain.cfg b/tests/config/if_chain.cfg index 6494322b14..d07b6a4086 100644 --- a/tests/config/if_chain.cfg +++ b/tests/config/if_chain.cfg @@ -4,34 +4,34 @@ # $Id: linux.cfg 488 2006-09-09 12:44:38Z bengardner $ # -indent_with_tabs = 2 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 8 # new tab size +indent_with_tabs = 2 +input_tab_size = 8 +output_tab_size = 8 indent_columns = output_tab_size -indent_label = 2 # pos: absolute col, neg: relative column +indent_label = 2 # # inter-symbol newlines # -nl_enum_brace = remove # "enum {" vs "enum \n {" -nl_union_brace = remove # "union {" vs "union \n {" -nl_struct_brace = remove # "struct {" vs "struct \n {" -nl_do_brace = remove # "do {" vs "do \n {" -nl_if_brace = remove # "if () {" vs "if () \n {" -nl_for_brace = remove # "for () {" vs "for () \n {" -nl_else_brace = remove # "else {" vs "else \n {" -nl_while_brace = remove # "while () {" vs "while () \n {" -nl_switch_brace = remove # "switch () {" vs "switch () \n {" -nl_brace_while = remove # "} while" vs "} \n while" - cuddle while -nl_brace_else = remove # "} else" vs "} \n else" - cuddle else +nl_enum_brace = remove +nl_union_brace = remove +nl_struct_brace = remove +nl_do_brace = remove +nl_if_brace = remove +nl_for_brace = remove +nl_else_brace = remove +nl_while_brace = remove +nl_switch_brace = remove +nl_brace_while = remove +nl_brace_else = remove sp_brace_else = force sp_else_brace = force nl_func_var_def_blk = 1 -nl_fcall_brace = remove # "list_for_each() {" vs "list_for_each()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_fcall_brace = remove +nl_fdef_brace = add # nl_after_return = TRUE; # nl_before_case = 1 @@ -40,13 +40,13 @@ nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" # Source code modifications # -mod_paren_on_return = remove # "return 1;" vs "return (1);" +mod_paren_on_return = remove #mod_full_brace_if = remove # "if (a) a--;" vs "if (a) { a--; }" mod_full_brace_if_chain = true -mod_full_brace_for = remove # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = remove # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = remove # "while (a) a--;" vs "while (a) { a--; }" -mod_full_brace_nl = 3 # don't remove if more than 3 newlines +mod_full_brace_for = remove +mod_full_brace_do = remove +mod_full_brace_while = remove +mod_full_brace_nl = 3 # @@ -54,30 +54,30 @@ mod_full_brace_nl = 3 # don't remove if more than 3 newlines # # sp_return_paren = force # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_sizeof_paren = remove +sp_before_sparen = force +sp_after_sparen = force +sp_after_cast = remove +sp_inside_braces = force +sp_inside_braces_struct = force +sp_inside_braces_enum = force sp_assign = add sp_arith = add sp_bool = add sp_compare = add sp_assign = add sp_after_comma = add -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_func_def_paren = remove +sp_func_call_paren = remove +sp_func_proto_paren = remove # # Aligning stuff # -align_with_tabs = TRUE # use tabs to align -align_on_tabstop = TRUE # align on tabstops +align_with_tabs = TRUE +align_on_tabstop = TRUE # align_keep_tabs = true align_enum_equ_span = 4 # '=' in enum definition # align_nl_cont = TRUE diff --git a/tests/config/indent-1.cfg b/tests/config/indent-1.cfg index aee18db7a7..3c8e964aa4 100644 --- a/tests/config/indent-1.cfg +++ b/tests/config/indent-1.cfg @@ -1,11 +1,11 @@ # -indent_with_tabs = 1 # 1=indent to level only, 2=indent with tabs -input_tab_size = 4 # original tab size -output_tab_size = 4 # new tab size +indent_with_tabs = 1 +input_tab_size = 4 +output_tab_size = 4 indent_columns = output_tab_size -indent_label = 2 # pos: absolute col, neg: relative column -indent_align_string = False # align broken strings +indent_label = 2 +indent_align_string = False indent_brace = 0 indent_member = indent_columns indent_switch_case = indent_columns diff --git a/tests/config/indent.cfg b/tests/config/indent.cfg index cad6a9a066..a674df5355 100644 --- a/tests/config/indent.cfg +++ b/tests/config/indent.cfg @@ -4,11 +4,11 @@ indent_with_tabs = 0 # 0=spaces, 1=tabs, 2=indent to level only -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size +input_tab_size = 8 +output_tab_size = 3 indent_columns = output_tab_size -indent_label = 2 # pos: absolute col, neg: relative column +indent_label = 2 align_right_cmt_span = 3 # within x lines diff --git a/tests/config/indent_ctor_init.cfg b/tests/config/indent_ctor_init.cfg index 01dca1104a..0c4cefde41 100644 --- a/tests/config/indent_ctor_init.cfg +++ b/tests/config/indent_ctor_init.cfg @@ -1,18 +1,18 @@ -indent_columns = 2 # number -indent_with_tabs = 0 # number +indent_columns = 2 +indent_with_tabs = 0 -indent_class = true # false/true -indent_class_colon = true # false/true -indent_constr_colon = true # false/true -indent_func_class_param = true # false/true -indent_func_param_double = true # false/true +indent_class = true +indent_class_colon = true +indent_constr_colon = true +indent_func_class_param = true +indent_func_param_double = true indent_ctor_init = 2 -indent_access_spec = 2 # number +indent_access_spec = 2 -nl_collapse_empty_body = true # false/true -nl_constr_init_args = add # ignore/add/remove/force -nl_func_def_start = add # ignore/add/remove/force -nl_func_def_args = add # ignore/add/remove/force -nl_before_access_spec = 2 # number +nl_collapse_empty_body = true +nl_constr_init_args = add +nl_func_def_start = add +nl_func_def_args = add +nl_before_access_spec = 2 -pos_constr_comma = trail_force # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_constr_comma = trail_force diff --git a/tests/config/indent_ctor_init_leading.cfg b/tests/config/indent_ctor_init_leading.cfg index 82b8339b23..c629b973f3 100644 --- a/tests/config/indent_ctor_init_leading.cfg +++ b/tests/config/indent_ctor_init_leading.cfg @@ -1,19 +1,19 @@ -indent_columns = 2 # number -indent_with_tabs = 0 # number +indent_columns = 2 +indent_with_tabs = 0 -indent_class = true # false/true -indent_class_colon = true # false/true -indent_constr_colon = true # false/true -indent_func_class_param = true # false/true -indent_func_param_double = true # false/true +indent_class = true +indent_class_colon = true +indent_constr_colon = true +indent_func_class_param = true +indent_func_param_double = true indent_ctor_init = 2 indent_ctor_init_leading = 5 -indent_access_spec = 2 # number +indent_access_spec = 2 -nl_collapse_empty_body = true # false/true -nl_constr_init_args = add # ignore/add/remove/force -nl_func_def_start = add # ignore/add/remove/force -nl_func_def_args = add # ignore/add/remove/force -nl_before_access_spec = 2 # number +nl_collapse_empty_body = true +nl_constr_init_args = add +nl_func_def_start = add +nl_func_def_args = add +nl_before_access_spec = 2 -pos_constr_comma = trail_force # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_constr_comma = trail_force diff --git a/tests/config/indent_var_def.cfg b/tests/config/indent_var_def.cfg index b8990e581d..50eca6a0b7 100644 --- a/tests/config/indent_var_def.cfg +++ b/tests/config/indent_var_def.cfg @@ -5,19 +5,19 @@ # # The type of line endings -newlines = lf # auto/lf/crlf/cr +newlines = lf # The original size of tabs in the input -input_tab_size = 8 # number +input_tab_size = 8 # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 3 # number +output_tab_size = 3 # The ascii value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # # Indenting @@ -25,7 +25,7 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 3 # number +indent_columns = 3 indent_var_def_blk = -indent_columns @@ -33,1069 +33,1069 @@ indent_var_def_blk = -indent_columns # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # Whether the 'extern "C"' body is indented -indent_extern = false # false/true +indent_extern = false # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # Whether to indent the stuff after a leading class colon -indent_class_colon = true # false/true +indent_class_colon = true # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level -indent_else_if = false # false/true +indent_else_if = false # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = false # false/true +indent_func_call_param = false # Same as indent_func_call_param, but for function defs -indent_func_def_param = false # false/true +indent_func_def_param = false # Same as indent_func_call_param, but for function protos -indent_func_proto_param = false # false/true +indent_func_proto_param = false # Same as indent_func_call_param, but for class declarations -indent_func_class_param = false # false/true +indent_func_class_param = false # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = false # false/true +indent_func_ctor_var_param = false # Same as indent_func_call_param, but for templates -indent_template_param = false # false/true +indent_template_param = false # Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true +indent_func_param_double = false # Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 0 # number +indent_func_const = 0 # Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 0 # number +indent_func_throw = 0 # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 3 # number +indent_member = 3 # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = false # false/true +indent_relative_single_line_comments = false # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 0 # number +indent_switch_case = 0 # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 0 # number +indent_case_brace = 0 # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 0 # number +indent_paren_close = 0 # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # Add or remove space around assignment '=' in enum -sp_enum_assign = ignore # ignore/add/remove/force +sp_enum_assign = ignore # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force +sp_before_unnamed_ptr_star = ignore # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = ignore # ignore/add/remove/force +sp_after_ptr_star_func = ignore # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = ignore # ignore/add/remove/force +sp_before_ptr_star_func = ignore # Add or remove space before a reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force +sp_before_unnamed_byref = ignore # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = force # ignore/add/remove/force +sp_after_byref = force # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = ignore # ignore/add/remove/force +sp_after_byref_func = ignore # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = ignore # ignore/add/remove/force +sp_before_byref_func = ignore # Add or remove space between type and word -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. -sp_template_angle = ignore # ignore/add/remove/force +sp_template_angle = ignore # Add or remove space before '<>' -sp_before_angle = remove # ignore/add/remove/force +sp_before_angle = remove # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # Add or remove space after '<>' -sp_after_angle = force # ignore/add/remove/force +sp_after_angle = force # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = ignore # ignore/add/remove/force +sp_angle_paren = ignore # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = ignore # ignore/add/remove/force +sp_angle_word = ignore # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = add # ignore/add/remove/force +sp_sparen_brace = add # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = ignore # ignore/add/remove/force +sp_before_semi_for = ignore # Add or remove space before a semicolon of an empty part of a for statment. -sp_before_semi_for_empty = force # ignore/add/remove/force +sp_before_semi_for_empty = force # Add or remove space after the final semicolon of an empty part of a for statment: for ( ; ; ). -sp_after_semi_for_empty = ignore # ignore/add/remove/force +sp_after_semi_for_empty = ignore # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # Add or remove space after class ':' -sp_after_class_colon = ignore # ignore/add/remove/force +sp_after_class_colon = ignore # Add or remove space before class ':' -sp_before_class_colon = ignore # ignore/add/remove/force +sp_before_class_colon = ignore # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = ignore # ignore/add/remove/force +sp_after_operator_sym = ignore # Add or remove space after C/D cast, ie 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # Add or remove spaces inside cast parens -sp_inside_paren_cast = ignore # ignore/add/remove/force +sp_inside_paren_cast = ignore # Add or remove space between the type and open paren in a C++ cast, ie 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = ignore # ignore/add/remove/force +sp_cpp_cast_paren = ignore # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = force # ignore/add/remove/force +sp_inside_braces_enum = force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = force # ignore/add/remove/force +sp_inside_braces_struct = force # Add or remove space inside '{' and '}' -sp_inside_braces = force # ignore/add/remove/force +sp_inside_braces = force # Add or remove space inside '{}' -sp_inside_braces_empty = ignore # ignore/add/remove/force +sp_inside_braces_empty = ignore # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = force # ignore/add/remove/force +sp_type_func = force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # Add or remove space inside empty function '()' -sp_inside_fparens = ignore # ignore/add/remove/force +sp_inside_fparens = ignore # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # Add or remove space between ')' and '{' of function -sp_fparen_brace = add # ignore/add/remove/force +sp_fparen_brace = add # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = ignore # ignore/add/remove/force +sp_func_call_user_paren = ignore # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # Add or remove space between 'return' and '(' -sp_return_paren = remove # ignore/add/remove/force +sp_return_paren = remove # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = ignore # ignore/add/remove/force +sp_defined_paren = ignore # Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = ignore # ignore/add/remove/force +sp_throw_paren = ignore # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = ignore # ignore/add/remove/force +sp_else_brace = ignore # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = force # ignore/add/remove/force +sp_brace_typedef = force # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # Add or remove space before the '::' operator -sp_before_dc = remove # ignore/add/remove/force +sp_before_dc = remove # Add or remove space after the '::' operator -sp_after_dc = remove # ignore/add/remove/force +sp_after_dc = remove # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # Add or remove space after the '!' (not) operator. -sp_not = remove # ignore/add/remove/force +sp_not = remove # Add or remove space after the '~' (invert) operator. -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # Add or remove space after the '&' (address-of) operator. # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # Add or remove space around the '.' or '->' operators -sp_member = remove # ignore/add/remove/force +sp_member = remove # Add or remove space after the '*' (dereference) operator. # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7' -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;' -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # Add or remove space before a backslash-newline at the end of a line -sp_before_nl_cont = add # ignore/add/remove/force +sp_before_nl_cont = add # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force +sp_after_oc_scope = ignore # Add or remove space after the colon in message specs # '-(int) f:(int) x;' vs '-(int) f: (int) x;' -sp_after_oc_colon = ignore # ignore/add/remove/force +sp_after_oc_colon = ignore # Add or remove space before the colon in message specs # '-(int) f: (int) x;' vs '-(int) f : (int) x;' -sp_before_oc_colon = ignore # ignore/add/remove/force +sp_before_oc_colon = ignore # Add or remove space after the colon in message specs # '[object setValue:1];' vs '[object setValue: 1];' -sp_after_send_oc_colon = ignore # ignore/add/remove/force +sp_after_send_oc_colon = ignore # Add or remove space before the colon in message specs # '[object setValue:1];' vs '[object setValue :1];' -sp_before_send_oc_colon = ignore # ignore/add/remove/force +sp_before_send_oc_colon = ignore # Add or remove space after the (type) in message specs # '-(int) f: (int) x;' vs '-(int) f: (int)x;' -sp_after_oc_type = ignore # ignore/add/remove/force +sp_after_oc_type = ignore # Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = ignore # ignore/add/remove/force +sp_cond_colon = ignore # Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = ignore # ignore/add/remove/force +sp_cond_question = ignore # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = remove # ignore/add/remove/force +sp_case_label = remove # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # Whether to right-align numbers -align_number_right = true # false/true +align_number_right = true # Align variable definitions in prototypes and functions -align_func_params = true # false/true +align_func_params = true # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = false # false/true +align_same_func_call_params = false # The span for aligning variable definitions (0=don't align) -align_var_def_span = 1 # number -align_var_class_span = 1 # number +align_var_def_span = 1 +align_var_class_span = 1 # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 1 # number +align_var_def_star_style = 1 # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 16 # number +align_var_def_thresh = 16 # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # Whether to align the colon in struct bit fields -align_var_def_colon = true # false/true +align_var_def_colon = true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = true # false/true +align_var_def_inline = true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 1 # number +align_assign_span = 1 # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 12 # number +align_assign_thresh = 12 # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 16 # number +align_enum_equ_span = 16 # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # The span for aligning struct/union (0=don't align) -align_var_struct_span = 99 # number +align_var_struct_span = 99 # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 3 # number +align_struct_init_span = 3 # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 3 # number +align_typedef_gap = 3 # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 5 # number +align_typedef_span = 5 # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typdef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 3 # number +align_right_cmt_span = 3 # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. -align_right_cmt_gap = 0 # number +align_right_cmt_gap = 0 # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true +align_single_line_func = false # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # The span for aligning ObjC msg spec (0=don't align) -align_oc_msg_spec_span = 0 # number +align_oc_msg_spec_span = 0 # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = true # false/true +align_nl_cont = true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 4 # number +align_pp_define_gap = 4 # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 3 # number +align_pp_define_span = 3 # Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = true # false/true +align_left_shift = true # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = true # false/true +nl_assign_leave_one_liners = true # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = true # false/true +nl_class_leave_one_liners = true # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = false # false/true +nl_enum_leave_one_liners = false # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # Add or remove newline between '=' and '{' -nl_assign_brace = add # ignore/add/remove/force +nl_assign_brace = add # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = add # ignore/add/remove/force +nl_fcall_brace = add # Add or remove newline between 'enum' and '{' -nl_enum_brace = force # ignore/add/remove/force +nl_enum_brace = force # Add or remove newline between 'struct and '{' -nl_struct_brace = force # ignore/add/remove/force +nl_struct_brace = force # Add or remove newline between 'union' and '{' -nl_union_brace = force # ignore/add/remove/force +nl_union_brace = force # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = ignore # ignore/add/remove/force +nl_elseif_brace = ignore # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # Add or remove newline between 'else' and 'if' -nl_else_if = ignore # ignore/add/remove/force +nl_else_if = ignore # Add or remove newline between '}' and 'finally' -nl_brace_finally = ignore # ignore/add/remove/force +nl_brace_finally = ignore # Add or remove newline between 'finally' and '{' -nl_finally_brace = ignore # ignore/add/remove/force +nl_finally_brace = ignore # Add or remove newline between 'try' and '{' -nl_try_brace = ignore # ignore/add/remove/force +nl_try_brace = ignore # Add or remove newline between get/set and '{' -nl_getset_brace = force # ignore/add/remove/force +nl_getset_brace = force # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # Add or remove newline between 'catch' and '{' -nl_catch_brace = ignore # ignore/add/remove/force +nl_catch_brace = ignore # Add or remove newline between '}' and 'catch' -nl_brace_catch = ignore # ignore/add/remove/force +nl_brace_catch = ignore # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # Add or remove newline when condition spans two or more lines -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = true # false/true +nl_multi_line_define = true # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # Add or remove newline between ')' and 'throw' -nl_before_throw = ignore # ignore/add/remove/force +nl_before_throw = ignore # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # Newline between namespace and { -nl_namespace_brace = ignore # ignore/add/remove/force +nl_namespace_brace = ignore # Add or remove newline between 'template<>' and whatever follows. -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # Add or remove newline between return type and function name in definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = ignore # ignore/add/remove/force +nl_func_proto_type_name = ignore # Add or remove newline between a function name and the opening '(' -nl_func_paren = remove # ignore/add/remove/force +nl_func_paren = remove # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # Whether to put a newline after 'return' statement -nl_after_return = true # false/true +nl_after_return = true # Add or remove a newline between the return keyword and return expression. -nl_return_expr = ignore # ignore/add/remove/force +nl_return_expr = ignore # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = true # false/true +nl_after_brace_open = true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true +nl_after_brace_open_cmt = false # Whether to put a newline after a virtual brace open. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = false # false/true +nl_after_vbrace_open = false # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = true # false/true +nl_squeeze_ifdef = true # Add or remove newline before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # Add or remove newline after 'if' -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # Add or remove newline before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # Add or remove newline after 'for' -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # Add or remove newline before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # Add or remove newline after 'while' -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # Add or remove newline before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # Add or remove newline after 'switch' -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # Add or remove newline before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # Add or remove newline after 'do' -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # Whether to double-space before the close brace of a struct/union/enum -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # # Positioning options # # The position of arithmetic operators in wrapped expressions -pos_arith = ignore # ignore/lead/trail +pos_arith = ignore # The position of assignment in wrapped expressions -pos_assign = ignore # ignore/lead/trail +pos_assign = ignore # The position of boolean operators in wrapped expressions -pos_bool = trail # ignore/lead/trail +pos_bool = trail # The position of the comma in wrapped expressions -pos_comma = ignore # ignore/lead/trail +pos_comma = ignore # The position of the comma in the constructor initialization list -pos_class_comma = ignore # ignore/lead/trail +pos_class_comma = ignore # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true +ls_for_split_full = false # Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true +ls_func_split_full = false # # Blank line options # # The maximum consecutive newlines -nl_max = 4 # number +nl_max = 4 # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 3 # number +nl_after_func_body = 3 # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 0 # number +nl_after_func_body_one_liner = 0 # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # Whether to force a newline after a mulit-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 0 # number +nl_before_access_spec = 0 # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # The number of newlines between a function def and the function comment. # 0 = No change. -nl_comment_func_def = 1 # number +nl_comment_func_def = 1 # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = add # ignore/add/remove/force +mod_paren_on_return = add # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = true # false/true +mod_full_paren_if_bool = true # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = true # false/true +mod_remove_extra_semicolon = true # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 0 # number +mod_add_long_function_closebrace_comment = 0 # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number +mod_add_long_switch_closebrace_comment = 0 # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = false # false/true +mod_move_case_break = false # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = true # false/true +mod_remove_empty_return = true # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # If false, disable all multi-line comment changes, including cmt_width and leading chars. # Default is true. -cmt_indent_multi = true # false/true +cmt_indent_multi = true # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # Whether to put a star on subsequent comment lines -cmt_star_cont = true # false/true +cmt_star_cont = true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitue $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # The filename that contains text to insert before a function implementation if the function isn't preceeded with a C/C++ comment. # Will substitue $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # The filename that contains text to insert before a class if the class isn't preceeded with a C/C++ comment. # Will substitue $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true +cmt_insert_before_preproc = false # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = force # ignore/add/remove/force +pp_indent = force # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. -pp_indent_count = 1 # number +pp_indent_count = 1 # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true +pp_if_indent_code = false # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/issue_564.cfg b/tests/config/issue_564.cfg index 14843b3470..44efe2e90c 100644 --- a/tests/config/issue_564.cfg +++ b/tests/config/issue_564.cfg @@ -1,2 +1,2 @@ #align_func_params=true # { False, True } -align_same_func_call_params = true # { False, True } +align_same_func_call_params = true diff --git a/tests/config/issue_574.cfg b/tests/config/issue_574.cfg index d129c56795..7a213d40c8 100644 --- a/tests/config/issue_574.cfg +++ b/tests/config/issue_574.cfg @@ -11,33 +11,33 @@ set FOR forever # # The type of line endings -newlines = auto # auto/lf/crlf/cr +newlines = auto # The original size of tabs in the input -input_tab_size = 4 # number +input_tab_size = 4 # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 4 # number +output_tab_size = 4 # The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # Allow interpreting '>=' and '>>=' as part of a template in 'void f(list>=val);'. # If true (default), 'assert(x<0 && y>=3)' will be broken. # Improvements to template detection may make this option obsolete. -tok_split_gte = false # false/true +tok_split_gte = false # Control what to do with the UTF-8 BOM (recommend 'remove') -utf8_bom = ignore # ignore/add/remove/force +utf8_bom = ignore # If the file contains bytes with values between 128 and 255, but is not UTF-8, then output as UTF-8 -utf8_byte = false # false/true +utf8_byte = false # Force the output encoding to UTF-8 -utf8_force = false # false/true +utf8_force = false # # Indenting @@ -45,1229 +45,1229 @@ utf8_force = false # false/true # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 4 # number +indent_columns = 4 # The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents. # For FreeBSD, this is set to 4. Negative value is absolute and not increased for each ( level -indent_continue = 0 # number +indent_continue = 0 # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs to brace level, align with spaces # 2=indent and align with tabs, using spaces when not on a tabstop -indent_with_tabs = 0 # number +indent_with_tabs = 0 # Comments that are not a brace level are indented with tabs on a tabstop. # Requires indent_with_tabs=2. If false, will use spaces. -indent_cmt_with_tabs = false # false/true +indent_cmt_with_tabs = false # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # Disabled indenting class braces if indent_braces is true -indent_braces_no_class = false # false/true +indent_braces_no_class = false # Disabled indenting struct braces if indent_braces is true -indent_braces_no_struct = false # false/true +indent_braces_no_struct = false # Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # The number of spaces to indent a namespace block -indent_namespace_level = 0 # number +indent_namespace_level = 0 # If the body of the namespace is longer than this number, it won't be indented. # Requires indent_namespace=true. Default=0 (no limit) -indent_namespace_limit = 0 # number +indent_namespace_limit = 0 # Whether the 'extern "C"' body is indented -indent_extern = false # false/true +indent_extern = false # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # Whether to indent the stuff after a leading class colon -indent_class_colon = false # false/true +indent_class_colon = false # Virtual indent from the ':' for member initializers. Default is 2 -indent_ctor_init_leading = 2 # number +indent_ctor_init_leading = 2 # Additional indenting for constructor initializer list -indent_ctor_init = 0 # number +indent_ctor_init = 0 # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level -indent_else_if = false # false/true +indent_else_if = false # Amount to indent variable declarations after a open brace. neg=relative, pos=absolute -indent_var_def_blk = 0 # number +indent_var_def_blk = 0 # Indent continued variable declarations instead of aligning. -indent_var_def_cont = false # false/true +indent_var_def_cont = false # True: force indentation of function definition to start in column 1 # False: use the default behavior -indent_func_def_force_col1 = false # false/true +indent_func_def_force_col1 = false # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = false # false/true +indent_func_call_param = false # Same as indent_func_call_param, but for function defs -indent_func_def_param = false # false/true +indent_func_def_param = false # Same as indent_func_call_param, but for function protos -indent_func_proto_param = false # false/true +indent_func_proto_param = false # Same as indent_func_call_param, but for class declarations -indent_func_class_param = false # false/true +indent_func_class_param = false # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = false # false/true +indent_func_ctor_var_param = false # Same as indent_func_call_param, but for templates -indent_template_param = false # false/true +indent_template_param = false # Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true +indent_func_param_double = false # Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 0 # number +indent_func_const = 0 # Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 0 # number +indent_func_throw = 0 # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 0 # number +indent_member = 0 # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = false # false/true +indent_relative_single_line_comments = false # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 0 # number +indent_switch_case = 0 # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 0 # number +indent_case_brace = 0 # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = -4 # number +indent_access_spec = -4 # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 0 # number +indent_paren_close = 0 # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # If 'indent_bool_paren' is true, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones -indent_first_bool_expr = false # false/true +indent_first_bool_expr = false # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # Align continued statements at the '='. Default=True # If FALSE or the '=' is followed by a newline, the next line is indent one tab. -indent_align_assign = true # false/true +indent_align_assign = true # Indent OC blocks at brace level instead of usual rules. -indent_oc_block = false # false/true +indent_oc_block = false # Indent OC blocks in a message relative to the parameter name. # 0=use indent_oc_block rules, 1+=spaces to indent -indent_oc_block_msg = 0 # number +indent_oc_block_msg = 0 # Minimum indent for subsequent parameters -indent_oc_msg_colon = 0 # number +indent_oc_msg_colon = 0 # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = ignore # ignore/add/remove/force +sp_arith = ignore # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # Add or remove space around '=' in C++11 lambda capture specifications. Overrides sp_assign -sp_cpp_lambda_assign = remove # ignore/add/remove/force +sp_cpp_lambda_assign = remove # Add or remove space after the capture specification in C++11 lambda. -sp_cpp_lambda_paren = ignore # ignore/add/remove/force +sp_cpp_lambda_paren = ignore # Add or remove space around assignment operator '=' in a prototype -sp_assign_default = force # ignore/add/remove/force +sp_assign_default = force # Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. -sp_before_assign = ignore # ignore/add/remove/force +sp_before_assign = ignore # Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. -sp_after_assign = ignore # ignore/add/remove/force +sp_after_assign = ignore # Add or remove space around assignment '=' in enum -sp_enum_assign = force # ignore/add/remove/force +sp_enum_assign = force # Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_before_assign = ignore # ignore/add/remove/force +sp_enum_before_assign = ignore # Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_after_assign = ignore # ignore/add/remove/force +sp_enum_after_assign = ignore # Add or remove space around preprocessor '##' concatenation operator. Default=Add -sp_pp_concat = add # ignore/add/remove/force +sp_pp_concat = add # Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator. -sp_pp_stringify = ignore # ignore/add/remove/force +sp_pp_stringify = ignore # Add or remove space before preprocessor '#' stringify operator as in '#define x(y) L#y'. -sp_before_pp_stringify = ignore # ignore/add/remove/force +sp_before_pp_stringify = ignore # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # Add or remove space between nested parens: '((' vs ') )' -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # Add or remove space between back-to-back parens: ')(' vs ') (' -sp_cparen_oparen = ignore # ignore/add/remove/force +sp_cparen_oparen = ignore # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # Add or remove space between ')' and '{' -sp_paren_brace = force # ignore/add/remove/force +sp_paren_brace = force # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force +sp_before_unnamed_ptr_star = ignore # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # Add or remove space after pointer star '*', if followed by a qualifier. sp_after_ptr_star_qualifier = force # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = remove # ignore/add/remove/force +sp_after_ptr_star_func = remove # Add or remove space after a pointer star '*', if followed by an open paren (function types). -sp_ptr_star_paren = remove # ignore/add/remove/force +sp_ptr_star_paren = remove # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = force # ignore/add/remove/force +sp_before_ptr_star_func = force # Add or remove space before a reference sign '&' -sp_before_byref = force # ignore/add/remove/force +sp_before_byref = force # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force +sp_before_unnamed_byref = ignore # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = remove # ignore/add/remove/force +sp_after_byref = remove # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = ignore # ignore/add/remove/force +sp_after_byref_func = ignore # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = ignore # ignore/add/remove/force +sp_before_byref_func = ignore # Add or remove space between type and word. Default=Force -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # Add or remove space before the paren in the D constructs 'template Foo(' and 'class Foo('. -sp_before_template_paren = ignore # ignore/add/remove/force +sp_before_template_paren = ignore # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. -sp_template_angle = remove # ignore/add/remove/force +sp_template_angle = remove # Add or remove space before '<>' -sp_before_angle = ignore # ignore/add/remove/force +sp_before_angle = ignore # Add or remove space inside '<' and '>' -sp_inside_angle = ignore # ignore/add/remove/force +sp_inside_angle = ignore # Add or remove space after '<>' -sp_after_angle = ignore # ignore/add/remove/force +sp_after_angle = ignore # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = remove # ignore/add/remove/force +sp_angle_paren = remove # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = force # ignore/add/remove/force +sp_angle_word = force # Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add -sp_angle_shift = add # ignore/add/remove/force +sp_angle_shift = add # Permit removal of the space between '>>' in 'foo >' (C++11 only). Default=False # sp_angle_shift cannot remove the space without this option. -sp_permit_cpp11_shift = false # false/true +sp_permit_cpp11_shift = false # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # Add or remove space before if-condition ')'. Overrides sp_inside_sparen. -sp_inside_sparen_close = ignore # ignore/add/remove/force +sp_inside_sparen_close = ignore # Add or remove space before if-condition '('. Overrides sp_inside_sparen. -sp_inside_sparen_open = ignore # ignore/add/remove/force +sp_inside_sparen_open = ignore # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = force # ignore/add/remove/force +sp_sparen_brace = force # Add or remove space between 'invariant' and '(' in the D language. -sp_invariant_paren = ignore # ignore/add/remove/force +sp_invariant_paren = ignore # Add or remove space after the ')' in 'invariant (C) c' in the D language. -sp_after_invariant_paren = ignore # ignore/add/remove/force +sp_after_invariant_paren = ignore # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # Add or remove space before ';'. Default=Remove -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = remove # ignore/add/remove/force +sp_before_semi_for = remove # Add or remove space before a semicolon of an empty part of a for statement. -sp_before_semi_for_empty = remove # ignore/add/remove/force +sp_before_semi_for_empty = remove # Add or remove space after ';', except when followed by a comment. Default=Add -sp_after_semi = force # ignore/add/remove/force +sp_after_semi = force # Add or remove space after ';' in non-empty 'for' statements. Default=Force -sp_after_semi_for = force # ignore/add/remove/force +sp_after_semi_for = force # Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; ). -sp_after_semi_for_empty = remove # ignore/add/remove/force +sp_after_semi_for_empty = remove # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # Add or remove space inside a non-empty '[' and ']' -sp_inside_square = ignore # ignore/add/remove/force +sp_inside_square = ignore # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # Add or remove space between an open paren and comma: '(,' vs '( ,' -sp_paren_comma = force # ignore/add/remove/force +sp_paren_comma = force # Add or remove space before the variadic '...' when preceded by a non-punctuator -sp_before_ellipsis = ignore # ignore/add/remove/force +sp_before_ellipsis = ignore # Add or remove space after class ':' -sp_after_class_colon = force # ignore/add/remove/force +sp_after_class_colon = force # Add or remove space before class ':' -sp_before_class_colon = force # ignore/add/remove/force +sp_before_class_colon = force # Add or remove space before case ':'. Default=Remove -sp_before_case_colon = remove # ignore/add/remove/force +sp_before_case_colon = remove # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = ignore # ignore/add/remove/force +sp_after_operator_sym = ignore # Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # Add or remove spaces inside cast parens -sp_inside_paren_cast = remove # ignore/add/remove/force +sp_inside_paren_cast = remove # Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = remove # ignore/add/remove/force +sp_cpp_cast_paren = remove # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = ignore # ignore/add/remove/force +sp_inside_braces_enum = ignore # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = ignore # ignore/add/remove/force +sp_inside_braces_struct = ignore # Add or remove space inside '{' and '}' -sp_inside_braces = ignore # ignore/add/remove/force +sp_inside_braces = ignore # Add or remove space inside '{}' -sp_inside_braces_empty = ignore # ignore/add/remove/force +sp_inside_braces_empty = ignore # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = ignore # ignore/add/remove/force +sp_type_func = ignore # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # Add or remove space inside the first parens in the function type: 'void (*x)(...)' -sp_inside_tparen = remove # ignore/add/remove/force +sp_inside_tparen = remove # Add or remove between the parens in the function type: 'void (*x)(...)' -sp_after_tparen_close = remove # ignore/add/remove/force +sp_after_tparen_close = remove # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = remove # ignore/add/remove/force +sp_square_fparen = remove # Add or remove space between ')' and '{' of function -sp_fparen_brace = ignore # ignore/add/remove/force +sp_fparen_brace = ignore # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # Add or remove space between function name and '()' on function calls without parameters. # If set to 'ignore' (the default), sp_func_call_paren is used. -sp_func_call_paren_empty = ignore # ignore/add/remove/force +sp_func_call_paren_empty = ignore # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = force # ignore/add/remove/force +sp_func_call_user_paren = force # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = ignore # ignore/add/remove/force +sp_func_class_paren = ignore # Add or remove space between 'return' and '(' -sp_return_paren = force # ignore/add/remove/force +sp_return_paren = force # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = ignore # ignore/add/remove/force +sp_defined_paren = ignore # Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = ignore # ignore/add/remove/force +sp_throw_paren = ignore # Add or remove space between 'throw' and anything other than '(' as in '@throw [...];' -sp_after_throw = ignore # ignore/add/remove/force +sp_after_throw = ignore # Add or remove space between 'catch' and '(' in 'catch (something) { }' # If set to ignore, sp_before_sparen is used. -sp_catch_paren = ignore # ignore/add/remove/force +sp_catch_paren = ignore # Add or remove space between 'version' and '(' in 'version (something) { }' (D language) # If set to ignore, sp_before_sparen is used. -sp_version_paren = ignore # ignore/add/remove/force +sp_version_paren = ignore # Add or remove space between 'scope' and '(' in 'scope (something) { }' (D language) # If set to ignore, sp_before_sparen is used. -sp_scope_paren = ignore # ignore/add/remove/force +sp_scope_paren = ignore # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = force # ignore/add/remove/force +sp_else_brace = force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = force # ignore/add/remove/force +sp_brace_else = force # Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = ignore # ignore/add/remove/force +sp_brace_typedef = ignore # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # Add or remove space between a variable and '{' for C++ uniform initialization -sp_word_brace = add # ignore/add/remove/force +sp_word_brace = add # Add or remove space between a variable and '{' for a namespace -sp_word_brace_ns = add # ignore/add/remove/force +sp_word_brace_ns = add # Add or remove space before the '::' operator -sp_before_dc = ignore # ignore/add/remove/force +sp_before_dc = ignore # Add or remove space after the '::' operator -sp_after_dc = ignore # ignore/add/remove/force +sp_after_dc = ignore # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # Add or remove space after the '!' (not) operator. Default=Remove -sp_not = remove # ignore/add/remove/force +sp_not = remove # Add or remove space after the '~' (invert) operator. Default=Remove -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # Add or remove space after the '&' (address-of) operator. Default=Remove # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # Add or remove space around the '.' or '->' operators. Default=Remove -sp_member = remove # ignore/add/remove/force +sp_member = remove # Add or remove space after the '*' (dereference) operator. Default=Remove # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # Add or remove space before a backslash-newline at the end of a line. Default=Add -sp_before_nl_cont = add # ignore/add/remove/force +sp_before_nl_cont = add # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force +sp_after_oc_scope = ignore # Add or remove space after the colon in message specs # '-(int) f:(int) x;' vs '-(int) f: (int) x;' -sp_after_oc_colon = ignore # ignore/add/remove/force +sp_after_oc_colon = ignore # Add or remove space before the colon in message specs # '-(int) f: (int) x;' vs '-(int) f : (int) x;' -sp_before_oc_colon = ignore # ignore/add/remove/force +sp_before_oc_colon = ignore # Add or remove space after the colon in immutable dictionary expression # 'NSDictionary *test = @{@"foo" :@"bar"};' -sp_after_oc_dict_colon = ignore # ignore/add/remove/force +sp_after_oc_dict_colon = ignore # Add or remove space before the colon in immutable dictionary expression # 'NSDictionary *test = @{@"foo" :@"bar"};' -sp_before_oc_dict_colon = ignore # ignore/add/remove/force +sp_before_oc_dict_colon = ignore # Add or remove space after the colon in message specs # '[object setValue:1];' vs '[object setValue: 1];' -sp_after_send_oc_colon = ignore # ignore/add/remove/force +sp_after_send_oc_colon = ignore # Add or remove space before the colon in message specs # '[object setValue:1];' vs '[object setValue :1];' -sp_before_send_oc_colon = ignore # ignore/add/remove/force +sp_before_send_oc_colon = ignore # Add or remove space after the (type) in message specs # '-(int)f: (int) x;' vs '-(int)f: (int)x;' -sp_after_oc_type = ignore # ignore/add/remove/force +sp_after_oc_type = ignore # Add or remove space after the first (type) in message specs # '-(int) f:(int)x;' vs '-(int)f:(int)x;' -sp_after_oc_return_type = ignore # ignore/add/remove/force +sp_after_oc_return_type = ignore # Add or remove space between '@selector' and '(' # '@selector(msgName)' vs '@selector (msgName)' # Also applies to @protocol() constructs -sp_after_oc_at_sel = ignore # ignore/add/remove/force +sp_after_oc_at_sel = ignore # Add or remove space between '@selector(x)' and the following word # '@selector(foo) a:' vs '@selector(foo)a:' -sp_after_oc_at_sel_parens = ignore # ignore/add/remove/force +sp_after_oc_at_sel_parens = ignore # Add or remove space inside '@selector' parens # '@selector(foo)' vs '@selector( foo )' # Also applies to @protocol() constructs -sp_inside_oc_at_sel_parens = ignore # ignore/add/remove/force +sp_inside_oc_at_sel_parens = ignore # Add or remove space before a block pointer caret # '^int (int arg){...}' vs. ' ^int (int arg){...}' -sp_before_oc_block_caret = ignore # ignore/add/remove/force +sp_before_oc_block_caret = ignore # Add or remove space after a block pointer caret # '^int (int arg){...}' vs. '^ int (int arg){...}' -sp_after_oc_block_caret = ignore # ignore/add/remove/force +sp_after_oc_block_caret = ignore # Add or remove space between the receiver and selector in a message. # '[receiver selector ...]' -sp_after_oc_msg_receiver = ignore # ignore/add/remove/force +sp_after_oc_msg_receiver = ignore # Add or remove space after @property. -sp_after_oc_property = ignore # ignore/add/remove/force +sp_after_oc_property = ignore # Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = force # ignore/add/remove/force +sp_cond_colon = force # Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = force # ignore/add/remove/force +sp_cond_question = force # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = ignore # ignore/add/remove/force +sp_case_label = ignore # Control the space around the D '..' operator. -sp_range = ignore # ignore/add/remove/force +sp_range = ignore # Control the spacing after ':' in 'for (TYPE VAR : EXPR)' (Java) -sp_after_for_colon = ignore # ignore/add/remove/force +sp_after_for_colon = ignore # Control the spacing before ':' in 'for (TYPE VAR : EXPR)' (Java) -sp_before_for_colon = ignore # ignore/add/remove/force +sp_before_for_colon = ignore # Control the spacing in 'extern (C)' (D) -sp_extern_paren = ignore # ignore/add/remove/force +sp_extern_paren = ignore # Control the space after the opening of a C++ comment '// A' vs '//A' -sp_cmt_cpp_start = force # ignore/add/remove/force +sp_cmt_cpp_start = force # Controls the spaces between #else or #endif and a trailing comment -sp_endif_cmt = ignore # ignore/add/remove/force +sp_endif_cmt = ignore # Controls the spaces after 'new', 'delete', and 'delete[]' -sp_after_new = ignore # ignore/add/remove/force +sp_after_new = ignore # Controls the spaces before a trailing or embedded comment -sp_before_tr_emb_cmt = ignore # ignore/add/remove/force +sp_before_tr_emb_cmt = ignore # Number of spaces before a trailing or embedded comment -sp_num_before_tr_emb_cmt = 0 # number +sp_num_before_tr_emb_cmt = 0 # Control space between a Java annotation and the open paren. -sp_annotation_paren = ignore # ignore/add/remove/force +sp_annotation_paren = ignore # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # Whether to use tabs for aligning -align_with_tabs = false # false/true +align_with_tabs = false # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # Whether to keep whitespace not required for alignment. -align_keep_extra_space = false # false/true +align_keep_extra_space = false # Align variable definitions in prototypes and functions -align_func_params = false # false/true +align_func_params = false # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = false # false/true +align_same_func_call_params = false # The span for aligning variable definitions (0=don't align) -align_var_def_span = 0 # number +align_var_def_span = 0 # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 0 # number +align_var_def_star_style = 0 # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # Whether to align any attribute after the variable name -align_var_def_attribute = false # false/true +align_var_def_attribute = false # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = false # false/true +align_var_def_inline = false # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 0 # number +align_assign_span = 0 # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 0 # number +align_enum_equ_span = 0 # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # The span for aligning struct/union (0=don't align) -align_var_struct_span = 0 # number +align_var_struct_span = 0 # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 0 # number +align_struct_init_span = 0 # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number +align_typedef_gap = 0 # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 0 # number +align_typedef_span = 0 # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typedef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typedef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 0 # number +align_right_cmt_span = 0 # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. This has to be > 0 to do anything. -align_right_cmt_gap = 0 # number +align_right_cmt_gap = 0 # Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore) -align_right_cmt_at_col = 0 # number +align_right_cmt_at_col = 0 # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # Align function protos on the 'operator' keyword instead of what follows -align_on_operator = false # false/true +align_on_operator = false # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true +align_single_line_func = false # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # The span for aligning ObjC msg spec (0=don't align) -align_oc_msg_spec_span = 0 # number +align_oc_msg_spec_span = 0 # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = false # false/true +align_nl_cont = false # # Align macro functions and variables together -align_pp_define_together = false # false/true +align_pp_define_together = false # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 0 # number +align_pp_define_gap = 0 # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 0 # number +align_pp_define_span = 0 # Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = true # false/true +align_left_shift = true # Span for aligning parameters in an Obj-C message call on the ':' (0=don't align) -align_oc_msg_colon_span = 0 # number +align_oc_msg_colon_span = 0 # If true, always align with the first parameter, even if it is too short. -align_oc_msg_colon_first = false # false/true +align_oc_msg_colon_first = false # Aligning parameters in an Obj-C '+' or '-' declaration on the ':' -align_oc_decl_colon = false # false/true +align_oc_decl_colon = false # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = true # false/true +nl_assign_leave_one_liners = true # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = false # false/true +nl_class_leave_one_liners = false # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = false # false/true +nl_enum_leave_one_liners = false # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # Don't split one-line C++11 lambdas - '[]() { return 0; }' -nl_cpp_lambda_leave_one_liners = false # false/true +nl_cpp_lambda_leave_one_liners = false # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # Don't split one-line OC messages -nl_oc_msg_leave_one_liner = false # false/true +nl_oc_msg_leave_one_liner = false # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # Add or remove newline between '=' and '{' -nl_assign_brace = remove # ignore/add/remove/force +nl_assign_brace = remove # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # The number of blank lines after a block of variable definitions at the top of a function body # 0 = No change (default) -nl_func_var_def_blk = 0 # number +nl_func_var_def_blk = 0 # The number of newlines before a block of typedefs # 0 = No change (default) -nl_typedef_blk_start = 0 # number +nl_typedef_blk_start = 0 # The number of newlines after a block of typedefs # 0 = No change (default) -nl_typedef_blk_end = 0 # number +nl_typedef_blk_end = 0 # The maximum consecutive newlines within a block of typedefs # 0 = No change (default) -nl_typedef_blk_in = 0 # number +nl_typedef_blk_in = 0 # The number of newlines before a block of variable definitions not at the top of a function body # 0 = No change (default) -nl_var_def_blk_start = 0 # number +nl_var_def_blk_start = 0 # The number of newlines after a block of variable definitions not at the top of a function body # 0 = No change (default) -nl_var_def_blk_end = 0 # number +nl_var_def_blk_end = 0 # The maximum consecutive newlines within a block of variable definitions # 0 = No change (default) -nl_var_def_blk_in = 0 # number +nl_var_def_blk_in = 0 # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = ignore # ignore/add/remove/force +nl_fcall_brace = ignore # Add or remove newline between 'enum' and '{' -nl_enum_brace = ignore # ignore/add/remove/force +nl_enum_brace = ignore # Add or remove newline between 'struct and '{' -nl_struct_brace = ignore # ignore/add/remove/force +nl_struct_brace = ignore # Add or remove newline between 'union' and '{' -nl_union_brace = ignore # ignore/add/remove/force +nl_union_brace = ignore # Add or remove newline between 'if' and '{' -nl_if_brace = remove # ignore/add/remove/force +nl_if_brace = remove # Add or remove newline between '}' and 'else' -nl_brace_else = remove # ignore/add/remove/force +nl_brace_else = remove # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = remove # ignore/add/remove/force +nl_elseif_brace = remove # Add or remove newline between 'else' and '{' -nl_else_brace = remove # ignore/add/remove/force +nl_else_brace = remove # Add or remove newline between 'else' and 'if' -nl_else_if = remove # ignore/add/remove/force +nl_else_if = remove # Add or remove newline between '}' and 'finally' -nl_brace_finally = ignore # ignore/add/remove/force +nl_brace_finally = ignore # Add or remove newline between 'finally' and '{' -nl_finally_brace = ignore # ignore/add/remove/force +nl_finally_brace = ignore # Add or remove newline between 'try' and '{' -nl_try_brace = ignore # ignore/add/remove/force +nl_try_brace = ignore # Add or remove newline between get/set and '{' -nl_getset_brace = ignore # ignore/add/remove/force +nl_getset_brace = ignore # Add or remove newline between 'for' and '{' -nl_for_brace = remove # ignore/add/remove/force +nl_for_brace = remove # Add or remove newline between 'catch' and '{' -nl_catch_brace = ignore # ignore/add/remove/force +nl_catch_brace = ignore # Add or remove newline between '}' and 'catch' -nl_brace_catch = ignore # ignore/add/remove/force +nl_brace_catch = ignore # Add or remove newline between 'while' and '{' -nl_while_brace = ignore # ignore/add/remove/force +nl_while_brace = ignore # Add or remove newline between 'scope (x)' and '{' (D) -nl_scope_brace = ignore # ignore/add/remove/force +nl_scope_brace = ignore # Add or remove newline between 'unittest' and '{' (D) -nl_unittest_brace = ignore # ignore/add/remove/force +nl_unittest_brace = ignore # Add or remove newline between 'version (x)' and '{' (D) -nl_version_brace = ignore # ignore/add/remove/force +nl_version_brace = ignore # Add or remove newline between 'using' and '{' -nl_using_brace = ignore # ignore/add/remove/force +nl_using_brace = ignore # Add or remove newline between two open or close braces. # Due to general newline/brace handling, REMOVE may not work. -nl_brace_brace = ignore # ignore/add/remove/force +nl_brace_brace = ignore # Add or remove newline between 'do' and '{' -nl_do_brace = remove # ignore/add/remove/force +nl_do_brace = remove # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # Add or remove newline between 'switch' and '{' -nl_switch_brace = remove # ignore/add/remove/force +nl_switch_brace = remove # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = false # false/true +nl_multi_line_define = false # Whether to put a newline before 'case' statement -nl_before_case = false # false/true +nl_before_case = false # Add or remove newline between ')' and 'throw' -nl_before_throw = ignore # ignore/add/remove/force +nl_before_throw = ignore # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # Add or remove a newline between a case ':' and '{'. Overrides nl_after_case. -nl_case_colon_brace = ignore # ignore/add/remove/force +nl_case_colon_brace = ignore # Newline between namespace and { -nl_namespace_brace = remove # ignore/add/remove/force +nl_namespace_brace = remove # Add or remove newline between 'template<>' and whatever follows. -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # Add or remove newline between 'class' and '{' -nl_class_brace = force # ignore/add/remove/force +nl_class_brace = force # Add or remove newline after each ',' in the class base list -nl_class_init_args = remove # ignore/add/remove/force +nl_class_init_args = remove # Add or remove newline after each ',' in the constructor member initialization -nl_constr_init_args = force # ignore/add/remove/force +nl_constr_init_args = force # Add or remove newline between return type and function name in a function definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # Add or remove newline between return type and function name inside a class {} # Uses nl_func_type_name or nl_func_proto_type_name if set to ignore. -nl_func_type_name_class = ignore # ignore/add/remove/force +nl_func_type_name_class = ignore # Add or remove newline between function scope and name in a definition # Controls the newline after '::' in 'void A::f() { }' -nl_func_scope_name = ignore # ignore/add/remove/force +nl_func_scope_name = ignore # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = ignore # ignore/add/remove/force +nl_func_proto_type_name = ignore # Add or remove newline between a function name and the opening '(' -nl_func_paren = remove # ignore/add/remove/force +nl_func_paren = remove # Add or remove newline between a function name and the opening '(' in the definition -nl_func_def_paren = ignore # ignore/add/remove/force +nl_func_def_paren = ignore # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # Add or remove newline after '(' in a function definition -nl_func_def_start = ignore # ignore/add/remove/force +nl_func_def_start = ignore # Overrides nl_func_decl_start when there is only one parameter. -nl_func_decl_start_single = ignore # ignore/add/remove/force +nl_func_decl_start_single = ignore # Overrides nl_func_def_start when there is only one parameter. -nl_func_def_start_single = ignore # ignore/add/remove/force +nl_func_def_start_single = ignore # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = remove # ignore/add/remove/force +nl_func_decl_args = remove # Add or remove newline after each ',' in a function definition -nl_func_def_args = remove # ignore/add/remove/force +nl_func_def_args = remove # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = remove # ignore/add/remove/force +nl_func_decl_end = remove # Add or remove newline before the ')' in a function definition -nl_func_def_end = remove # ignore/add/remove/force +nl_func_def_end = remove # Overrides nl_func_decl_end when there is only one parameter. -nl_func_decl_end_single = ignore # ignore/add/remove/force +nl_func_decl_end_single = ignore # Overrides nl_func_def_end when there is only one parameter. -nl_func_def_end_single = ignore # ignore/add/remove/force +nl_func_def_end_single = ignore # Add or remove newline between '()' in a function declaration. -nl_func_decl_empty = remove # ignore/add/remove/force +nl_func_decl_empty = remove # Add or remove newline between '()' in a function definition. -nl_func_def_empty = remove # ignore/add/remove/force +nl_func_def_empty = remove # Whether to put each OC message parameter on a separate line # See nl_oc_msg_leave_one_liner -nl_oc_msg_args = false # false/true +nl_oc_msg_args = false # Add or remove newline between function signature and '{' -nl_fdef_brace = force # ignore/add/remove/force +nl_fdef_brace = force # Add or remove newline between C++11 lambda signature and '{' -nl_cpp_ldef_brace = ignore # ignore/add/remove/force +nl_cpp_ldef_brace = ignore # Add or remove a newline between the return keyword and return expression. -nl_return_expr = ignore # ignore/add/remove/force +nl_return_expr = ignore # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = true # false/true +nl_after_brace_open = true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true +nl_after_brace_open_cmt = false # Whether to put a newline after a virtual brace open with a non-empty body. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = false # false/true +nl_after_vbrace_open = false # Whether to put a newline after a virtual brace open with an empty body. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open_empty = false # false/true +nl_after_vbrace_open_empty = false # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. -nl_after_brace_close = false # false/true +nl_after_brace_close = false # Whether to put a newline after a virtual brace close. # Would add a newline before return in: 'if (foo) a++; return;' -nl_after_vbrace_close = false # false/true +nl_after_vbrace_close = false # Control the newline between the close brace and 'b' in: 'struct { int a; } b;' # Affects enums, unions, and structures. If set to ignore, uses nl_after_brace_close -nl_brace_struct_var = ignore # ignore/add/remove/force +nl_brace_struct_var = ignore # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true +nl_squeeze_ifdef = false # Add or remove blank line before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # Add or remove blank line after 'if' statement -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # Add or remove blank line before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # Add or remove blank line after 'for' statement -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # Add or remove blank line before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # Add or remove blank line after 'while' statement -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # Add or remove blank line before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # Add or remove blank line after 'switch' statement -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # Add or remove blank line before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # Add or remove blank line after 'do/while' statement -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # Whether to double-space before the close brace of a struct/union/enum # (lower priority than 'eat_blanks_before_close_brace') -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = remove # ignore/add/remove/force +nl_class_colon = remove # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # # Positioning options # # The position of arithmetic operators in wrapped expressions -pos_arith = lead # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_arith = lead # The position of assignment in wrapped expressions. # Do not affect '=' followed by '{' -pos_assign = lead # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_assign = lead # The position of boolean operators in wrapped expressions -pos_bool = lead # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_bool = lead # The position of comparison operators in wrapped expressions -pos_compare = lead # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_compare = lead # The position of conditional (b ? t : f) operators in wrapped expressions -pos_conditional = lead # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_conditional = lead # The position of the comma in wrapped expressions -pos_comma = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_comma = trail # The position of the comma in the constructor initialization list -pos_class_comma = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_comma = trail # The position of colons between constructor and member initialization -pos_class_colon = lead # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_colon = lead pos_constr_comma = trail pos_constr_colon = trail @@ -1277,300 +1277,300 @@ pos_constr_colon = trail # # Try to limit code width to N number of columns -code_width = 120 # number +code_width = 120 # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true +ls_for_split_full = false # Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true +ls_func_split_full = false # Whether to split lines as close to code_width as possible and ignore some groupings -ls_code_width = false # false/true +ls_code_width = false # # Blank line options # # The maximum consecutive newlines -nl_max = 2 # number +nl_max = 2 # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 0 # number +nl_after_func_proto_group = 0 # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # The number of newlines after '}' of a multi-line function body in a class declaration -nl_after_func_body_class = 0 # number +nl_after_func_body_class = 0 # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 0 # number +nl_after_func_body_one_liner = 0 # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 0 # number +nl_before_block_comment = 0 # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # Whether to force a newline after a multi-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # The number of newlines after '}' or ';' of a struct/enum/union definition -nl_after_struct = 0 # number +nl_after_struct = 0 # The number of newlines after '}' or ';' of a class definition -nl_after_class = 0 # number +nl_after_class = 0 # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 0 # number +nl_before_access_spec = 0 # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # The number of newlines between a function def and the function comment. # 0 = No change. -nl_comment_func_def = 0 # number +nl_comment_func_def = 0 # The number of newlines after a try-catch-finally block that isn't followed by a brace close. # 0 = No change. -nl_after_try_catch_finally = 0 # number +nl_after_try_catch_finally = 0 # The number of newlines before and after a property, indexer or event decl. # 0 = No change. -nl_around_cs_property = 0 # number +nl_around_cs_property = 0 # The number of newlines between the get/set/add/remove handlers in C#. # 0 = No change. -nl_between_get_set = 0 # number +nl_between_get_set = 0 # Add or remove newline between C# property and the '{' -nl_property_brace = ignore # ignore/add/remove/force +nl_property_brace = ignore # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # How aggressively to remove extra newlines not in preproc. # 0: No change # 1: Remove most newlines not handled by other config # 2: Remove all newlines and reformat completely by config -nl_remove_extra_newlines = 0 # number +nl_remove_extra_newlines = 0 # Whether to put a blank line before 'return' statements, unless after an open brace. -nl_before_return = false # false/true +nl_before_return = false # Whether to put a blank line after 'return' statements, unless followed by a close brace. -nl_after_return = false # false/true +nl_after_return = false # Whether to put a newline after a Java annotation statement. # Only affects annotations that are after a newline. -nl_after_annotation = ignore # ignore/add/remove/force +nl_after_annotation = ignore # Controls the newline between two annotations. -nl_between_annotation = ignore # ignore/add/remove/force +nl_between_annotation = ignore # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = ignore # ignore/add/remove/force +mod_full_brace_do = ignore # Add or remove braces on single-line 'for' statement -mod_full_brace_for = remove # ignore/add/remove/force +mod_full_brace_for = remove # Add or remove braces on single-line function definitions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = remove # ignore/add/remove/force +mod_full_brace_if = remove # Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if. # If any must be braced, they are all braced. If all can be unbraced, then the braces are removed. -mod_full_brace_if_chain = true # false/true +mod_full_brace_if_chain = true # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 2 # number +mod_full_brace_nl = 2 # Add or remove braces on single-line 'while' statement -mod_full_brace_while = remove # ignore/add/remove/force +mod_full_brace_while = remove # Add or remove braces on single-line 'using ()' statement -mod_full_brace_using = ignore # ignore/add/remove/force +mod_full_brace_using = ignore # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = remove # ignore/add/remove/force +mod_paren_on_return = remove # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = false # false/true +mod_full_paren_if_bool = false # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = true # false/true +mod_remove_extra_semicolon = true # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 0 # number +mod_add_long_function_closebrace_comment = 0 # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number +mod_add_long_switch_closebrace_comment = 0 # If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after # the #endif, a comment will be added. -mod_add_long_ifdef_endif_comment = 0 # number +mod_add_long_ifdef_endif_comment = 0 # If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after # the #else, a comment will be added. -mod_add_long_ifdef_else_comment = 0 # number +mod_add_long_ifdef_else_comment = 0 # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = true # false/true +mod_move_case_break = true # Will add or remove the braces around a fully braced case statement. # Will only remove the braces if there are no variable declarations in the block. mod_case_brace = remove # remove/add/remove/force # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = true # false/true +mod_remove_empty_return = true # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # Set the comment reflow mode (default: 0) # 0: no reflowing (apart from the line wrapping due to cmt_width) # 1: no touching at all # 2: full reflow -cmt_reflow_mode = 0 # number +cmt_reflow_mode = 0 # If false, disable all multi-line comment changes, including cmt_width. keyword substitution, and leading chars. # Default is true. -cmt_indent_multi = false # false/true +cmt_indent_multi = false # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_footer = "" # string +cmt_insert_file_footer = "" # The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment. # Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment. # Will substitute $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # The filename that contains text to insert before a Obj-C message specification if the method isn't preceeded with a C/C++ comment. # Will substitute $(message) with the function name and $(javaparam) with the javadoc @param and @return stuff. -cmt_insert_oc_msg_header = "" # string +cmt_insert_oc_msg_header = "" # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_oc_msg_header, cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true +cmt_insert_before_preproc = false # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. -pp_indent_count = 1 # number +pp_indent_count = 1 # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true +pp_if_indent_code = false # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/java_foreach.cfg b/tests/config/java_foreach.cfg index 4fd00afddc..a6d2a2a11a 100644 --- a/tests/config/java_foreach.cfg +++ b/tests/config/java_foreach.cfg @@ -106,90 +106,90 @@ pp_if_indent_code = false pp_define_at_level = false indent_with_tabs = 0 -indent_columns = 4 # number -nl_start_of_file = remove # ignore/add/remove/force -nl_start_of_file_min = 0 # number -nl_end_of_file = add # ignore/add/remove/force -nl_end_of_file_min = 1 # number -nl_if_brace = remove # ignore/add/remove/force -nl_brace_else = add # ignore/add/remove/force -nl_elseif_brace = remove # ignore/add/remove/force -nl_else_brace = remove # ignore/add/remove/force -nl_else_if = remove # ignore/add/remove/force -nl_brace_finally = add # ignore/add/remove/force -nl_finally_brace = remove # ignore/add/remove/force -nl_try_brace = remove # ignore/add/remove/force -nl_getset_brace = remove # ignore/add/remove/force -nl_for_brace = remove # ignore/add/remove/force -nl_catch_brace = remove # ignore/add/remove/force -nl_brace_catch = add # ignore/add/remove/force -nl_while_brace = remove # ignore/add/remove/force -nl_do_brace = remove # ignore/add/remove/force -nl_brace_while = add # ignore/add/remove/force -nl_switch_brace = remove # ignore/add/remove/force -nl_class_brace = remove # ignore/add/remove/force -nl_class_init_args = remove # ignore/add/remove/force -nl_func_type_name = remove # ignore/add/remove/force -nl_func_type_name_class = remove # ignore/add/remove/force -nl_func_decl_empty = remove # ignore/add/remove/force -nl_func_def_empty = remove # ignore/add/remove/force -sp_arith = add # ignore/add/remove/force -sp_assign = add # ignore/add/remove/force -sp_assign_default = add # ignore/add/remove/force -sp_enum_assign = add # ignore/add/remove/force -sp_bool = add # ignore/add/remove/force -sp_compare = add # ignore/add/remove/force -sp_inside_paren = remove # ignore/add/remove/force -sp_paren_brace = add # ignore/add/remove/force -sp_before_angle = remove # ignore/add/remove/force -sp_inside_angle = remove # ignore/add/remove/force -sp_after_angle = remove # ignore/add/remove/force -sp_angle_paren = remove # ignore/add/remove/force -sp_angle_paren_empty = remove # ignore/add/remove/force -sp_angle_word = add # ignore/add/remove/force -sp_before_sparen = add # ignore/add/remove/force -sp_inside_sparen = remove # ignore/add/remove/force -sp_after_sparen = add # ignore/add/remove/force -sp_sparen_brace = add # ignore/add/remove/force -sp_before_squares = remove # ignore/add/remove/force -sp_inside_square = remove # ignore/add/remove/force -sp_after_comma = add # ignore/add/remove/force -code_width = 80 # number -ls_code_width = true # false/true -pos_arith = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force -pos_assign = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force -pos_bool = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force -pos_compare = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force -pos_conditional = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force -pos_comma = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force -pos_class_comma = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force -pos_class_colon = trail # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force -sp_after_cast = add # ignore/add/remove/force -sp_inside_paren_cast = remove # ignore/add/remove/force -sp_after_type = add # ignore/add/remove/force -sp_annotation_paren = remove # ignore/add/remove/force -nl_after_annotation = add # ignore/add/remove/force -nl_between_annotation = add # ignore/add/remove/force +indent_columns = 4 +nl_start_of_file = remove +nl_start_of_file_min = 0 +nl_end_of_file = add +nl_end_of_file_min = 1 +nl_if_brace = remove +nl_brace_else = add +nl_elseif_brace = remove +nl_else_brace = remove +nl_else_if = remove +nl_brace_finally = add +nl_finally_brace = remove +nl_try_brace = remove +nl_getset_brace = remove +nl_for_brace = remove +nl_catch_brace = remove +nl_brace_catch = add +nl_while_brace = remove +nl_do_brace = remove +nl_brace_while = add +nl_switch_brace = remove +nl_class_brace = remove +nl_class_init_args = remove +nl_func_type_name = remove +nl_func_type_name_class = remove +nl_func_decl_empty = remove +nl_func_def_empty = remove +sp_arith = add +sp_assign = add +sp_assign_default = add +sp_enum_assign = add +sp_bool = add +sp_compare = add +sp_inside_paren = remove +sp_paren_brace = add +sp_before_angle = remove +sp_inside_angle = remove +sp_after_angle = remove +sp_angle_paren = remove +sp_angle_paren_empty = remove +sp_angle_word = add +sp_before_sparen = add +sp_inside_sparen = remove +sp_after_sparen = add +sp_sparen_brace = add +sp_before_squares = remove +sp_inside_square = remove +sp_after_comma = add +code_width = 80 +ls_code_width = true +pos_arith = trail +pos_assign = trail +pos_bool = trail +pos_compare = trail +pos_conditional = trail +pos_comma = trail +pos_class_comma = trail +pos_class_colon = trail +sp_after_cast = add +sp_inside_paren_cast = remove +sp_after_type = add +sp_annotation_paren = remove +nl_after_annotation = add +nl_between_annotation = add # The maximum consecutive newlines -nl_max = 2 # number +nl_max = 2 # sp_angle_shift cannot remove the space without this option. -sp_permit_cpp11_shift = true # false/true +sp_permit_cpp11_shift = true # Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add -sp_angle_shift = remove # ignore/add/remove/force +sp_angle_shift = remove # Add or remove space before '<>' -sp_before_angle = remove # ignore/add/remove/force +sp_before_angle = remove # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # Add or remove space after '<>' -sp_after_angle = add # ignore/add/remove/force +sp_after_angle = add # Add or remove space between ')' and '{' of function -sp_fparen_brace = add # ignore/add/remove/force +sp_fparen_brace = add sp_after_for_colon = force sp_before_for_colon = remove diff --git a/tests/config/java_synchronized_1.cfg b/tests/config/java_synchronized_1.cfg index 24faaece55..20713b3fdf 100644 --- a/tests/config/java_synchronized_1.cfg +++ b/tests/config/java_synchronized_1.cfg @@ -1,6 +1,6 @@ -nl_synchronized_brace = force # ignore/add/remove/force -nl_before_synchronized = force # ignore/add/remove/force -nl_after_synchronized = force # ignore/add/remove/force +nl_synchronized_brace = force +nl_before_synchronized = force +nl_after_synchronized = force nl_remove_extra_newlines = 2 nl_class_brace = force indent_class = true diff --git a/tests/config/java_synchronized_2.cfg b/tests/config/java_synchronized_2.cfg index d26b2daa92..ece2c189d4 100644 --- a/tests/config/java_synchronized_2.cfg +++ b/tests/config/java_synchronized_2.cfg @@ -1,6 +1,6 @@ -nl_synchronized_brace = force # ignore/add/remove/force -nl_before_synchronized = remove # ignore/add/remove/force -nl_after_synchronized = remove # ignore/add/remove/force +nl_synchronized_brace = force +nl_before_synchronized = remove +nl_after_synchronized = remove nl_remove_extra_newlines = 2 nl_class_brace = remove indent_class = true diff --git a/tests/config/kw_subst3.cfg b/tests/config/kw_subst3.cfg index 1236ee636c..e1cdde85ac 100644 --- a/tests/config/kw_subst3.cfg +++ b/tests/config/kw_subst3.cfg @@ -5,19 +5,19 @@ # # The type of line endings -newlines = auto # auto/lf/crlf/cr +newlines = auto # The original size of tabs in the input -input_tab_size = 4 # number +input_tab_size = 4 # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 4 # number +output_tab_size = 4 # The ascii value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # # Indenting @@ -25,940 +25,940 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 4 # number +indent_columns = 4 # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # Whether to indent strings broken by '\' so that they line up -indent_align_string = false # false/true +indent_align_string = false # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # Whether the 'class' body is indented -indent_class = false # false/true +indent_class = false # Whether to indent the stuff after a leading class colon -indent_class_colon = false # false/true +indent_class_colon = false # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = false # false/true +indent_func_call_param = false # Same as indent_func_call_param, but for function defs -indent_func_def_param = false # false/true +indent_func_def_param = false # Same as indent_func_call_param, but for function protos -indent_func_proto_param = false # false/true +indent_func_proto_param = false # Same as indent_func_call_param, but for class declarations -indent_func_class_param = false # false/true +indent_func_class_param = false # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = false # false/true +indent_func_ctor_var_param = false # Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true +indent_func_param_double = false # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 0 # number +indent_member = 0 # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = false # false/true +indent_relative_single_line_comments = false # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 4 # number +indent_switch_case = 4 # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 0 # number +indent_case_brace = 0 # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 0 # number +indent_paren_close = 0 # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = add # ignore/add/remove/force +sp_arith = add # Add or remove space around assignment operator '=', '+=', etc -sp_assign = add # ignore/add/remove/force +sp_assign = add # Add or remove space around assignment '=' in enum -sp_enum_assign = add # ignore/add/remove/force +sp_enum_assign = add # Add or remove space around boolean operators '&&' and '||' -sp_bool = add # ignore/add/remove/force +sp_bool = add # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = add # ignore/add/remove/force +sp_compare = add # Add or remove space inside '(' and ')' -sp_inside_paren = ignore # ignore/add/remove/force +sp_inside_paren = ignore # Add or remove space between nested parens -sp_paren_paren = ignore # ignore/add/remove/force +sp_paren_paren = ignore # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # Add or remove space before pointer star '*' -sp_before_ptr_star = ignore # ignore/add/remove/force +sp_before_ptr_star = ignore # Add or remove space between pointer stars '*' -sp_between_ptr_star = ignore # ignore/add/remove/force +sp_between_ptr_star = ignore # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = ignore # ignore/add/remove/force +sp_after_ptr_star = ignore # Add or remove space before reference sign '&' -sp_before_byref = ignore # ignore/add/remove/force +sp_before_byref = ignore # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = ignore # ignore/add/remove/force +sp_after_byref = ignore # Add or remove space between type and word -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # Add or remove space before '<>' -sp_before_angle = ignore # ignore/add/remove/force +sp_before_angle = ignore # Add or remove space after '<>' -sp_after_angle = ignore # ignore/add/remove/force +sp_after_angle = ignore # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = ignore # ignore/add/remove/force +sp_angle_paren = ignore # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = ignore # ignore/add/remove/force +sp_angle_word = ignore # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = add # ignore/add/remove/force +sp_before_sparen = add # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = add # ignore/add/remove/force +sp_after_sparen = add # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = add # ignore/add/remove/force +sp_sparen_brace = add # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = add # ignore/add/remove/force +sp_special_semi = add # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = ignore # ignore/add/remove/force +sp_before_semi_for = ignore # Add or remove space before a semicolon of an empty part of a for statment. -sp_before_semi_for_empty = ignore # ignore/add/remove/force +sp_before_semi_for_empty = ignore # Add or remove space after the final semicolon of an empty part of a for statment: for ( ; ; ). -sp_after_semi_for_empty = ignore # ignore/add/remove/force +sp_after_semi_for_empty = ignore # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # Add or remove space inside '[' and ']' -sp_inside_square = ignore # ignore/add/remove/force +sp_inside_square = ignore # Add or remove space after ',' -sp_after_comma = add # ignore/add/remove/force +sp_after_comma = add # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # Add or remove space after class ':' -sp_after_class_colon = ignore # ignore/add/remove/force +sp_after_class_colon = ignore # Add or remove space before class ':' -sp_before_class_colon = ignore # ignore/add/remove/force +sp_before_class_colon = ignore # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # Add or remove space after cast -sp_after_cast = ignore # ignore/add/remove/force +sp_after_cast = ignore # Add or remove spaces inside cast parens -sp_inside_paren_cast = ignore # ignore/add/remove/force +sp_inside_paren_cast = ignore # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = ignore # ignore/add/remove/force +sp_inside_braces_enum = ignore # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = ignore # ignore/add/remove/force +sp_inside_braces_struct = ignore # Add or remove space inside '{' and '}' -sp_inside_braces = ignore # ignore/add/remove/force +sp_inside_braces = ignore # Add or remove space inside '<' and '>' -sp_inside_angle = ignore # ignore/add/remove/force +sp_inside_angle = ignore # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = add # ignore/add/remove/force +sp_type_func = add # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # Add or remove space between ')' and '{' of function -sp_fparen_brace = ignore # ignore/add/remove/force +sp_fparen_brace = ignore # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = ignore # ignore/add/remove/force +sp_func_class_paren = ignore # Add or remove space between 'return' and '(' -sp_return_paren = ignore # ignore/add/remove/force +sp_return_paren = ignore # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = add # ignore/add/remove/force +sp_else_brace = add # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # Add or remove space before the '::' operator -sp_before_dc = ignore # ignore/add/remove/force +sp_before_dc = ignore # Add or remove space after the '::' operator -sp_after_dc = ignore # ignore/add/remove/force +sp_after_dc = ignore # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # Add or remove space after the '!' (not) operator. -sp_not = remove # ignore/add/remove/force +sp_not = remove # Add or remove space after the '~' (invert) operator. -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # Add or remove space after the '&' (address-of) operator. # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # Add or remove space around the '.' or '->' operators -sp_member = remove # ignore/add/remove/force +sp_member = remove # Add or remove space after the '*' (dereference) operator. # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7' -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;' -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force +sp_after_oc_scope = ignore # Add or remove space after the colon in message specs # '-(int) f: (int) x;' vs '+(int) f : (int) x;' -sp_before_oc_colon = ignore # ignore/add/remove/force +sp_before_oc_colon = ignore # Add or remove space after the (type) in message specs # '-(int) f: (int) x;' vs '+(int)f : (int)x;' -sp_after_oc_type = ignore # ignore/add/remove/force +sp_after_oc_type = ignore # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # Align variable definitions in prototypes and functions -align_func_params = false # false/true +align_func_params = false # The span for aligning variable definitions (0=don't align) -align_var_def_span = 10 # number +align_var_def_span = 10 # How to align the star in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_star_style = 1 # number +align_var_def_star_style = 1 # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 1 # number +align_var_def_amp_style = 1 # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # Whether to align the colon in struct bit fields -align_var_def_colon = true # false/true +align_var_def_colon = true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = false # false/true +align_var_def_inline = false # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 10 # number +align_assign_span = 10 # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 4 # number +align_assign_thresh = 4 # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 10 # number +align_enum_equ_span = 10 # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # The span for aligning struct/union (0=don't align) -align_var_struct_span = 0 # number +align_var_struct_span = 0 # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 0 # number +align_struct_init_span = 0 # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number +align_typedef_gap = 0 # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 0 # number +align_typedef_span = 0 # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typdef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 0 # number +align_right_cmt_span = 0 # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true +align_single_line_func = false # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # The span for aligning ObjC msg spec (0=don't align) -align_oc_msg_spec_span = 0 # number +align_oc_msg_spec_span = 0 # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = false # false/true +align_nl_cont = false # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 0 # number +align_pp_define_gap = 0 # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 0 # number +align_pp_define_span = 0 # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = false # false/true +nl_assign_leave_one_liners = false # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = false # false/true +nl_class_leave_one_liners = false # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = false # false/true +nl_enum_leave_one_liners = false # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # Add or remove newlines at the start of the file -nl_start_of_file = ignore # ignore/add/remove/force +nl_start_of_file = ignore # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # Add or remove newline at the end of the file -nl_end_of_file = add # ignore/add/remove/force +nl_end_of_file = add # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # Add or remove newline between '=' and '{' -nl_assign_brace = add # ignore/add/remove/force +nl_assign_brace = add # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = ignore # ignore/add/remove/force +nl_fcall_brace = ignore # Add or remove newline between 'enum' and '{' -nl_enum_brace = add # ignore/add/remove/force +nl_enum_brace = add # Add or remove newline between 'struct and '{' -nl_struct_brace = add # ignore/add/remove/force +nl_struct_brace = add # Add or remove newline between 'union' and '{' -nl_union_brace = add # ignore/add/remove/force +nl_union_brace = add # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = add # ignore/add/remove/force +nl_elseif_brace = add # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # Add or remove newline between '}' and 'finally' -nl_brace_finally = ignore # ignore/add/remove/force +nl_brace_finally = ignore # Add or remove newline between 'finally' and '{' -nl_finally_brace = ignore # ignore/add/remove/force +nl_finally_brace = ignore # Add or remove newline between 'try' and '{' -nl_try_brace = ignore # ignore/add/remove/force +nl_try_brace = ignore # Add or remove newline between get/set and '{' -nl_getset_brace = ignore # ignore/add/remove/force +nl_getset_brace = ignore # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # Add or remove newline between 'catch' and '{' -nl_catch_brace = ignore # ignore/add/remove/force +nl_catch_brace = ignore # Add or remove newline between '}' and 'catch' -nl_brace_catch = ignore # ignore/add/remove/force +nl_brace_catch = ignore # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = ignore # ignore/add/remove/force +nl_brace_while = ignore # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # Add or remove newline when condition spans two or more lines -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = false # false/true +nl_multi_line_define = false # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # Newline between namespace and { -nl_namespace_brace = ignore # ignore/add/remove/force +nl_namespace_brace = ignore # Add or remove newline between 'template<>' and 'class' -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # Add or remove newline between return type and function name in definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = ignore # ignore/add/remove/force +nl_func_proto_type_name = ignore # Add or remove newline between a function name and the opening '(' -nl_func_paren = ignore # ignore/add/remove/force +nl_func_paren = ignore # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # Whether to put a newline after 'return' statement -nl_after_return = true # false/true +nl_after_return = true # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = true # false/true +nl_after_brace_open = true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = true # false/true +nl_after_brace_open_cmt = true # Whether to put a newline after a virtual brace open. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = false # false/true +nl_after_vbrace_open = false # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true +nl_squeeze_ifdef = false # Add or remove newline before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # Add or remove newline after 'if' -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # Add or remove newline before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # Add or remove newline after 'for' -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # Add or remove newline before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # Add or remove newline after 'while' -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # Add or remove newline before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # Add or remove newline after 'switch' -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # Add or remove newline before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # Add or remove newline after 'do' -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # Whether to double-space before the close brace of a struct/union/enum -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # # Positioning options # # The position of boolean operators in wrapped expressions -pos_bool = ignore # ignore/lead/trail +pos_bool = ignore # The position of the comma in wrapped expressions -pos_comma = ignore # ignore/lead/trail +pos_comma = ignore # The position of the comma in the constructor initialization list -pos_class_comma = ignore # ignore/lead/trail +pos_class_comma = ignore # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true +ls_for_split_full = false # Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true +ls_func_split_full = false # # Blank line options # # The maximum consecutive newlines -nl_max = 0 # number +nl_max = 0 # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 4 # number +nl_after_func_proto_group = 4 # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 4 # number +nl_after_func_body = 4 # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 4 # number +nl_after_func_body_one_liner = 4 # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 0 # number +nl_before_block_comment = 0 # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # Whether to force a newline after a mulit-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 0 # number +nl_before_access_spec = 0 # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = false # false/true +eat_blanks_after_open_brace = false # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = false # false/true +eat_blanks_before_close_brace = false # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # Add or remove braces on single-line 'if' statement -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = ignore # ignore/add/remove/force +mod_paren_on_return = ignore # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = false # false/true +mod_full_paren_if_bool = false # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = true # false/true +mod_remove_extra_semicolon = true # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 50 # number +mod_add_long_function_closebrace_comment = 50 # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 50 # number +mod_add_long_switch_closebrace_comment = 50 # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # Whether to mess with the indent of multi-line comments -cmt_indent_multi = true # false/true +cmt_indent_multi = true # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 1 # number +cmt_sp_before_star_cont = 1 # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitue $(filename) with the current file's name. -cmt_insert_file_header = "file_header.txt" # string -cmt_insert_file_footer = "file_footer.txt" # string +cmt_insert_file_header = "file_header.txt" +cmt_insert_file_footer = "file_footer.txt" # The filename that contains text to insert before a function implementation if the function isn't preceeded with a C/C++ comment. # Will substitue $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "function_header.txt" # string +cmt_insert_func_header = "function_header.txt" # The filename that contains text to insert before a class if the class isn't preceeded with a C/C++ comment. # Will substitue $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = true # false/true +pp_indent_at_level = true # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = true # false/true +pp_if_indent_code = true # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = true # false/true +pp_define_at_level = true # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/libd.cfg b/tests/config/libd.cfg index 04e5450072..6a7b230719 100644 --- a/tests/config/libd.cfg +++ b/tests/config/libd.cfg @@ -193,5 +193,5 @@ nl_template_class = remove nl_class_brace = remove nl_func_scope_name = remove nl_fdef_brace = remove -nl_fcall_brace = remove # "foo() {" vs "foo()\n{" +nl_fcall_brace = remove diff --git a/tests/config/mod-paren.cfg b/tests/config/mod-paren.cfg index 55999aee8f..abefbe0878 100644 --- a/tests/config/mod-paren.cfg +++ b/tests/config/mod-paren.cfg @@ -8,506 +8,506 @@ # # The type of line endings -newlines = lf # auto/lf/crlf/cr +newlines = lf # The original size of tabs in the input -input_tab_size = 8 # number +input_tab_size = 8 # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 3 # number +output_tab_size = 3 # The ascii value of the string escape char, usually 92 (\). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # # Indenting # # The number of columns to indent per level (usually 2, 3, 4, or 8) -indent_columns = 3 # number +indent_columns = 3 # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # Whether to indent the stuff after a leading class colon -indent_class_colon = false # false/true +indent_class_colon = false # Whether to indent continued function call parameters one indent level (true) or aligns instead of indent (false) -indent_func_call_param = false # false/true +indent_func_call_param = false # The number of spaces to indent a continued '->' or '.' # Usually set to indent_columns. -indent_member = 3 # number +indent_member = 3 # Spaces to indent 'case' from 'switch' -indent_switch_case = 0 # number +indent_switch_case = 0 # Spaces to indent '{' from 'case' -indent_case_brace = 0 # number +indent_case_brace = 0 # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # How to indent goto labels (>0=absolute column where 1 is the leftmost column, <=0=subtract from brace indent) -indent_label = 1 # number +indent_label = 1 # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # Add or remove space after pointer star '*' -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # Add or remove space before reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # Add or remove space after reference sign '&' -sp_after_byref = ignore # ignore/add/remove/force +sp_after_byref = ignore # Add or remove space before '<>' -sp_before_angle = force # ignore/add/remove/force +sp_before_angle = force # Add or remove space after '<>' -sp_after_angle = force # ignore/add/remove/force +sp_after_angle = force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = add # ignore/add/remove/force +sp_sparen_brace = add # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # Add or remove space after cast -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = force # ignore/add/remove/force +sp_inside_braces_enum = force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = force # ignore/add/remove/force +sp_inside_braces_struct = force # Add or remove space inside '{' and '}' -sp_inside_braces = force # ignore/add/remove/force +sp_inside_braces = force # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # Add or remove space between return type and function name (a minimum of 1 is forced except for pointer return types) -sp_type_func = ignore # ignore/add/remove/force +sp_type_func = ignore # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # Add or remove space inside empty function '()' -sp_inside_fparens = ignore # ignore/add/remove/force +sp_inside_fparens = ignore # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # Add or remove space between ')' and '{' of function -sp_fparen_brace = add # ignore/add/remove/force +sp_fparen_brace = add # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # Add or remove space between 'return' and '(' -sp_return_paren = remove # ignore/add/remove/force +sp_return_paren = remove # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = ignore # ignore/add/remove/force +sp_else_brace = ignore # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # Whether to right-align numbers -align_number_right = true # false/true +align_number_right = true align_func_params = true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 1 # number +align_var_def_span = 1 # Whether the pointer star is part of the variable name or not -align_var_def_star_style = 1 # number +align_var_def_star_style = 1 # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 12 # number +align_var_def_thresh = 12 # Whether to align the colon in struct bit fields -align_var_def_colon = true # false/true +align_var_def_colon = true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = true # false/true +align_var_def_inline = true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 1 # number +align_assign_span = 1 # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 12 # number +align_assign_thresh = 12 # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 16 # number +align_enum_equ_span = 16 # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # The span for aligning struct/union (0=don't align) -align_var_struct_span = 99 # number +align_var_struct_span = 99 # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 3 # number +align_struct_init_span = 3 # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 3 # number +align_typedef_gap = 3 # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 5 # number +align_typedef_span = 5 # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type: typedef int * pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 3 # number +align_right_cmt_span = 3 # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # Whether to align macros wrapped with a backslash and a newline -align_nl_cont = true # false/true +align_nl_cont = true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 4 # number +align_pp_define_gap = 4 # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 3 # number +align_pp_define_span = 3 # # Newline adding and removing options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # Don't touch one-line function bodies inside a class xx { } body -nl_class_leave_one_liners = true # false/true +nl_class_leave_one_liners = true # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # Add or remove newline between '=' and '{' -nl_assign_brace = add # ignore/add/remove/force +nl_assign_brace = add # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # Add or remove newline between function call and '(' -nl_fcall_brace = add # ignore/add/remove/force +nl_fcall_brace = add # Add or remove newline between 'enum' and '{' -nl_enum_brace = add # ignore/add/remove/force +nl_enum_brace = add # Add or remove newline between 'struct and '{' -nl_struct_brace = add # ignore/add/remove/force +nl_struct_brace = add # Add or remove newline between 'union' and '{' -nl_union_brace = add # ignore/add/remove/force +nl_union_brace = add # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = ignore # ignore/add/remove/force +nl_elseif_brace = ignore # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # Newline between namespace and { -nl_namespace_brace = ignore # ignore/add/remove/force +nl_namespace_brace = ignore # Add or remove newline between 'template<>' and 'class' -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # Add or remove newline between return type and function name in definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # Whether to put a newline after 'return' statement -nl_after_return = true # false/true +nl_after_return = true # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # Whether to put a newline after brace open -nl_after_brace_open = true # false/true +nl_after_brace_open = true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = true # false/true +nl_squeeze_ifdef = true # # Positioning options # # The position of boolean operators in wrapped expressions -pos_bool = trail # ignore/lead/trail +pos_bool = trail # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # # Blank line options # # The maximum consecutive newlines -nl_max = 4 # number +nl_max = 4 # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # The number of newlines after '}' of the function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # The minimum number of newlines before a multi-line comment (doesn't apply if after a brace open) -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # Add or remove braces on single-line 'if' statement -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = add # ignore/add/remove/force +mod_paren_on_return = add # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # # Comment modifications # # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # Whether to put a star on subsequent comment lines -cmt_star_cont = true # false/true +cmt_star_cont = true # # Preprocessor options # # Add or remove indent of preprocessor directives -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # Add or remove space between # and, say, define -pp_space = ignore # ignore/add/remove/force +pp_space = ignore nl_getset_brace = force diff --git a/tests/config/mod-paren2.cfg b/tests/config/mod-paren2.cfg index 843153cc1d..c5eaf546ff 100644 --- a/tests/config/mod-paren2.cfg +++ b/tests/config/mod-paren2.cfg @@ -10,506 +10,506 @@ # # The type of line endings -newlines = lf # auto/lf/crlf/cr +newlines = lf # The original size of tabs in the input -input_tab_size = 8 # number +input_tab_size = 8 # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 3 # number +output_tab_size = 3 # The ascii value of the string escape char, usually 92 (\). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # # Indenting # # The number of columns to indent per level (usually 2, 3, 4, or 8) -indent_columns = 3 # number +indent_columns = 3 # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # Whether to indent the stuff after a leading class colon -indent_class_colon = false # false/true +indent_class_colon = false # Whether to indent continued function call parameters one indent level (true) or aligns instead of indent (false) -indent_func_call_param = false # false/true +indent_func_call_param = false # The number of spaces to indent a continued '->' or '.' # Usually set to indent_columns. -indent_member = 3 # number +indent_member = 3 # Spaces to indent 'case' from 'switch' -indent_switch_case = 0 # number +indent_switch_case = 0 # Spaces to indent '{' from 'case' -indent_case_brace = 0 # number +indent_case_brace = 0 # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # How to indent goto labels (>0=absolute column where 1 is the leftmost column, <=0=subtract from brace indent) -indent_label = 1 # number +indent_label = 1 # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # Add or remove space after pointer star '*' -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # Add or remove space before reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # Add or remove space after reference sign '&' -sp_after_byref = ignore # ignore/add/remove/force +sp_after_byref = ignore # Add or remove space before '<>' -sp_before_angle = force # ignore/add/remove/force +sp_before_angle = force # Add or remove space after '<>' -sp_after_angle = force # ignore/add/remove/force +sp_after_angle = force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = add # ignore/add/remove/force +sp_sparen_brace = add # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # Add or remove space after cast -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = force # ignore/add/remove/force +sp_inside_braces_enum = force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = force # ignore/add/remove/force +sp_inside_braces_struct = force # Add or remove space inside '{' and '}' -sp_inside_braces = force # ignore/add/remove/force +sp_inside_braces = force # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # Add or remove space between return type and function name (a minimum of 1 is forced except for pointer return types) -sp_type_func = ignore # ignore/add/remove/force +sp_type_func = ignore # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # Add or remove space inside empty function '()' -sp_inside_fparens = ignore # ignore/add/remove/force +sp_inside_fparens = ignore # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # Add or remove space between ')' and '{' of function -sp_fparen_brace = add # ignore/add/remove/force +sp_fparen_brace = add # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # Add or remove space between 'return' and '(' -sp_return_paren = remove # ignore/add/remove/force +sp_return_paren = remove # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = ignore # ignore/add/remove/force +sp_else_brace = ignore # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # Whether to right-align numbers -align_number_right = true # false/true +align_number_right = true align_func_params = true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 1 # number +align_var_def_span = 1 # Whether the pointer star is part of the variable name or not -align_var_def_star_style = 1 # number +align_var_def_star_style = 1 # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 12 # number +align_var_def_thresh = 12 # Whether to align the colon in struct bit fields -align_var_def_colon = true # false/true +align_var_def_colon = true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = true # false/true +align_var_def_inline = true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 1 # number +align_assign_span = 1 # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 12 # number +align_assign_thresh = 12 # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 16 # number +align_enum_equ_span = 16 # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # The span for aligning struct/union (0=don't align) -align_var_struct_span = 99 # number +align_var_struct_span = 99 # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 3 # number +align_struct_init_span = 3 # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 3 # number +align_typedef_gap = 3 # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 5 # number +align_typedef_span = 5 # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type: typedef int * pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 3 # number +align_right_cmt_span = 3 # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # Whether to align macros wrapped with a backslash and a newline -align_nl_cont = true # false/true +align_nl_cont = true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 4 # number +align_pp_define_gap = 4 # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 3 # number +align_pp_define_span = 3 # # Newline adding and removing options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # Don't touch one-line function bodies inside a class xx { } body -nl_class_leave_one_liners = true # false/true +nl_class_leave_one_liners = true # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # Add or remove newline between '=' and '{' -nl_assign_brace = add # ignore/add/remove/force +nl_assign_brace = add # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # Add or remove newline between function call and '(' -nl_fcall_brace = add # ignore/add/remove/force +nl_fcall_brace = add # Add or remove newline between 'enum' and '{' -nl_enum_brace = add # ignore/add/remove/force +nl_enum_brace = add # Add or remove newline between 'struct and '{' -nl_struct_brace = add # ignore/add/remove/force +nl_struct_brace = add # Add or remove newline between 'union' and '{' -nl_union_brace = add # ignore/add/remove/force +nl_union_brace = add # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = ignore # ignore/add/remove/force +nl_elseif_brace = ignore # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # Newline between namespace and { -nl_namespace_brace = ignore # ignore/add/remove/force +nl_namespace_brace = ignore # Add or remove newline between 'template<>' and 'class' -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # Add or remove newline between return type and function name in definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # Whether to put a newline after 'return' statement -nl_after_return = true # false/true +nl_after_return = true # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # Whether to put a newline after brace open -nl_after_brace_open = true # false/true +nl_after_brace_open = true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = true # false/true +nl_squeeze_ifdef = true # # Positioning options # # The position of boolean operators in wrapped expressions -pos_bool = trail # ignore/lead/trail +pos_bool = trail # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # # Blank line options # # The maximum consecutive newlines -nl_max = 4 # number +nl_max = 4 # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # The number of newlines after '}' of the function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # The minimum number of newlines before a multi-line comment (doesn't apply if after a brace open) -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # Add or remove braces on single-line 'if' statement -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = remove # ignore/add/remove/force +mod_paren_on_return = remove # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # # Comment modifications # # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # Whether to put a star on subsequent comment lines -cmt_star_cont = true # false/true +cmt_star_cont = true # # Preprocessor options # # Add or remove indent of preprocessor directives -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # Add or remove space between # and, say, define -pp_space = ignore # ignore/add/remove/force +pp_space = ignore nl_getset_brace = force diff --git a/tests/config/mod_case_brace_add.cfg b/tests/config/mod_case_brace_add.cfg index c27304fa25..12e6cc06c8 100644 --- a/tests/config/mod_case_brace_add.cfg +++ b/tests/config/mod_case_brace_add.cfg @@ -7,19 +7,19 @@ mod_case_brace = add # # The type of line endings -newlines = lf # auto/lf/crlf/cr +newlines = lf # The original size of tabs in the input -input_tab_size = 8 # number +input_tab_size = 8 # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 3 # number +output_tab_size = 3 # The ascii value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # # Indenting @@ -27,1142 +27,1142 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 3 # number +indent_columns = 3 # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # Whether the 'extern "C"' body is indented -indent_extern = false # false/true +indent_extern = false # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # Whether to indent the stuff after a leading class colon -indent_class_colon = true # false/true +indent_class_colon = true # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level -indent_else_if = false # false/true +indent_else_if = false # Amount to indent variable declarations after a open brace. neg=relative, pos=absolute -indent_var_def_blk = 0 # number +indent_var_def_blk = 0 # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = false # false/true +indent_func_call_param = false # Same as indent_func_call_param, but for function defs -indent_func_def_param = false # false/true +indent_func_def_param = false # Same as indent_func_call_param, but for function protos -indent_func_proto_param = false # false/true +indent_func_proto_param = false # Same as indent_func_call_param, but for class declarations -indent_func_class_param = false # false/true +indent_func_class_param = false # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = false # false/true +indent_func_ctor_var_param = false # Same as indent_func_call_param, but for templates -indent_template_param = false # false/true +indent_template_param = false # Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true +indent_func_param_double = false # Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 0 # number +indent_func_const = 0 # Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 0 # number +indent_func_throw = 0 # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 3 # number +indent_member = 3 # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = false # false/true +indent_relative_single_line_comments = false # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 0 # number +indent_switch_case = 0 # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 3 # number +indent_case_brace = 3 # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 0 # number +indent_paren_close = 0 # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # Align continued statements at the '='. Default=True # If FALSE or the '=' is followed by a newline, the next line is indent one tab. -indent_align_assign = true # false/true +indent_align_assign = true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. -sp_before_assign = ignore # ignore/add/remove/force +sp_before_assign = ignore # Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. -sp_after_assign = ignore # ignore/add/remove/force +sp_after_assign = ignore # Add or remove space around assignment '=' in enum -sp_enum_assign = ignore # ignore/add/remove/force +sp_enum_assign = ignore # Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_before_assign = ignore # ignore/add/remove/force +sp_enum_before_assign = ignore # Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_after_assign = ignore # ignore/add/remove/force +sp_enum_after_assign = ignore # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force +sp_before_unnamed_ptr_star = ignore # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = ignore # ignore/add/remove/force +sp_after_ptr_star_func = ignore # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = ignore # ignore/add/remove/force +sp_before_ptr_star_func = ignore # Add or remove space before a reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force +sp_before_unnamed_byref = ignore # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = force # ignore/add/remove/force +sp_after_byref = force # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = ignore # ignore/add/remove/force +sp_after_byref_func = ignore # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = ignore # ignore/add/remove/force +sp_before_byref_func = ignore # Add or remove space between type and word -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. -sp_template_angle = ignore # ignore/add/remove/force +sp_template_angle = ignore # Add or remove space before '<>' -sp_before_angle = remove # ignore/add/remove/force +sp_before_angle = remove # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # Add or remove space after '<>' -sp_after_angle = force # ignore/add/remove/force +sp_after_angle = force # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = ignore # ignore/add/remove/force +sp_angle_paren = ignore # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = ignore # ignore/add/remove/force +sp_angle_word = ignore # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # Add or remove space before if-condition ')'. Overrides sp_inside_sparen. -sp_inside_sparen_close = ignore # ignore/add/remove/force +sp_inside_sparen_close = ignore # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = add # ignore/add/remove/force +sp_sparen_brace = add # Add or remove space between 'invariant' and '(' in the D language. -sp_invariant_paren = ignore # ignore/add/remove/force +sp_invariant_paren = ignore # Add or remove space after the ')' in 'invariant (C) c' in the D language. -sp_after_invariant_paren = ignore # ignore/add/remove/force +sp_after_invariant_paren = ignore # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = ignore # ignore/add/remove/force +sp_before_semi_for = ignore # Add or remove space before a semicolon of an empty part of a for statment. -sp_before_semi_for_empty = force # ignore/add/remove/force +sp_before_semi_for_empty = force # Add or remove space after the final semicolon of an empty part of a for statment: for ( ; ; ). -sp_after_semi_for_empty = ignore # ignore/add/remove/force +sp_after_semi_for_empty = ignore # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # Add or remove space after class ':' -sp_after_class_colon = ignore # ignore/add/remove/force +sp_after_class_colon = ignore # Add or remove space before class ':' -sp_before_class_colon = ignore # ignore/add/remove/force +sp_before_class_colon = ignore # Add or remove space before case ':' -sp_before_case_colon = remove # ignore/add/remove/force +sp_before_case_colon = remove # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = ignore # ignore/add/remove/force +sp_after_operator_sym = ignore # Add or remove space after C/D cast, ie 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # Add or remove spaces inside cast parens -sp_inside_paren_cast = ignore # ignore/add/remove/force +sp_inside_paren_cast = ignore # Add or remove space between the type and open paren in a C++ cast, ie 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = ignore # ignore/add/remove/force +sp_cpp_cast_paren = ignore # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = force # ignore/add/remove/force +sp_inside_braces_enum = force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = force # ignore/add/remove/force +sp_inside_braces_struct = force # Add or remove space inside '{' and '}' -sp_inside_braces = force # ignore/add/remove/force +sp_inside_braces = force # Add or remove space inside '{}' -sp_inside_braces_empty = ignore # ignore/add/remove/force +sp_inside_braces_empty = ignore # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = force # ignore/add/remove/force +sp_type_func = force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # Add or remove space inside empty function '()' -sp_inside_fparens = ignore # ignore/add/remove/force +sp_inside_fparens = ignore # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # Add or remove space between ')' and '{' of function -sp_fparen_brace = add # ignore/add/remove/force +sp_fparen_brace = add # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = ignore # ignore/add/remove/force +sp_func_call_user_paren = ignore # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # Add or remove space between 'return' and '(' -sp_return_paren = remove # ignore/add/remove/force +sp_return_paren = remove # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = ignore # ignore/add/remove/force +sp_defined_paren = ignore # Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = ignore # ignore/add/remove/force +sp_throw_paren = ignore # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = ignore # ignore/add/remove/force +sp_else_brace = ignore # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = force # ignore/add/remove/force +sp_brace_typedef = force # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # Add or remove space before the '::' operator -sp_before_dc = remove # ignore/add/remove/force +sp_before_dc = remove # Add or remove space after the '::' operator -sp_after_dc = remove # ignore/add/remove/force +sp_after_dc = remove # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # Add or remove space after the '!' (not) operator. -sp_not = remove # ignore/add/remove/force +sp_not = remove # Add or remove space after the '~' (invert) operator. -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # Add or remove space after the '&' (address-of) operator. # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # Add or remove space around the '.' or '->' operators -sp_member = remove # ignore/add/remove/force +sp_member = remove # Add or remove space after the '*' (dereference) operator. # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7' -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;' -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # Add or remove space before a backslash-newline at the end of a line -sp_before_nl_cont = add # ignore/add/remove/force +sp_before_nl_cont = add # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force +sp_after_oc_scope = ignore # Add or remove space after the colon in message specs # '-(int) f:(int) x;' vs '-(int) f: (int) x;' -sp_after_oc_colon = ignore # ignore/add/remove/force +sp_after_oc_colon = ignore # Add or remove space before the colon in message specs # '-(int) f: (int) x;' vs '-(int) f : (int) x;' -sp_before_oc_colon = ignore # ignore/add/remove/force +sp_before_oc_colon = ignore # Add or remove space after the colon in message specs # '[object setValue:1];' vs '[object setValue: 1];' -sp_after_send_oc_colon = ignore # ignore/add/remove/force +sp_after_send_oc_colon = ignore # Add or remove space before the colon in message specs # '[object setValue:1];' vs '[object setValue :1];' -sp_before_send_oc_colon = ignore # ignore/add/remove/force +sp_before_send_oc_colon = ignore # Add or remove space after the (type) in message specs # '-(int) f: (int) x;' vs '-(int) f: (int)x;' -sp_after_oc_type = ignore # ignore/add/remove/force +sp_after_oc_type = ignore # Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = ignore # ignore/add/remove/force +sp_cond_colon = ignore # Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = ignore # ignore/add/remove/force +sp_cond_question = ignore # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = remove # ignore/add/remove/force +sp_case_label = remove # Control the space around the D '..' operator. -sp_range = ignore # ignore/add/remove/force +sp_range = ignore # Control the space after the opening of a C++ comment '// A' vs '//A' -sp_cmt_cpp_start = ignore # ignore/add/remove/force +sp_cmt_cpp_start = ignore # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # Whether to right-align numbers -align_number_right = true # false/true +align_number_right = true # Align variable definitions in prototypes and functions -align_func_params = true # false/true +align_func_params = true # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = false # false/true +align_same_func_call_params = false # The span for aligning variable definitions (0=don't align) -align_var_def_span = 1 # number +align_var_def_span = 1 # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 1 # number +align_var_def_star_style = 1 # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 16 # number +align_var_def_thresh = 16 # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # Whether to align the colon in struct bit fields -align_var_def_colon = true # false/true +align_var_def_colon = true # Whether to align any attribute after the variable name -align_var_def_attribute = false # false/true +align_var_def_attribute = false # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = true # false/true +align_var_def_inline = true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 1 # number +align_assign_span = 1 # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 12 # number +align_assign_thresh = 12 # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 16 # number +align_enum_equ_span = 16 # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # The span for aligning struct/union (0=don't align) -align_var_struct_span = 99 # number +align_var_struct_span = 99 # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 3 # number +align_struct_init_span = 3 # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 3 # number +align_typedef_gap = 3 # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 5 # number +align_typedef_span = 5 # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typdef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 3 # number +align_right_cmt_span = 3 # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. -align_right_cmt_gap = 0 # number +align_right_cmt_gap = 0 # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # Align function protos on the 'operator' keyword instead of what follows -align_on_operator = false # false/true +align_on_operator = false # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true +align_single_line_func = false # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # The span for aligning ObjC msg spec (0=don't align) -align_oc_msg_spec_span = 0 # number +align_oc_msg_spec_span = 0 # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = true # false/true +align_nl_cont = true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 4 # number +align_pp_define_gap = 4 # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 3 # number +align_pp_define_span = 3 # Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = true # false/true +align_left_shift = true # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = true # false/true +nl_assign_leave_one_liners = true # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = true # false/true +nl_class_leave_one_liners = true # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = false # false/true +nl_enum_leave_one_liners = false # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # Add or remove newline between '=' and '{' -nl_assign_brace = add # ignore/add/remove/force +nl_assign_brace = add # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = add # ignore/add/remove/force +nl_fcall_brace = add # Add or remove newline between 'enum' and '{' -nl_enum_brace = force # ignore/add/remove/force +nl_enum_brace = force # Add or remove newline between 'struct and '{' -nl_struct_brace = force # ignore/add/remove/force +nl_struct_brace = force # Add or remove newline between 'union' and '{' -nl_union_brace = force # ignore/add/remove/force +nl_union_brace = force # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = ignore # ignore/add/remove/force +nl_elseif_brace = ignore # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # Add or remove newline between 'else' and 'if' -nl_else_if = ignore # ignore/add/remove/force +nl_else_if = ignore # Add or remove newline between '}' and 'finally' -nl_brace_finally = ignore # ignore/add/remove/force +nl_brace_finally = ignore # Add or remove newline between 'finally' and '{' -nl_finally_brace = ignore # ignore/add/remove/force +nl_finally_brace = ignore # Add or remove newline between 'try' and '{' -nl_try_brace = ignore # ignore/add/remove/force +nl_try_brace = ignore # Add or remove newline between get/set and '{' -nl_getset_brace = force # ignore/add/remove/force +nl_getset_brace = force # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # Add or remove newline between 'catch' and '{' -nl_catch_brace = ignore # ignore/add/remove/force +nl_catch_brace = ignore # Add or remove newline between '}' and 'catch' -nl_brace_catch = ignore # ignore/add/remove/force +nl_brace_catch = ignore # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = true # false/true +nl_multi_line_define = true # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # Add or remove newline between ')' and 'throw' -nl_before_throw = ignore # ignore/add/remove/force +nl_before_throw = ignore # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # Newline between namespace and { -nl_namespace_brace = ignore # ignore/add/remove/force +nl_namespace_brace = ignore # Add or remove newline between 'template<>' and whatever follows. -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # Add or remove newline between return type and function name in definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # Add or remove newline between function scope and name in a definition # Controls the newline after '::' in 'void A::f() { }' -nl_func_scope_name = ignore # ignore/add/remove/force +nl_func_scope_name = ignore # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = ignore # ignore/add/remove/force +nl_func_proto_type_name = ignore # Add or remove newline between a function name and the opening '(' -nl_func_paren = remove # ignore/add/remove/force +nl_func_paren = remove # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # Whether to put a newline after 'return' statement -nl_after_return = true # false/true +nl_after_return = true # Add or remove a newline between the return keyword and return expression. -nl_return_expr = ignore # ignore/add/remove/force +nl_return_expr = ignore # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = true # false/true +nl_after_brace_open = true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true +nl_after_brace_open_cmt = false # Whether to put a newline after a virtual brace open. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = false # false/true +nl_after_vbrace_open = false # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. -nl_after_brace_close = true # false/true +nl_after_brace_close = true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = true # false/true +nl_squeeze_ifdef = true # Add or remove newline before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # Add or remove newline after 'if' -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # Add or remove newline before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # Add or remove newline after 'for' -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # Add or remove newline before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # Add or remove newline after 'while' -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # Add or remove newline before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # Add or remove newline after 'switch' -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # Add or remove newline before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # Add or remove newline after 'do' -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # Whether to double-space before the close brace of a struct/union/enum -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # # Positioning options # # The position of arithmetic operators in wrapped expressions -pos_arith = ignore # ignore/lead/trail +pos_arith = ignore # The position of assignment in wrapped expressions -pos_assign = ignore # ignore/lead/trail +pos_assign = ignore # The position of boolean operators in wrapped expressions -pos_bool = trail # ignore/lead/trail +pos_bool = trail # The position of the comma in wrapped expressions -pos_comma = ignore # ignore/lead/trail +pos_comma = ignore # The position of the comma in the constructor initialization list -pos_class_comma = ignore # ignore/lead/trail +pos_class_comma = ignore # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true +ls_for_split_full = false # Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true +ls_func_split_full = false # # Blank line options # # The maximum consecutive newlines -nl_max = 4 # number +nl_max = 4 # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 3 # number +nl_after_func_body = 3 # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 0 # number +nl_after_func_body_one_liner = 0 # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # Whether to force a newline after a mulit-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 0 # number +nl_before_access_spec = 0 # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # The number of newlines between a function def and the function comment. # 0 = No change. -nl_comment_func_def = 1 # number +nl_comment_func_def = 1 # The number of newlines after a try-catch-finally block that isn't followed by a brace close. # 0 = No change. -nl_after_try_catch_finally = 0 # number +nl_after_try_catch_finally = 0 # The number of newlines before and after a property, indexer or event decl. # 0 = No change. -nl_around_cs_property = 0 # number +nl_around_cs_property = 0 # The number of newlines between the get/set/add/remove handlers in C#. # 0 = No change. -nl_between_get_set = 0 # number +nl_between_get_set = 0 # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = add # ignore/add/remove/force +mod_paren_on_return = add # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = true # false/true +mod_full_paren_if_bool = true # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = true # false/true +mod_remove_extra_semicolon = true # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 0 # number +mod_add_long_function_closebrace_comment = 0 # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number +mod_add_long_switch_closebrace_comment = 0 # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = false # false/true +mod_move_case_break = false # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = true # false/true +mod_remove_empty_return = true # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # If false, disable all multi-line comment changes, including cmt_width and leading chars. # Default is true. -cmt_indent_multi = true # false/true +cmt_indent_multi = true # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # Whether to put a star on subsequent comment lines -cmt_star_cont = true # false/true +cmt_star_cont = true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitue $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment. # Will substitue $(filename) with the current file's name. -cmt_insert_file_footer = "" # string +cmt_insert_file_footer = "" # The filename that contains text to insert before a function implementation if the function isn't preceeded with a C/C++ comment. # Will substitue $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # The filename that contains text to insert before a class if the class isn't preceeded with a C/C++ comment. # Will substitue $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true +cmt_insert_before_preproc = false # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = remove # ignore/add/remove/force +pp_indent = remove # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. -pp_indent_count = 1 # number +pp_indent_count = 1 # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true +pp_if_indent_code = false # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/mod_case_brace_rm.cfg b/tests/config/mod_case_brace_rm.cfg index 15d59c07bd..02651dc40a 100644 --- a/tests/config/mod_case_brace_rm.cfg +++ b/tests/config/mod_case_brace_rm.cfg @@ -7,19 +7,19 @@ mod_case_brace = remove # # The type of line endings -newlines = lf # auto/lf/crlf/cr +newlines = lf # The original size of tabs in the input -input_tab_size = 8 # number +input_tab_size = 8 # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 3 # number +output_tab_size = 3 # The ascii value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # # Indenting @@ -27,1142 +27,1142 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 3 # number +indent_columns = 3 # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # Whether the 'extern "C"' body is indented -indent_extern = false # false/true +indent_extern = false # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # Whether to indent the stuff after a leading class colon -indent_class_colon = true # false/true +indent_class_colon = true # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level -indent_else_if = false # false/true +indent_else_if = false # Amount to indent variable declarations after a open brace. neg=relative, pos=absolute -indent_var_def_blk = 0 # number +indent_var_def_blk = 0 # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = false # false/true +indent_func_call_param = false # Same as indent_func_call_param, but for function defs -indent_func_def_param = false # false/true +indent_func_def_param = false # Same as indent_func_call_param, but for function protos -indent_func_proto_param = false # false/true +indent_func_proto_param = false # Same as indent_func_call_param, but for class declarations -indent_func_class_param = false # false/true +indent_func_class_param = false # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = false # false/true +indent_func_ctor_var_param = false # Same as indent_func_call_param, but for templates -indent_template_param = false # false/true +indent_template_param = false # Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true +indent_func_param_double = false # Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 0 # number +indent_func_const = 0 # Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 0 # number +indent_func_throw = 0 # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 3 # number +indent_member = 3 # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = false # false/true +indent_relative_single_line_comments = false # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 0 # number +indent_switch_case = 0 # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 3 # number +indent_case_brace = 3 # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 0 # number +indent_paren_close = 0 # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # Align continued statements at the '='. Default=True # If FALSE or the '=' is followed by a newline, the next line is indent one tab. -indent_align_assign = true # false/true +indent_align_assign = true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. -sp_before_assign = ignore # ignore/add/remove/force +sp_before_assign = ignore # Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. -sp_after_assign = ignore # ignore/add/remove/force +sp_after_assign = ignore # Add or remove space around assignment '=' in enum -sp_enum_assign = ignore # ignore/add/remove/force +sp_enum_assign = ignore # Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_before_assign = ignore # ignore/add/remove/force +sp_enum_before_assign = ignore # Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_after_assign = ignore # ignore/add/remove/force +sp_enum_after_assign = ignore # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force +sp_before_unnamed_ptr_star = ignore # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = ignore # ignore/add/remove/force +sp_after_ptr_star_func = ignore # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = ignore # ignore/add/remove/force +sp_before_ptr_star_func = ignore # Add or remove space before a reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force +sp_before_unnamed_byref = ignore # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = force # ignore/add/remove/force +sp_after_byref = force # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = ignore # ignore/add/remove/force +sp_after_byref_func = ignore # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = ignore # ignore/add/remove/force +sp_before_byref_func = ignore # Add or remove space between type and word -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. -sp_template_angle = ignore # ignore/add/remove/force +sp_template_angle = ignore # Add or remove space before '<>' -sp_before_angle = remove # ignore/add/remove/force +sp_before_angle = remove # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # Add or remove space after '<>' -sp_after_angle = force # ignore/add/remove/force +sp_after_angle = force # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = ignore # ignore/add/remove/force +sp_angle_paren = ignore # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = ignore # ignore/add/remove/force +sp_angle_word = ignore # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # Add or remove space before if-condition ')'. Overrides sp_inside_sparen. -sp_inside_sparen_close = ignore # ignore/add/remove/force +sp_inside_sparen_close = ignore # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = add # ignore/add/remove/force +sp_sparen_brace = add # Add or remove space between 'invariant' and '(' in the D language. -sp_invariant_paren = ignore # ignore/add/remove/force +sp_invariant_paren = ignore # Add or remove space after the ')' in 'invariant (C) c' in the D language. -sp_after_invariant_paren = ignore # ignore/add/remove/force +sp_after_invariant_paren = ignore # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = ignore # ignore/add/remove/force +sp_before_semi_for = ignore # Add or remove space before a semicolon of an empty part of a for statment. -sp_before_semi_for_empty = force # ignore/add/remove/force +sp_before_semi_for_empty = force # Add or remove space after the final semicolon of an empty part of a for statment: for ( ; ; ). -sp_after_semi_for_empty = ignore # ignore/add/remove/force +sp_after_semi_for_empty = ignore # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # Add or remove space after class ':' -sp_after_class_colon = ignore # ignore/add/remove/force +sp_after_class_colon = ignore # Add or remove space before class ':' -sp_before_class_colon = ignore # ignore/add/remove/force +sp_before_class_colon = ignore # Add or remove space before case ':' -sp_before_case_colon = remove # ignore/add/remove/force +sp_before_case_colon = remove # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = ignore # ignore/add/remove/force +sp_after_operator_sym = ignore # Add or remove space after C/D cast, ie 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # Add or remove spaces inside cast parens -sp_inside_paren_cast = ignore # ignore/add/remove/force +sp_inside_paren_cast = ignore # Add or remove space between the type and open paren in a C++ cast, ie 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = ignore # ignore/add/remove/force +sp_cpp_cast_paren = ignore # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = force # ignore/add/remove/force +sp_inside_braces_enum = force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = force # ignore/add/remove/force +sp_inside_braces_struct = force # Add or remove space inside '{' and '}' -sp_inside_braces = force # ignore/add/remove/force +sp_inside_braces = force # Add or remove space inside '{}' -sp_inside_braces_empty = ignore # ignore/add/remove/force +sp_inside_braces_empty = ignore # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = force # ignore/add/remove/force +sp_type_func = force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # Add or remove space inside empty function '()' -sp_inside_fparens = ignore # ignore/add/remove/force +sp_inside_fparens = ignore # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # Add or remove space between ')' and '{' of function -sp_fparen_brace = add # ignore/add/remove/force +sp_fparen_brace = add # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = ignore # ignore/add/remove/force +sp_func_call_user_paren = ignore # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # Add or remove space between 'return' and '(' -sp_return_paren = remove # ignore/add/remove/force +sp_return_paren = remove # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = ignore # ignore/add/remove/force +sp_defined_paren = ignore # Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = ignore # ignore/add/remove/force +sp_throw_paren = ignore # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = ignore # ignore/add/remove/force +sp_else_brace = ignore # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = force # ignore/add/remove/force +sp_brace_typedef = force # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # Add or remove space before the '::' operator -sp_before_dc = remove # ignore/add/remove/force +sp_before_dc = remove # Add or remove space after the '::' operator -sp_after_dc = remove # ignore/add/remove/force +sp_after_dc = remove # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # Add or remove space after the '!' (not) operator. -sp_not = remove # ignore/add/remove/force +sp_not = remove # Add or remove space after the '~' (invert) operator. -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # Add or remove space after the '&' (address-of) operator. # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # Add or remove space around the '.' or '->' operators -sp_member = remove # ignore/add/remove/force +sp_member = remove # Add or remove space after the '*' (dereference) operator. # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7' -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;' -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # Add or remove space before a backslash-newline at the end of a line -sp_before_nl_cont = add # ignore/add/remove/force +sp_before_nl_cont = add # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force +sp_after_oc_scope = ignore # Add or remove space after the colon in message specs # '-(int) f:(int) x;' vs '-(int) f: (int) x;' -sp_after_oc_colon = ignore # ignore/add/remove/force +sp_after_oc_colon = ignore # Add or remove space before the colon in message specs # '-(int) f: (int) x;' vs '-(int) f : (int) x;' -sp_before_oc_colon = ignore # ignore/add/remove/force +sp_before_oc_colon = ignore # Add or remove space after the colon in message specs # '[object setValue:1];' vs '[object setValue: 1];' -sp_after_send_oc_colon = ignore # ignore/add/remove/force +sp_after_send_oc_colon = ignore # Add or remove space before the colon in message specs # '[object setValue:1];' vs '[object setValue :1];' -sp_before_send_oc_colon = ignore # ignore/add/remove/force +sp_before_send_oc_colon = ignore # Add or remove space after the (type) in message specs # '-(int) f: (int) x;' vs '-(int) f: (int)x;' -sp_after_oc_type = ignore # ignore/add/remove/force +sp_after_oc_type = ignore # Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = ignore # ignore/add/remove/force +sp_cond_colon = ignore # Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = ignore # ignore/add/remove/force +sp_cond_question = ignore # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = remove # ignore/add/remove/force +sp_case_label = remove # Control the space around the D '..' operator. -sp_range = ignore # ignore/add/remove/force +sp_range = ignore # Control the space after the opening of a C++ comment '// A' vs '//A' -sp_cmt_cpp_start = ignore # ignore/add/remove/force +sp_cmt_cpp_start = ignore # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # Whether to right-align numbers -align_number_right = true # false/true +align_number_right = true # Align variable definitions in prototypes and functions -align_func_params = true # false/true +align_func_params = true # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = false # false/true +align_same_func_call_params = false # The span for aligning variable definitions (0=don't align) -align_var_def_span = 1 # number +align_var_def_span = 1 # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 1 # number +align_var_def_star_style = 1 # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 16 # number +align_var_def_thresh = 16 # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # Whether to align the colon in struct bit fields -align_var_def_colon = true # false/true +align_var_def_colon = true # Whether to align any attribute after the variable name -align_var_def_attribute = false # false/true +align_var_def_attribute = false # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = true # false/true +align_var_def_inline = true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 1 # number +align_assign_span = 1 # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 12 # number +align_assign_thresh = 12 # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 16 # number +align_enum_equ_span = 16 # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # The span for aligning struct/union (0=don't align) -align_var_struct_span = 99 # number +align_var_struct_span = 99 # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 3 # number +align_struct_init_span = 3 # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 3 # number +align_typedef_gap = 3 # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 5 # number +align_typedef_span = 5 # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typdef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 3 # number +align_right_cmt_span = 3 # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. -align_right_cmt_gap = 0 # number +align_right_cmt_gap = 0 # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # Align function protos on the 'operator' keyword instead of what follows -align_on_operator = false # false/true +align_on_operator = false # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true +align_single_line_func = false # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # The span for aligning ObjC msg spec (0=don't align) -align_oc_msg_spec_span = 0 # number +align_oc_msg_spec_span = 0 # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = true # false/true +align_nl_cont = true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 4 # number +align_pp_define_gap = 4 # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 3 # number +align_pp_define_span = 3 # Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = true # false/true +align_left_shift = true # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = true # false/true +nl_assign_leave_one_liners = true # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = true # false/true +nl_class_leave_one_liners = true # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = false # false/true +nl_enum_leave_one_liners = false # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # Add or remove newline between '=' and '{' -nl_assign_brace = add # ignore/add/remove/force +nl_assign_brace = add # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = add # ignore/add/remove/force +nl_fcall_brace = add # Add or remove newline between 'enum' and '{' -nl_enum_brace = force # ignore/add/remove/force +nl_enum_brace = force # Add or remove newline between 'struct and '{' -nl_struct_brace = force # ignore/add/remove/force +nl_struct_brace = force # Add or remove newline between 'union' and '{' -nl_union_brace = force # ignore/add/remove/force +nl_union_brace = force # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = ignore # ignore/add/remove/force +nl_elseif_brace = ignore # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # Add or remove newline between 'else' and 'if' -nl_else_if = ignore # ignore/add/remove/force +nl_else_if = ignore # Add or remove newline between '}' and 'finally' -nl_brace_finally = ignore # ignore/add/remove/force +nl_brace_finally = ignore # Add or remove newline between 'finally' and '{' -nl_finally_brace = ignore # ignore/add/remove/force +nl_finally_brace = ignore # Add or remove newline between 'try' and '{' -nl_try_brace = ignore # ignore/add/remove/force +nl_try_brace = ignore # Add or remove newline between get/set and '{' -nl_getset_brace = force # ignore/add/remove/force +nl_getset_brace = force # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # Add or remove newline between 'catch' and '{' -nl_catch_brace = ignore # ignore/add/remove/force +nl_catch_brace = ignore # Add or remove newline between '}' and 'catch' -nl_brace_catch = ignore # ignore/add/remove/force +nl_brace_catch = ignore # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = true # false/true +nl_multi_line_define = true # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # Add or remove newline between ')' and 'throw' -nl_before_throw = ignore # ignore/add/remove/force +nl_before_throw = ignore # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # Newline between namespace and { -nl_namespace_brace = ignore # ignore/add/remove/force +nl_namespace_brace = ignore # Add or remove newline between 'template<>' and whatever follows. -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # Add or remove newline between return type and function name in definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # Add or remove newline between function scope and name in a definition # Controls the newline after '::' in 'void A::f() { }' -nl_func_scope_name = ignore # ignore/add/remove/force +nl_func_scope_name = ignore # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = ignore # ignore/add/remove/force +nl_func_proto_type_name = ignore # Add or remove newline between a function name and the opening '(' -nl_func_paren = remove # ignore/add/remove/force +nl_func_paren = remove # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # Whether to put a newline after 'return' statement -nl_after_return = true # false/true +nl_after_return = true # Add or remove a newline between the return keyword and return expression. -nl_return_expr = ignore # ignore/add/remove/force +nl_return_expr = ignore # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = true # false/true +nl_after_brace_open = true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true +nl_after_brace_open_cmt = false # Whether to put a newline after a virtual brace open. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = false # false/true +nl_after_vbrace_open = false # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. -nl_after_brace_close = true # false/true +nl_after_brace_close = true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = true # false/true +nl_squeeze_ifdef = true # Add or remove newline before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # Add or remove newline after 'if' -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # Add or remove newline before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # Add or remove newline after 'for' -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # Add or remove newline before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # Add or remove newline after 'while' -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # Add or remove newline before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # Add or remove newline after 'switch' -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # Add or remove newline before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # Add or remove newline after 'do' -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # Whether to double-space before the close brace of a struct/union/enum -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # # Positioning options # # The position of arithmetic operators in wrapped expressions -pos_arith = ignore # ignore/lead/trail +pos_arith = ignore # The position of assignment in wrapped expressions -pos_assign = ignore # ignore/lead/trail +pos_assign = ignore # The position of boolean operators in wrapped expressions -pos_bool = trail # ignore/lead/trail +pos_bool = trail # The position of the comma in wrapped expressions -pos_comma = ignore # ignore/lead/trail +pos_comma = ignore # The position of the comma in the constructor initialization list -pos_class_comma = ignore # ignore/lead/trail +pos_class_comma = ignore # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true +ls_for_split_full = false # Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true +ls_func_split_full = false # # Blank line options # # The maximum consecutive newlines -nl_max = 4 # number +nl_max = 4 # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 3 # number +nl_after_func_body = 3 # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 0 # number +nl_after_func_body_one_liner = 0 # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # Whether to force a newline after a mulit-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 0 # number +nl_before_access_spec = 0 # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # The number of newlines between a function def and the function comment. # 0 = No change. -nl_comment_func_def = 1 # number +nl_comment_func_def = 1 # The number of newlines after a try-catch-finally block that isn't followed by a brace close. # 0 = No change. -nl_after_try_catch_finally = 0 # number +nl_after_try_catch_finally = 0 # The number of newlines before and after a property, indexer or event decl. # 0 = No change. -nl_around_cs_property = 0 # number +nl_around_cs_property = 0 # The number of newlines between the get/set/add/remove handlers in C#. # 0 = No change. -nl_between_get_set = 0 # number +nl_between_get_set = 0 # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = add # ignore/add/remove/force +mod_paren_on_return = add # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = true # false/true +mod_full_paren_if_bool = true # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = true # false/true +mod_remove_extra_semicolon = true # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 0 # number +mod_add_long_function_closebrace_comment = 0 # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number +mod_add_long_switch_closebrace_comment = 0 # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = false # false/true +mod_move_case_break = false # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = true # false/true +mod_remove_empty_return = true # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # If false, disable all multi-line comment changes, including cmt_width and leading chars. # Default is true. -cmt_indent_multi = true # false/true +cmt_indent_multi = true # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # Whether to put a star on subsequent comment lines -cmt_star_cont = true # false/true +cmt_star_cont = true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitue $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment. # Will substitue $(filename) with the current file's name. -cmt_insert_file_footer = "" # string +cmt_insert_file_footer = "" # The filename that contains text to insert before a function implementation if the function isn't preceeded with a C/C++ comment. # Will substitue $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # The filename that contains text to insert before a class if the class isn't preceeded with a C/C++ comment. # Will substitue $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true +cmt_insert_before_preproc = false # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = remove # ignore/add/remove/force +pp_indent = remove # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. -pp_indent_count = 1 # number +pp_indent_count = 1 # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true +pp_if_indent_code = false # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/mod_move_case_brace.cfg b/tests/config/mod_move_case_brace.cfg index da0f88cdba..de5ffa1b75 100644 --- a/tests/config/mod_move_case_brace.cfg +++ b/tests/config/mod_move_case_brace.cfg @@ -7,19 +7,19 @@ mod_case_brace = add # # The type of line endings -newlines = lf # auto/lf/crlf/cr +newlines = lf # The original size of tabs in the input -input_tab_size = 8 # number +input_tab_size = 8 # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 3 # number +output_tab_size = 3 # The ascii value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # # Indenting @@ -27,1142 +27,1142 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 3 # number +indent_columns = 3 # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # Whether the 'extern "C"' body is indented -indent_extern = false # false/true +indent_extern = false # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # Whether to indent the stuff after a leading class colon -indent_class_colon = true # false/true +indent_class_colon = true # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level -indent_else_if = false # false/true +indent_else_if = false # Amount to indent variable declarations after a open brace. neg=relative, pos=absolute -indent_var_def_blk = 0 # number +indent_var_def_blk = 0 # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = false # false/true +indent_func_call_param = false # Same as indent_func_call_param, but for function defs -indent_func_def_param = false # false/true +indent_func_def_param = false # Same as indent_func_call_param, but for function protos -indent_func_proto_param = false # false/true +indent_func_proto_param = false # Same as indent_func_call_param, but for class declarations -indent_func_class_param = false # false/true +indent_func_class_param = false # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = false # false/true +indent_func_ctor_var_param = false # Same as indent_func_call_param, but for templates -indent_template_param = false # false/true +indent_template_param = false # Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true +indent_func_param_double = false # Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 0 # number +indent_func_const = 0 # Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 0 # number +indent_func_throw = 0 # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 3 # number +indent_member = 3 # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = false # false/true +indent_relative_single_line_comments = false # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 0 # number +indent_switch_case = 0 # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 3 # number +indent_case_brace = 3 # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 0 # number +indent_paren_close = 0 # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # Align continued statements at the '='. Default=True # If FALSE or the '=' is followed by a newline, the next line is indent one tab. -indent_align_assign = true # false/true +indent_align_assign = true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. -sp_before_assign = ignore # ignore/add/remove/force +sp_before_assign = ignore # Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. -sp_after_assign = ignore # ignore/add/remove/force +sp_after_assign = ignore # Add or remove space around assignment '=' in enum -sp_enum_assign = ignore # ignore/add/remove/force +sp_enum_assign = ignore # Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_before_assign = ignore # ignore/add/remove/force +sp_enum_before_assign = ignore # Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_after_assign = ignore # ignore/add/remove/force +sp_enum_after_assign = ignore # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force +sp_before_unnamed_ptr_star = ignore # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = ignore # ignore/add/remove/force +sp_after_ptr_star_func = ignore # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = ignore # ignore/add/remove/force +sp_before_ptr_star_func = ignore # Add or remove space before a reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force +sp_before_unnamed_byref = ignore # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = force # ignore/add/remove/force +sp_after_byref = force # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = ignore # ignore/add/remove/force +sp_after_byref_func = ignore # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = ignore # ignore/add/remove/force +sp_before_byref_func = ignore # Add or remove space between type and word -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. -sp_template_angle = ignore # ignore/add/remove/force +sp_template_angle = ignore # Add or remove space before '<>' -sp_before_angle = remove # ignore/add/remove/force +sp_before_angle = remove # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # Add or remove space after '<>' -sp_after_angle = force # ignore/add/remove/force +sp_after_angle = force # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = ignore # ignore/add/remove/force +sp_angle_paren = ignore # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = ignore # ignore/add/remove/force +sp_angle_word = ignore # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # Add or remove space before if-condition ')'. Overrides sp_inside_sparen. -sp_inside_sparen_close = ignore # ignore/add/remove/force +sp_inside_sparen_close = ignore # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = add # ignore/add/remove/force +sp_sparen_brace = add # Add or remove space between 'invariant' and '(' in the D language. -sp_invariant_paren = ignore # ignore/add/remove/force +sp_invariant_paren = ignore # Add or remove space after the ')' in 'invariant (C) c' in the D language. -sp_after_invariant_paren = ignore # ignore/add/remove/force +sp_after_invariant_paren = ignore # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = ignore # ignore/add/remove/force +sp_before_semi_for = ignore # Add or remove space before a semicolon of an empty part of a for statment. -sp_before_semi_for_empty = force # ignore/add/remove/force +sp_before_semi_for_empty = force # Add or remove space after the final semicolon of an empty part of a for statment: for ( ; ; ). -sp_after_semi_for_empty = ignore # ignore/add/remove/force +sp_after_semi_for_empty = ignore # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # Add or remove space after class ':' -sp_after_class_colon = ignore # ignore/add/remove/force +sp_after_class_colon = ignore # Add or remove space before class ':' -sp_before_class_colon = ignore # ignore/add/remove/force +sp_before_class_colon = ignore # Add or remove space before case ':' -sp_before_case_colon = remove # ignore/add/remove/force +sp_before_case_colon = remove # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = ignore # ignore/add/remove/force +sp_after_operator_sym = ignore # Add or remove space after C/D cast, ie 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # Add or remove spaces inside cast parens -sp_inside_paren_cast = ignore # ignore/add/remove/force +sp_inside_paren_cast = ignore # Add or remove space between the type and open paren in a C++ cast, ie 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = ignore # ignore/add/remove/force +sp_cpp_cast_paren = ignore # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = force # ignore/add/remove/force +sp_inside_braces_enum = force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = force # ignore/add/remove/force +sp_inside_braces_struct = force # Add or remove space inside '{' and '}' -sp_inside_braces = force # ignore/add/remove/force +sp_inside_braces = force # Add or remove space inside '{}' -sp_inside_braces_empty = ignore # ignore/add/remove/force +sp_inside_braces_empty = ignore # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = force # ignore/add/remove/force +sp_type_func = force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # Add or remove space inside empty function '()' -sp_inside_fparens = ignore # ignore/add/remove/force +sp_inside_fparens = ignore # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # Add or remove space between ')' and '{' of function -sp_fparen_brace = add # ignore/add/remove/force +sp_fparen_brace = add # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = ignore # ignore/add/remove/force +sp_func_call_user_paren = ignore # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # Add or remove space between 'return' and '(' -sp_return_paren = remove # ignore/add/remove/force +sp_return_paren = remove # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = ignore # ignore/add/remove/force +sp_defined_paren = ignore # Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = ignore # ignore/add/remove/force +sp_throw_paren = ignore # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = ignore # ignore/add/remove/force +sp_else_brace = ignore # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = force # ignore/add/remove/force +sp_brace_typedef = force # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # Add or remove space before the '::' operator -sp_before_dc = remove # ignore/add/remove/force +sp_before_dc = remove # Add or remove space after the '::' operator -sp_after_dc = remove # ignore/add/remove/force +sp_after_dc = remove # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # Add or remove space after the '!' (not) operator. -sp_not = remove # ignore/add/remove/force +sp_not = remove # Add or remove space after the '~' (invert) operator. -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # Add or remove space after the '&' (address-of) operator. # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # Add or remove space around the '.' or '->' operators -sp_member = remove # ignore/add/remove/force +sp_member = remove # Add or remove space after the '*' (dereference) operator. # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7' -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;' -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # Add or remove space before a backslash-newline at the end of a line -sp_before_nl_cont = add # ignore/add/remove/force +sp_before_nl_cont = add # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force +sp_after_oc_scope = ignore # Add or remove space after the colon in message specs # '-(int) f:(int) x;' vs '-(int) f: (int) x;' -sp_after_oc_colon = ignore # ignore/add/remove/force +sp_after_oc_colon = ignore # Add or remove space before the colon in message specs # '-(int) f: (int) x;' vs '-(int) f : (int) x;' -sp_before_oc_colon = ignore # ignore/add/remove/force +sp_before_oc_colon = ignore # Add or remove space after the colon in message specs # '[object setValue:1];' vs '[object setValue: 1];' -sp_after_send_oc_colon = ignore # ignore/add/remove/force +sp_after_send_oc_colon = ignore # Add or remove space before the colon in message specs # '[object setValue:1];' vs '[object setValue :1];' -sp_before_send_oc_colon = ignore # ignore/add/remove/force +sp_before_send_oc_colon = ignore # Add or remove space after the (type) in message specs # '-(int) f: (int) x;' vs '-(int) f: (int)x;' -sp_after_oc_type = ignore # ignore/add/remove/force +sp_after_oc_type = ignore # Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = ignore # ignore/add/remove/force +sp_cond_colon = ignore # Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = ignore # ignore/add/remove/force +sp_cond_question = ignore # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = remove # ignore/add/remove/force +sp_case_label = remove # Control the space around the D '..' operator. -sp_range = ignore # ignore/add/remove/force +sp_range = ignore # Control the space after the opening of a C++ comment '// A' vs '//A' -sp_cmt_cpp_start = ignore # ignore/add/remove/force +sp_cmt_cpp_start = ignore # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # Whether to right-align numbers -align_number_right = true # false/true +align_number_right = true # Align variable definitions in prototypes and functions -align_func_params = true # false/true +align_func_params = true # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = false # false/true +align_same_func_call_params = false # The span for aligning variable definitions (0=don't align) -align_var_def_span = 1 # number +align_var_def_span = 1 # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 1 # number +align_var_def_star_style = 1 # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 16 # number +align_var_def_thresh = 16 # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # Whether to align the colon in struct bit fields -align_var_def_colon = true # false/true +align_var_def_colon = true # Whether to align any attribute after the variable name -align_var_def_attribute = false # false/true +align_var_def_attribute = false # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = true # false/true +align_var_def_inline = true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 1 # number +align_assign_span = 1 # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 12 # number +align_assign_thresh = 12 # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 16 # number +align_enum_equ_span = 16 # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # The span for aligning struct/union (0=don't align) -align_var_struct_span = 99 # number +align_var_struct_span = 99 # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 3 # number +align_struct_init_span = 3 # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 3 # number +align_typedef_gap = 3 # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 5 # number +align_typedef_span = 5 # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typdef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 3 # number +align_right_cmt_span = 3 # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. -align_right_cmt_gap = 0 # number +align_right_cmt_gap = 0 # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # Align function protos on the 'operator' keyword instead of what follows -align_on_operator = false # false/true +align_on_operator = false # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true +align_single_line_func = false # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # The span for aligning ObjC msg spec (0=don't align) -align_oc_msg_spec_span = 0 # number +align_oc_msg_spec_span = 0 # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = true # false/true +align_nl_cont = true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 4 # number +align_pp_define_gap = 4 # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 3 # number +align_pp_define_span = 3 # Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = true # false/true +align_left_shift = true # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = true # false/true +nl_assign_leave_one_liners = true # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = true # false/true +nl_class_leave_one_liners = true # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = false # false/true +nl_enum_leave_one_liners = false # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # Add or remove newline between '=' and '{' -nl_assign_brace = add # ignore/add/remove/force +nl_assign_brace = add # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = add # ignore/add/remove/force +nl_fcall_brace = add # Add or remove newline between 'enum' and '{' -nl_enum_brace = force # ignore/add/remove/force +nl_enum_brace = force # Add or remove newline between 'struct and '{' -nl_struct_brace = force # ignore/add/remove/force +nl_struct_brace = force # Add or remove newline between 'union' and '{' -nl_union_brace = force # ignore/add/remove/force +nl_union_brace = force # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = ignore # ignore/add/remove/force +nl_elseif_brace = ignore # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # Add or remove newline between 'else' and 'if' -nl_else_if = ignore # ignore/add/remove/force +nl_else_if = ignore # Add or remove newline between '}' and 'finally' -nl_brace_finally = ignore # ignore/add/remove/force +nl_brace_finally = ignore # Add or remove newline between 'finally' and '{' -nl_finally_brace = ignore # ignore/add/remove/force +nl_finally_brace = ignore # Add or remove newline between 'try' and '{' -nl_try_brace = ignore # ignore/add/remove/force +nl_try_brace = ignore # Add or remove newline between get/set and '{' -nl_getset_brace = force # ignore/add/remove/force +nl_getset_brace = force # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # Add or remove newline between 'catch' and '{' -nl_catch_brace = ignore # ignore/add/remove/force +nl_catch_brace = ignore # Add or remove newline between '}' and 'catch' -nl_brace_catch = ignore # ignore/add/remove/force +nl_brace_catch = ignore # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = true # false/true +nl_multi_line_define = true # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # Add or remove newline between ')' and 'throw' -nl_before_throw = ignore # ignore/add/remove/force +nl_before_throw = ignore # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # Newline between namespace and { -nl_namespace_brace = ignore # ignore/add/remove/force +nl_namespace_brace = ignore # Add or remove newline between 'template<>' and whatever follows. -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # Add or remove newline between return type and function name in definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # Add or remove newline between function scope and name in a definition # Controls the newline after '::' in 'void A::f() { }' -nl_func_scope_name = ignore # ignore/add/remove/force +nl_func_scope_name = ignore # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = ignore # ignore/add/remove/force +nl_func_proto_type_name = ignore # Add or remove newline between a function name and the opening '(' -nl_func_paren = remove # ignore/add/remove/force +nl_func_paren = remove # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # Whether to put a newline after 'return' statement -nl_after_return = true # false/true +nl_after_return = true # Add or remove a newline between the return keyword and return expression. -nl_return_expr = ignore # ignore/add/remove/force +nl_return_expr = ignore # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = true # false/true +nl_after_brace_open = true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true +nl_after_brace_open_cmt = false # Whether to put a newline after a virtual brace open. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = false # false/true +nl_after_vbrace_open = false # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. -nl_after_brace_close = true # false/true +nl_after_brace_close = true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = true # false/true +nl_squeeze_ifdef = true # Add or remove newline before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # Add or remove newline after 'if' -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # Add or remove newline before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # Add or remove newline after 'for' -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # Add or remove newline before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # Add or remove newline after 'while' -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # Add or remove newline before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # Add or remove newline after 'switch' -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # Add or remove newline before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # Add or remove newline after 'do' -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # Whether to double-space before the close brace of a struct/union/enum -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # # Positioning options # # The position of arithmetic operators in wrapped expressions -pos_arith = ignore # ignore/lead/trail +pos_arith = ignore # The position of assignment in wrapped expressions -pos_assign = ignore # ignore/lead/trail +pos_assign = ignore # The position of boolean operators in wrapped expressions -pos_bool = trail # ignore/lead/trail +pos_bool = trail # The position of the comma in wrapped expressions -pos_comma = ignore # ignore/lead/trail +pos_comma = ignore # The position of the comma in the constructor initialization list -pos_class_comma = ignore # ignore/lead/trail +pos_class_comma = ignore # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true +ls_for_split_full = false # Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true +ls_func_split_full = false # # Blank line options # # The maximum consecutive newlines -nl_max = 4 # number +nl_max = 4 # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 3 # number +nl_after_func_body = 3 # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 0 # number +nl_after_func_body_one_liner = 0 # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # Whether to force a newline after a mulit-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 0 # number +nl_before_access_spec = 0 # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # The number of newlines between a function def and the function comment. # 0 = No change. -nl_comment_func_def = 1 # number +nl_comment_func_def = 1 # The number of newlines after a try-catch-finally block that isn't followed by a brace close. # 0 = No change. -nl_after_try_catch_finally = 0 # number +nl_after_try_catch_finally = 0 # The number of newlines before and after a property, indexer or event decl. # 0 = No change. -nl_around_cs_property = 0 # number +nl_around_cs_property = 0 # The number of newlines between the get/set/add/remove handlers in C#. # 0 = No change. -nl_between_get_set = 0 # number +nl_between_get_set = 0 # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = add # ignore/add/remove/force +mod_paren_on_return = add # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = true # false/true +mod_full_paren_if_bool = true # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = true # false/true +mod_remove_extra_semicolon = true # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 0 # number +mod_add_long_function_closebrace_comment = 0 # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number +mod_add_long_switch_closebrace_comment = 0 # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = true # false/true +mod_move_case_break = true # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = true # false/true +mod_remove_empty_return = true # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # If false, disable all multi-line comment changes, including cmt_width and leading chars. # Default is true. -cmt_indent_multi = true # false/true +cmt_indent_multi = true # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # Whether to put a star on subsequent comment lines -cmt_star_cont = true # false/true +cmt_star_cont = true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitue $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment. # Will substitue $(filename) with the current file's name. -cmt_insert_file_footer = "" # string +cmt_insert_file_footer = "" # The filename that contains text to insert before a function implementation if the function isn't preceeded with a C/C++ comment. # Will substitue $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # The filename that contains text to insert before a class if the class isn't preceeded with a C/C++ comment. # Will substitue $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true +cmt_insert_before_preproc = false # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = remove # ignore/add/remove/force +pp_indent = remove # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. -pp_indent_count = 1 # number +pp_indent_count = 1 # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true +pp_if_indent_code = false # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/mono.cfg b/tests/config/mono.cfg index ae04c514a4..e8516dcdd7 100644 --- a/tests/config/mono.cfg +++ b/tests/config/mono.cfg @@ -2,29 +2,29 @@ # Mono library format # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 8 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 8 indent_columns = output_tab_size -indent_label = 1 # pos: absolute col, neg: relative column +indent_label = 1 # indent_align_string = False # align broken strings # brace_indent = 0 indent_func_call_param = true # use indent tabstop indent_class = true -nl_enum_brace = remove # "enum {" vs "enum \n {" -nl_union_brace = remove # "union {" vs "union \n {" -nl_struct_brace = remove # "struct {" vs "struct \n {" -nl_do_brace = remove # "do {" vs "do \n {" -nl_if_brace = remove # "if () {" vs "if () \n {" -nl_for_brace = remove # "for () {" vs "for () \n {" -nl_else_brace = remove # "else {" vs "else \n {" -nl_while_brace = remove # "while () {" vs "while () \n {" -nl_switch_brace = remove # "switch () {" vs "switch () \n {" +nl_enum_brace = remove +nl_union_brace = remove +nl_struct_brace = remove +nl_do_brace = remove +nl_if_brace = remove +nl_for_brace = remove +nl_else_brace = remove +nl_while_brace = remove +nl_switch_brace = remove nl_func_var_def_blk = 1 nl_before_case = 1 -nl_fcall_brace = remove # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_fcall_brace = remove +nl_fdef_brace = add # nl_after_return = TRUE nl_brace_while = remove nl_brace_else = add @@ -37,15 +37,15 @@ nl_squeeze_ifdef = TRUE # mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" sp_before_semi = remove -sp_paren_paren = remove # space between (( and )) -sp_return_paren = remove # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_paren_paren = remove +sp_return_paren = remove +sp_sizeof_paren = remove +sp_before_sparen = force +sp_after_sparen = force +sp_after_cast = remove +sp_inside_braces = force +sp_inside_braces_struct = force +sp_inside_braces_enum = force sp_inside_paren = remove sp_inside_fparen = remove sp_inside_sparen = remove @@ -58,9 +58,9 @@ sp_bool = force sp_compare = force sp_assign = force sp_after_comma = force -sp_func_def_paren = force # "int foo (){" vs "int foo(){" -sp_func_call_paren = force # "foo (" vs "foo(" -sp_func_proto_paren = force # "int foo ();" vs "int foo();" +sp_func_def_paren = force +sp_func_call_paren = force +sp_func_proto_paren = force # align_with_tabs = FALSE # use tabs to align # align_on_tabstop = FALSE # align on tabstops diff --git a/tests/config/nSolve.cfg b/tests/config/nSolve.cfg index a314e477f5..938c447227 100644 --- a/tests/config/nSolve.cfg +++ b/tests/config/nSolve.cfg @@ -5,19 +5,19 @@ # # The type of line endings -newlines = auto # auto/lf/crlf/cr +newlines = auto # The original size of tabs in the input -input_tab_size = 4 # number +input_tab_size = 4 # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 4 # number +output_tab_size = 4 # The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # # Indenting @@ -25,1314 +25,1314 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 4 # number +indent_columns = 4 # The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents. # For FreeBSD, this is set to 4. -indent_continue = 0 # number +indent_continue = 0 # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs to brace level, align with spaces # 2=indent and align with tabs, using spaces when not on a tabstop -indent_with_tabs = 0 # number +indent_with_tabs = 0 # Comments that are not a brace level are indented with tabs on a tabstop. # Requires indent_with_tabs=2. If false, will use spaces. -indent_cmt_with_tabs = false # false/true +indent_cmt_with_tabs = false # Whether to indent strings broken by '\' so that they line up -indent_align_string = false # false/true +indent_align_string = false # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # Disabled indenting class braces if indent_braces is true -indent_braces_no_class = false # false/true +indent_braces_no_class = false # Disabled indenting struct braces if indent_braces is true -indent_braces_no_struct = false # false/true +indent_braces_no_struct = false # Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # The number of spaces to indent a namespace block -indent_namespace_level = 0 # number +indent_namespace_level = 0 # If the body of the namespace is longer than this number, it won't be indented. # Requires indent_namespace=true. Default=0 (no limit) -indent_namespace_limit = 0 # number +indent_namespace_limit = 0 # Whether the 'extern "C"' body is indented -indent_extern = false # false/true +indent_extern = false # Whether the 'class' body is indented -indent_class = false # false/true +indent_class = false # Whether to indent the stuff after a leading class colon -indent_class_colon = false # false/true +indent_class_colon = false # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level -indent_else_if = false # false/true +indent_else_if = false # Amount to indent variable declarations after a open brace. neg=relative, pos=absolute -indent_var_def_blk = 0 # number +indent_var_def_blk = 0 # Indent continued variable declarations instead of aligning. -indent_var_def_cont = false # false/true +indent_var_def_cont = false # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = false # false/true +indent_func_call_param = false # Same as indent_func_call_param, but for function defs -indent_func_def_param = false # false/true +indent_func_def_param = false # Same as indent_func_call_param, but for function protos -indent_func_proto_param = false # false/true +indent_func_proto_param = false # Same as indent_func_call_param, but for class declarations -indent_func_class_param = false # false/true +indent_func_class_param = false # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = false # false/true +indent_func_ctor_var_param = false # Same as indent_func_call_param, but for templates -indent_template_param = false # false/true +indent_template_param = false # Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true +indent_func_param_double = false # Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 0 # number +indent_func_const = 0 # Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 0 # number +indent_func_throw = 0 # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 1 # number +indent_member = 1 # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = false # false/true +indent_relative_single_line_comments = false # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 4 # number +indent_switch_case = 4 # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 0 # number +indent_case_brace = 0 # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 1 # number +indent_paren_close = 1 # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # If 'indent_bool_paren' is true, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones -indent_first_bool_expr = false # false/true +indent_first_bool_expr = false # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # Align continued statements at the '='. Default=True # If FALSE or the '=' is followed by a newline, the next line is indent one tab. -indent_align_assign = true # false/true +indent_align_assign = true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = ignore # ignore/add/remove/force +sp_arith = ignore # Add or remove space around assignment operator '=', '+=', etc -sp_assign = ignore # ignore/add/remove/force +sp_assign = ignore # Add or remove space around assignment operator '=' in a prototype -sp_assign_default = ignore # ignore/add/remove/force +sp_assign_default = ignore # Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. -sp_before_assign = ignore # ignore/add/remove/force +sp_before_assign = ignore # Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. -sp_after_assign = ignore # ignore/add/remove/force +sp_after_assign = ignore # Add or remove space around assignment '=' in enum -sp_enum_assign = ignore # ignore/add/remove/force +sp_enum_assign = ignore # Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_before_assign = ignore # ignore/add/remove/force +sp_enum_before_assign = ignore # Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_after_assign = ignore # ignore/add/remove/force +sp_enum_after_assign = ignore # Add or remove space around preprocessor '##' concatenation operator. Default=Add -sp_pp_concat = add # ignore/add/remove/force +sp_pp_concat = add # Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator. Default=Add -sp_pp_stringify = add # ignore/add/remove/force +sp_pp_stringify = add # Add or remove space around boolean operators '&&' and '||' -sp_bool = ignore # ignore/add/remove/force +sp_bool = ignore # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = ignore # ignore/add/remove/force +sp_compare = ignore # Add or remove space inside '(' and ')' -sp_inside_paren = ignore # ignore/add/remove/force +sp_inside_paren = ignore # Add or remove space between nested parens -sp_paren_paren = ignore # ignore/add/remove/force +sp_paren_paren = ignore # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # Add or remove space before pointer star '*' -sp_before_ptr_star = ignore # ignore/add/remove/force +sp_before_ptr_star = ignore # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force +sp_before_unnamed_ptr_star = ignore # Add or remove space between pointer stars '*' -sp_between_ptr_star = ignore # ignore/add/remove/force +sp_between_ptr_star = ignore # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = ignore # ignore/add/remove/force +sp_after_ptr_star = ignore # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = ignore # ignore/add/remove/force +sp_after_ptr_star_func = ignore # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = ignore # ignore/add/remove/force +sp_before_ptr_star_func = ignore # Add or remove space before a reference sign '&' -sp_before_byref = ignore # ignore/add/remove/force +sp_before_byref = ignore # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force +sp_before_unnamed_byref = ignore # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = ignore # ignore/add/remove/force +sp_after_byref = ignore # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = ignore # ignore/add/remove/force +sp_after_byref_func = ignore # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = ignore # ignore/add/remove/force +sp_before_byref_func = ignore # Add or remove space between type and word. Default=Force -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. -sp_template_angle = force # ignore/add/remove/force +sp_template_angle = force # Add or remove space before '<>' -sp_before_angle = ignore # ignore/add/remove/force +sp_before_angle = ignore # Add or remove space inside '<' and '>' -sp_inside_angle = ignore # ignore/add/remove/force +sp_inside_angle = ignore # Add or remove space after '<>' -sp_after_angle = ignore # ignore/add/remove/force +sp_after_angle = ignore # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = ignore # ignore/add/remove/force +sp_angle_paren = ignore # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = ignore # ignore/add/remove/force +sp_angle_word = ignore # Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add -sp_angle_shift = add # ignore/add/remove/force +sp_angle_shift = add # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = ignore # ignore/add/remove/force +sp_before_sparen = ignore # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = ignore # ignore/add/remove/force +sp_inside_sparen = ignore # Add or remove space before if-condition ')'. Overrides sp_inside_sparen. -sp_inside_sparen_close = ignore # ignore/add/remove/force +sp_inside_sparen_close = ignore # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = ignore # ignore/add/remove/force +sp_after_sparen = ignore # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = ignore # ignore/add/remove/force +sp_sparen_brace = ignore # Add or remove space between 'invariant' and '(' in the D language. -sp_invariant_paren = ignore # ignore/add/remove/force +sp_invariant_paren = ignore # Add or remove space after the ')' in 'invariant (C) c' in the D language. -sp_after_invariant_paren = ignore # ignore/add/remove/force +sp_after_invariant_paren = ignore # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # Add or remove space before ';'. Default=Remove -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = ignore # ignore/add/remove/force +sp_before_semi_for = ignore # Add or remove space before a semicolon of an empty part of a for statement. -sp_before_semi_for_empty = ignore # ignore/add/remove/force +sp_before_semi_for_empty = ignore # Add or remove space after ';', except when followed by a comment. Default=Add -sp_after_semi = add # ignore/add/remove/force +sp_after_semi = add # Add or remove space after ';' in non-empty 'for' statements. Default=Force -sp_after_semi_for = force # ignore/add/remove/force +sp_after_semi_for = force # Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; ). -sp_after_semi_for_empty = ignore # ignore/add/remove/force +sp_after_semi_for_empty = ignore # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # Add or remove space inside '[' and ']' -sp_inside_square = ignore # ignore/add/remove/force +sp_inside_square = ignore # Add or remove space after ',' -sp_after_comma = ignore # ignore/add/remove/force +sp_after_comma = ignore # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # Add or remove space between an open paren and comma: '(,' vs '( ,' -sp_paren_comma = force # ignore/add/remove/force +sp_paren_comma = force # Add or remove space before the variadic '...' when preceded by a non-punctuator -sp_before_ellipsis = ignore # ignore/add/remove/force +sp_before_ellipsis = ignore # Add or remove space after class ':' -sp_after_class_colon = ignore # ignore/add/remove/force +sp_after_class_colon = ignore # Add or remove space before class ':' -sp_before_class_colon = ignore # ignore/add/remove/force +sp_before_class_colon = ignore # Add or remove space before case ':'. Default=Remove -sp_before_case_colon = remove # ignore/add/remove/force +sp_before_case_colon = remove # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = ignore # ignore/add/remove/force +sp_after_operator_sym = ignore # Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = ignore # ignore/add/remove/force +sp_after_cast = ignore # Add or remove spaces inside cast parens -sp_inside_paren_cast = ignore # ignore/add/remove/force +sp_inside_paren_cast = ignore # Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = ignore # ignore/add/remove/force +sp_cpp_cast_paren = ignore # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = ignore # ignore/add/remove/force +sp_sizeof_paren = ignore # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = ignore # ignore/add/remove/force +sp_inside_braces_enum = ignore # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = ignore # ignore/add/remove/force +sp_inside_braces_struct = ignore # Add or remove space inside '{' and '}' -sp_inside_braces = ignore # ignore/add/remove/force +sp_inside_braces = ignore # Add or remove space inside '{}' -sp_inside_braces_empty = ignore # ignore/add/remove/force +sp_inside_braces_empty = ignore # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = ignore # ignore/add/remove/force +sp_type_func = ignore # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = ignore # ignore/add/remove/force +sp_func_proto_paren = ignore # Add or remove space between function name and '(' on function definition -sp_func_def_paren = ignore # ignore/add/remove/force +sp_func_def_paren = ignore # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # Add or remove space inside function '(' and ')' -sp_inside_fparen = ignore # ignore/add/remove/force +sp_inside_fparen = ignore # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # Add or remove space between ')' and '{' of function -sp_fparen_brace = ignore # ignore/add/remove/force +sp_fparen_brace = ignore # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # Add or remove space between function name and '()' on function calls without parameters. # If set to 'ignore' (the default), sp_func_call_paren is used. -sp_func_call_paren_empty = ignore # ignore/add/remove/force +sp_func_call_paren_empty = ignore # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = ignore # ignore/add/remove/force +sp_func_call_user_paren = ignore # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = ignore # ignore/add/remove/force +sp_func_class_paren = ignore # Add or remove space between 'return' and '(' -sp_return_paren = ignore # ignore/add/remove/force +sp_return_paren = ignore # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = ignore # ignore/add/remove/force +sp_defined_paren = ignore # Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = ignore # ignore/add/remove/force +sp_throw_paren = ignore # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = ignore # ignore/add/remove/force +sp_else_brace = ignore # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = ignore # ignore/add/remove/force +sp_brace_typedef = ignore # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # Add or remove space before the '::' operator -sp_before_dc = ignore # ignore/add/remove/force +sp_before_dc = ignore # Add or remove space after the '::' operator -sp_after_dc = remove # ignore/add/remove/force +sp_after_dc = remove # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # Add or remove space after the '!' (not) operator. Default=Remove -sp_not = remove # ignore/add/remove/force +sp_not = remove # Add or remove space after the '~' (invert) operator. Default=Remove -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # Add or remove space after the '&' (address-of) operator. Default=Remove # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # Add or remove space around the '.' or '->' operators. Default=Remove -sp_member = remove # ignore/add/remove/force +sp_member = remove # Add or remove space after the '*' (dereference) operator. Default=Remove # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # Add or remove space before a backslash-newline at the end of a line. Default=Add -sp_before_nl_cont = add # ignore/add/remove/force +sp_before_nl_cont = add # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force +sp_after_oc_scope = ignore # Add or remove space after the colon in message specs # '-(int) f:(int) x;' vs '-(int) f: (int) x;' -sp_after_oc_colon = ignore # ignore/add/remove/force +sp_after_oc_colon = ignore # Add or remove space before the colon in message specs # '-(int) f: (int) x;' vs '-(int) f : (int) x;' -sp_before_oc_colon = ignore # ignore/add/remove/force +sp_before_oc_colon = ignore # Add or remove space after the colon in message specs # '[object setValue:1];' vs '[object setValue: 1];' -sp_after_send_oc_colon = ignore # ignore/add/remove/force +sp_after_send_oc_colon = ignore # Add or remove space before the colon in message specs # '[object setValue:1];' vs '[object setValue :1];' -sp_before_send_oc_colon = ignore # ignore/add/remove/force +sp_before_send_oc_colon = ignore # Add or remove space after the (type) in message specs # '-(int)f: (int) x;' vs '-(int)f: (int)x;' -sp_after_oc_type = ignore # ignore/add/remove/force +sp_after_oc_type = ignore # Add or remove space after the first (type) in message specs # '-(int) f:(int)x;' vs '-(int)f:(int)x;' -sp_after_oc_return_type = ignore # ignore/add/remove/force +sp_after_oc_return_type = ignore # Add or remove space between '@selector' and '(' # '@selector(msgName)' vs '@selector (msgName)' # Also applies to @protocol() constructs -sp_after_oc_at_sel = ignore # ignore/add/remove/force +sp_after_oc_at_sel = ignore # Add or remove space between '@selector(x)' and the following word # '@selector(foo) a:' vs '@selector(foo)a:' -sp_after_oc_at_sel_parens = ignore # ignore/add/remove/force +sp_after_oc_at_sel_parens = ignore # Add or remove space inside '@selector' parens # '@selector(foo)' vs '@selector( foo )' # Also applies to @protocol() constructs -sp_inside_oc_at_sel_parens = ignore # ignore/add/remove/force +sp_inside_oc_at_sel_parens = ignore # Add or remove space before a block pointer caret # '^int (int arg){...}' vs. ' ^int (int arg){...}' -sp_before_oc_block_caret = ignore # ignore/add/remove/force +sp_before_oc_block_caret = ignore # Add or remove space after a block pointer caret # '^int (int arg){...}' vs. '^ int (int arg){...}' -sp_after_oc_block_caret = ignore # ignore/add/remove/force +sp_after_oc_block_caret = ignore # Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = force # ignore/add/remove/force +sp_cond_colon = force # Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = force # ignore/add/remove/force +sp_cond_question = force # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = ignore # ignore/add/remove/force +sp_case_label = ignore # Control the space around the D '..' operator. -sp_range = ignore # ignore/add/remove/force +sp_range = ignore # Control the space after the opening of a C++ comment '// A' vs '//A' -sp_cmt_cpp_start = ignore # ignore/add/remove/force +sp_cmt_cpp_start = ignore # Controls the spaces between #else or #endif and a trailing comment -sp_endif_cmt = ignore # ignore/add/remove/force +sp_endif_cmt = ignore # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # Whether to use tabs for aligning -align_with_tabs = false # false/true +align_with_tabs = false # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # Align variable definitions in prototypes and functions -align_func_params = false # false/true +align_func_params = false # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = false # false/true +align_same_func_call_params = false # The span for aligning variable definitions (0=don't align) -align_var_def_span = 1 # number +align_var_def_span = 1 # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 0 # number +align_var_def_star_style = 0 # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # Whether to align any attribute after the variable name -align_var_def_attribute = false # false/true +align_var_def_attribute = false # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = false # false/true +align_var_def_inline = false # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 1 # number +align_assign_span = 1 # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 0 # number +align_enum_equ_span = 0 # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # The span for aligning struct/union (0=don't align) -align_var_struct_span = 0 # number +align_var_struct_span = 0 # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 0 # number +align_struct_init_span = 0 # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number +align_typedef_gap = 0 # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 0 # number +align_typedef_span = 0 # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typedef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typedef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 0 # number +align_right_cmt_span = 0 # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. This has to be > 0 to do anything. -align_right_cmt_gap = 0 # number +align_right_cmt_gap = 0 # Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore) -align_right_cmt_at_col = 0 # number +align_right_cmt_at_col = 0 # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 1 # number +align_func_proto_span = 1 # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # Align function protos on the 'operator' keyword instead of what follows -align_on_operator = false # false/true +align_on_operator = false # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = true # false/true +align_single_line_func = true # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # The span for aligning ObjC msg spec (0=don't align) -align_oc_msg_spec_span = 0 # number +align_oc_msg_spec_span = 0 # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = false # false/true +align_nl_cont = false # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 0 # number +align_pp_define_gap = 0 # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 0 # number +align_pp_define_span = 0 # Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = true # false/true +align_left_shift = true # Span for aligning parameters in an Obj-C message call on the ':' (0=don't align) -align_oc_msg_colon_span = 0 # number +align_oc_msg_colon_span = 0 # Aligning parameters in an Obj-C '+' or '-' declaration on the ':' -align_oc_decl_colon = false # false/true +align_oc_decl_colon = false # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = false # false/true +nl_assign_leave_one_liners = false # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = false # false/true +nl_class_leave_one_liners = false # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = true # false/true +nl_enum_leave_one_liners = true # Don't split one-line get or set functions -nl_getset_leave_one_liners = true # false/true +nl_getset_leave_one_liners = true # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = true # false/true +nl_func_leave_one_liners = true # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # Add or remove newlines at the start of the file -nl_start_of_file = ignore # ignore/add/remove/force +nl_start_of_file = ignore # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # Add or remove newline at the end of the file -nl_end_of_file = ignore # ignore/add/remove/force +nl_end_of_file = ignore # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 0 # number +nl_end_of_file_min = 0 # Add or remove newline between '=' and '{' -nl_assign_brace = ignore # ignore/add/remove/force +nl_assign_brace = ignore # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # The number of blank lines after a block of variable definitions -nl_func_var_def_blk = 0 # number +nl_func_var_def_blk = 0 # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = ignore # ignore/add/remove/force +nl_fcall_brace = ignore # Add or remove newline between 'enum' and '{' -nl_enum_brace = ignore # ignore/add/remove/force +nl_enum_brace = ignore # Add or remove newline between 'struct and '{' -nl_struct_brace = ignore # ignore/add/remove/force +nl_struct_brace = ignore # Add or remove newline between 'union' and '{' -nl_union_brace = ignore # ignore/add/remove/force +nl_union_brace = ignore # Add or remove newline between 'if' and '{' -nl_if_brace = ignore # ignore/add/remove/force +nl_if_brace = ignore # Add or remove newline between '}' and 'else' -nl_brace_else = ignore # ignore/add/remove/force +nl_brace_else = ignore # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = ignore # ignore/add/remove/force +nl_elseif_brace = ignore # Add or remove newline between 'else' and '{' -nl_else_brace = ignore # ignore/add/remove/force +nl_else_brace = ignore # Add or remove newline between 'else' and 'if' -nl_else_if = ignore # ignore/add/remove/force +nl_else_if = ignore # Add or remove newline between '}' and 'finally' -nl_brace_finally = ignore # ignore/add/remove/force +nl_brace_finally = ignore # Add or remove newline between 'finally' and '{' -nl_finally_brace = ignore # ignore/add/remove/force +nl_finally_brace = ignore # Add or remove newline between 'try' and '{' -nl_try_brace = ignore # ignore/add/remove/force +nl_try_brace = ignore # Add or remove newline between get/set and '{' -nl_getset_brace = ignore # ignore/add/remove/force +nl_getset_brace = ignore # Add or remove newline between 'for' and '{' -nl_for_brace = ignore # ignore/add/remove/force +nl_for_brace = ignore # Add or remove newline between 'catch' and '{' -nl_catch_brace = ignore # ignore/add/remove/force +nl_catch_brace = ignore # Add or remove newline between '}' and 'catch' -nl_brace_catch = ignore # ignore/add/remove/force +nl_brace_catch = ignore # Add or remove newline between 'while' and '{' -nl_while_brace = ignore # ignore/add/remove/force +nl_while_brace = ignore # Add or remove newline between 'using' and '{' -nl_using_brace = ignore # ignore/add/remove/force +nl_using_brace = ignore # Add or remove newline between two open or close braces. # Due to general newline/brace handling, REMOVE may not work. -nl_brace_brace = ignore # ignore/add/remove/force +nl_brace_brace = ignore # Add or remove newline between 'do' and '{' -nl_do_brace = ignore # ignore/add/remove/force +nl_do_brace = ignore # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = ignore # ignore/add/remove/force +nl_brace_while = ignore # Add or remove newline between 'switch' and '{' -nl_switch_brace = ignore # ignore/add/remove/force +nl_switch_brace = ignore # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = false # false/true +nl_multi_line_define = false # Whether to put a newline before 'case' statement -nl_before_case = false # false/true +nl_before_case = false # Add or remove newline between ')' and 'throw' -nl_before_throw = ignore # ignore/add/remove/force +nl_before_throw = ignore # Whether to put a newline after 'case' statement -nl_after_case = false # false/true +nl_after_case = false # Newline between namespace and { -nl_namespace_brace = ignore # ignore/add/remove/force +nl_namespace_brace = ignore # Add or remove newline between 'template<>' and whatever follows. -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # Add or remove newline between return type and function name in a function definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # Add or remove newline between return type and function name inside a class {} # Uses nl_func_type_name or nl_func_proto_type_name if set to ignore. -nl_func_type_name_class = ignore # ignore/add/remove/force +nl_func_type_name_class = ignore # Add or remove newline between function scope and name in a definition # Controls the newline after '::' in 'void A::f() { }' -nl_func_scope_name = ignore # ignore/add/remove/force +nl_func_scope_name = ignore # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = ignore # ignore/add/remove/force +nl_func_proto_type_name = ignore # Add or remove newline between a function name and the opening '(' -nl_func_paren = ignore # ignore/add/remove/force +nl_func_paren = ignore # Add or remove newline between a function name and the opening '(' in the definition -nl_func_def_paren = ignore # ignore/add/remove/force +nl_func_def_paren = ignore # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # Add or remove newline after '(' in a function definition -nl_func_def_start = ignore # ignore/add/remove/force +nl_func_def_start = ignore # Overrides nl_func_decl_start when there is only one parameter. -nl_func_decl_start_single = ignore # ignore/add/remove/force +nl_func_decl_start_single = ignore # Overrides nl_func_def_start when there is only one parameter. -nl_func_def_start_single = ignore # ignore/add/remove/force +nl_func_def_start_single = ignore # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # Add or remove newline after each ',' in a function definition -nl_func_def_args = ignore # ignore/add/remove/force +nl_func_def_args = ignore # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # Add or remove newline before the ')' in a function definition -nl_func_def_end = ignore # ignore/add/remove/force +nl_func_def_end = ignore # Overrides nl_func_decl_end when there is only one parameter. -nl_func_decl_end_single = ignore # ignore/add/remove/force +nl_func_decl_end_single = ignore # Overrides nl_func_def_end when there is only one parameter. -nl_func_def_end_single = ignore # ignore/add/remove/force +nl_func_def_end_single = ignore # Add or remove newline between '()' in a function declaration. -nl_func_decl_empty = ignore # ignore/add/remove/force +nl_func_decl_empty = ignore # Add or remove newline between '()' in a function definition. -nl_func_def_empty = ignore # ignore/add/remove/force +nl_func_def_empty = ignore # Add or remove newline between function signature and '{' -nl_fdef_brace = ignore # ignore/add/remove/force +nl_fdef_brace = ignore # Whether to put a newline after 'return' statement -nl_after_return = false # false/true +nl_after_return = false # Add or remove a newline between the return keyword and return expression. -nl_return_expr = ignore # ignore/add/remove/force +nl_return_expr = ignore # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = false # false/true +nl_after_semicolon = false # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = false # false/true +nl_after_brace_open = false # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true +nl_after_brace_open_cmt = false # Whether to put a newline after a virtual brace open with a non-empty body. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = false # false/true +nl_after_vbrace_open = false # Whether to put a newline after a virtual brace open with an empty body. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open_empty = false # false/true +nl_after_vbrace_open_empty = false # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. -nl_after_brace_close = false # false/true +nl_after_brace_close = false # Whether to put a newline after a virtual brace close. # Would add a newline before return in: 'if (foo) a++; return;' -nl_after_vbrace_close = false # false/true +nl_after_vbrace_close = false # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true +nl_squeeze_ifdef = false # Add or remove blank line before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # Add or remove blank line after 'if' statement -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # Add or remove blank line before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # Add or remove blank line after 'for' statement -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # Add or remove blank line before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # Add or remove blank line after 'while' statement -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # Add or remove blank line before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # Add or remove blank line after 'switch' statement -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # Add or remove blank line before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # Add or remove blank line after 'do/while' statement -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # Whether to double-space before the close brace of a struct/union/enum # (lower priority than 'eat_blanks_before_close_brace') -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # # Positioning options # # The position of arithmetic operators in wrapped expressions -pos_arith = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_arith = ignore # The position of assignment in wrapped expressions. # Do not affect '=' followed by '{' -pos_assign = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_assign = ignore # The position of boolean operators in wrapped expressions -pos_bool = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_bool = ignore # The position of comparison operators in wrapped expressions -pos_compare = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_compare = ignore # The position of conditional (b ? t : f) operators in wrapped expressions -pos_conditional = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_conditional = ignore # The position of the comma in wrapped expressions -pos_comma = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_comma = ignore # The position of the comma in the constructor initialization list -pos_class_comma = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_comma = ignore # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_colon = ignore # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true +ls_for_split_full = false # Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true +ls_func_split_full = false # # Blank line options # # The maximum consecutive newlines -nl_max = 0 # number +nl_max = 0 # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 0 # number +nl_after_func_proto_group = 0 # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 0 # number +nl_after_func_body = 0 # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 0 # number +nl_after_func_body_one_liner = 0 # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 0 # number +nl_before_block_comment = 0 # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # Whether to force a newline after a multi-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 0 # number +nl_before_access_spec = 0 # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # The number of newlines between a function def and the function comment. # 0 = No change. -nl_comment_func_def = 0 # number +nl_comment_func_def = 0 # The number of newlines after a try-catch-finally block that isn't followed by a brace close. # 0 = No change. -nl_after_try_catch_finally = 0 # number +nl_after_try_catch_finally = 0 # The number of newlines before and after a property, indexer or event decl. # 0 = No change. -nl_around_cs_property = 0 # number +nl_around_cs_property = 0 # The number of newlines between the get/set/add/remove handlers in C#. # 0 = No change. -nl_between_get_set = 0 # number +nl_between_get_set = 0 # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = false # false/true +eat_blanks_after_open_brace = false # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = false # false/true +eat_blanks_before_close_brace = false # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = ignore # ignore/add/remove/force +mod_full_brace_do = ignore # Add or remove braces on single-line 'for' statement -mod_full_brace_for = ignore # ignore/add/remove/force +mod_full_brace_for = ignore # Add or remove braces on single-line function definitions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = ignore # ignore/add/remove/force +mod_full_brace_if = ignore # Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if. # If any must be braced, they are all braced. If all can be unbraced, then the braces are removed. -mod_full_brace_if_chain = false # false/true +mod_full_brace_if_chain = false # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # Add or remove braces on single-line 'while' statement -mod_full_brace_while = ignore # ignore/add/remove/force +mod_full_brace_while = ignore # Add or remove braces on single-line 'using ()' statement -mod_full_brace_using = ignore # ignore/add/remove/force +mod_full_brace_using = ignore # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = ignore # ignore/add/remove/force +mod_paren_on_return = ignore # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = false # false/true +mod_full_paren_if_bool = false # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = false # false/true +mod_remove_extra_semicolon = false # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 0 # number +mod_add_long_function_closebrace_comment = 0 # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number +mod_add_long_switch_closebrace_comment = 0 # If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after # the #else, a comment will be added. -mod_add_long_ifdef_endif_comment = 0 # number +mod_add_long_ifdef_endif_comment = 0 # If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after # the #endif, a comment will be added. -mod_add_long_ifdef_else_comment = 0 # number +mod_add_long_ifdef_else_comment = 0 # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = false # false/true +mod_move_case_break = false # Will add or remove the braces around a fully braced case statement. # Will only remove the braces if there are no variable declarations in the block. -mod_case_brace = ignore # ignore/add/remove/force +mod_case_brace = ignore # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = false # false/true +mod_remove_empty_return = false # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # Set the comment reflow mode (default: 0) # 0: no reflowing (apart from the line wrapping due to cmt_width) # 1: no touching at all # 2: full reflow -cmt_reflow_mode = 0 # number +cmt_reflow_mode = 0 # If false, disable all multi-line comment changes, including cmt_width. keyword substitution, and leading chars. # Default is true. -cmt_indent_multi = true # false/true +cmt_indent_multi = true # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_footer = "" # string +cmt_insert_file_footer = "" # The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment. # Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment. # Will substitute $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true +cmt_insert_before_preproc = false # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. -pp_indent_count = 1 # number +pp_indent_count = 1 # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true +pp_if_indent_code = false # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/nepenthes.cfg b/tests/config/nepenthes.cfg index 951f4ee9d3..e7482a2476 100644 --- a/tests/config/nepenthes.cfg +++ b/tests/config/nepenthes.cfg @@ -5,19 +5,19 @@ # # The type of line endings -newlines = auto # auto/lf/crlf/cr +newlines = auto # The original size of tabs in the input -input_tab_size = 4 # number +input_tab_size = 4 # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 4 # number +output_tab_size = 4 # The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # # Indenting @@ -25,1214 +25,1214 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 4 # number +indent_columns = 4 # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 2 # number +indent_with_tabs = 2 # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # The number of spaces to indent a namespace block -indent_namespace_level = 0 # number +indent_namespace_level = 0 # If the body of the namespace is longer than this number, it won't be indented. # Requires indent_namespace=true. Default=0 (no limit) -indent_namespace_limit = 0 # number +indent_namespace_limit = 0 # Whether the 'extern "C"' body is indented -indent_extern = false # false/true +indent_extern = false # Whether the 'class' body is indented -indent_class = false # false/true +indent_class = false # Whether to indent the stuff after a leading class colon -indent_class_colon = false # false/true +indent_class_colon = false # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level -indent_else_if = false # false/true +indent_else_if = false # Amount to indent variable declarations after a open brace. neg=relative, pos=absolute -indent_var_def_blk = 0 # number +indent_var_def_blk = 0 # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = false # false/true +indent_func_call_param = false # Same as indent_func_call_param, but for function defs -indent_func_def_param = false # false/true +indent_func_def_param = false # Same as indent_func_call_param, but for function protos -indent_func_proto_param = false # false/true +indent_func_proto_param = false # Same as indent_func_call_param, but for class declarations -indent_func_class_param = false # false/true +indent_func_class_param = false # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = false # false/true +indent_func_ctor_var_param = false # Same as indent_func_call_param, but for templates -indent_template_param = false # false/true +indent_template_param = false # Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true +indent_func_param_double = false # Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 0 # number +indent_func_const = 0 # Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 0 # number +indent_func_throw = 0 # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 0 # number +indent_member = 0 # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = false # false/true +indent_relative_single_line_comments = false # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 0 # number +indent_switch_case = 0 # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 0 # number +indent_case_brace = 0 # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 0 # number +indent_paren_close = 0 # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # Align continued statements at the '='. Default=True # If FALSE or the '=' is followed by a newline, the next line is indent one tab. -indent_align_assign = true # false/true +indent_align_assign = true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = ignore # ignore/add/remove/force +sp_arith = ignore # Add or remove space around assignment operator '=', '+=', etc -sp_assign = ignore # ignore/add/remove/force +sp_assign = ignore # Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. -sp_before_assign = ignore # ignore/add/remove/force +sp_before_assign = ignore # Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. -sp_after_assign = ignore # ignore/add/remove/force +sp_after_assign = ignore # Add or remove space around assignment '=' in enum -sp_enum_assign = ignore # ignore/add/remove/force +sp_enum_assign = ignore # Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_before_assign = ignore # ignore/add/remove/force +sp_enum_before_assign = ignore # Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_after_assign = ignore # ignore/add/remove/force +sp_enum_after_assign = ignore # Add or remove space around preprocessor '##' concatenation operator. Default=Add -sp_pp_concat = add # ignore/add/remove/force +sp_pp_concat = add # Add or remove space after preprocessor '#' stringify operator. Default=Add -sp_pp_stringify = add # ignore/add/remove/force +sp_pp_stringify = add # Add or remove space around boolean operators '&&' and '||' -sp_bool = ignore # ignore/add/remove/force +sp_bool = ignore # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = ignore # ignore/add/remove/force +sp_compare = ignore # Add or remove space inside '(' and ')' -sp_inside_paren = ignore # ignore/add/remove/force +sp_inside_paren = ignore # Add or remove space between nested parens -sp_paren_paren = ignore # ignore/add/remove/force +sp_paren_paren = ignore # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # Add or remove space before pointer star '*' -sp_before_ptr_star = ignore # ignore/add/remove/force +sp_before_ptr_star = ignore # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force +sp_before_unnamed_ptr_star = ignore # Add or remove space between pointer stars '*' -sp_between_ptr_star = ignore # ignore/add/remove/force +sp_between_ptr_star = ignore # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = ignore # ignore/add/remove/force +sp_after_ptr_star = ignore # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = ignore # ignore/add/remove/force +sp_after_ptr_star_func = ignore # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = ignore # ignore/add/remove/force +sp_before_ptr_star_func = ignore # Add or remove space before a reference sign '&' -sp_before_byref = ignore # ignore/add/remove/force +sp_before_byref = ignore # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force +sp_before_unnamed_byref = ignore # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = ignore # ignore/add/remove/force +sp_after_byref = ignore # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = ignore # ignore/add/remove/force +sp_after_byref_func = ignore # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = ignore # ignore/add/remove/force +sp_before_byref_func = ignore # Add or remove space between type and word. Default=Force -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. -sp_template_angle = ignore # ignore/add/remove/force +sp_template_angle = ignore # Add or remove space before '<>' -sp_before_angle = ignore # ignore/add/remove/force +sp_before_angle = ignore # Add or remove space inside '<' and '>' -sp_inside_angle = ignore # ignore/add/remove/force +sp_inside_angle = ignore # Add or remove space after '<>' -sp_after_angle = ignore # ignore/add/remove/force +sp_after_angle = ignore # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = ignore # ignore/add/remove/force +sp_angle_paren = ignore # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = ignore # ignore/add/remove/force +sp_angle_word = ignore # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = ignore # ignore/add/remove/force +sp_before_sparen = ignore # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = ignore # ignore/add/remove/force +sp_inside_sparen = ignore # Add or remove space before if-condition ')'. Overrides sp_inside_sparen. -sp_inside_sparen_close = ignore # ignore/add/remove/force +sp_inside_sparen_close = ignore # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = ignore # ignore/add/remove/force +sp_after_sparen = ignore # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = remove # ignore/add/remove/force +sp_sparen_brace = remove # Add or remove space between 'invariant' and '(' in the D language. -sp_invariant_paren = ignore # ignore/add/remove/force +sp_invariant_paren = ignore # Add or remove space after the ')' in 'invariant (C) c' in the D language. -sp_after_invariant_paren = ignore # ignore/add/remove/force +sp_after_invariant_paren = ignore # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # Add or remove space before ';'. Default=Remove -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = remove # ignore/add/remove/force +sp_before_semi_for = remove # Add or remove space before a semicolon of an empty part of a for statement. -sp_before_semi_for_empty = ignore # ignore/add/remove/force +sp_before_semi_for_empty = ignore # Add or remove space after ';', except when followed by a comment. Default=Add -sp_after_semi = add # ignore/add/remove/force +sp_after_semi = add # Add or remove space after ';' in non-empty 'for' statements. Default=Force -sp_after_semi_for = force # ignore/add/remove/force +sp_after_semi_for = force # Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; ). -sp_after_semi_for_empty = ignore # ignore/add/remove/force +sp_after_semi_for_empty = ignore # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # Add or remove space before '[]' -sp_before_squares = remove # ignore/add/remove/force +sp_before_squares = remove # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # Add or remove space after ',' -sp_after_comma = add # ignore/add/remove/force +sp_after_comma = add # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # Add or remove space before the variadic '...' -sp_before_ellipsis = add # ignore/add/remove/force +sp_before_ellipsis = add # Add or remove space after class ':' -sp_after_class_colon = ignore # ignore/add/remove/force +sp_after_class_colon = ignore # Add or remove space before class ':' -sp_before_class_colon = ignore # ignore/add/remove/force +sp_before_class_colon = ignore # Add or remove space before case ':'. Default=Remove -sp_before_case_colon = remove # ignore/add/remove/force +sp_before_case_colon = remove # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = ignore # ignore/add/remove/force +sp_after_operator_sym = ignore # Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = ignore # ignore/add/remove/force +sp_after_cast = ignore # Add or remove spaces inside cast parens -sp_inside_paren_cast = ignore # ignore/add/remove/force +sp_inside_paren_cast = ignore # Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = remove # ignore/add/remove/force +sp_cpp_cast_paren = remove # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # Add or remove space after the tag keyword (Pawn) -sp_after_tag = remove # ignore/add/remove/force +sp_after_tag = remove # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = remove # ignore/add/remove/force +sp_inside_braces_enum = remove # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = remove # ignore/add/remove/force +sp_inside_braces_struct = remove # Add or remove space inside '{' and '}' -sp_inside_braces = remove # ignore/add/remove/force +sp_inside_braces = remove # Add or remove space inside '{}' -sp_inside_braces_empty = remove # ignore/add/remove/force +sp_inside_braces_empty = remove # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = ignore # ignore/add/remove/force +sp_type_func = ignore # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = ignore # ignore/add/remove/force +sp_func_proto_paren = ignore # Add or remove space between function name and '(' on function definition -sp_func_def_paren = ignore # ignore/add/remove/force +sp_func_def_paren = ignore # Add or remove space inside empty function '()' -sp_inside_fparens = ignore # ignore/add/remove/force +sp_inside_fparens = ignore # Add or remove space inside function '(' and ')' -sp_inside_fparen = ignore # ignore/add/remove/force +sp_inside_fparen = ignore # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # Add or remove space between ')' and '{' of function -sp_fparen_brace = ignore # ignore/add/remove/force +sp_fparen_brace = ignore # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = ignore # ignore/add/remove/force +sp_func_call_user_paren = ignore # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = ignore # ignore/add/remove/force +sp_func_class_paren = ignore # Add or remove space between 'return' and '(' -sp_return_paren = ignore # ignore/add/remove/force +sp_return_paren = ignore # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = remove # ignore/add/remove/force +sp_defined_paren = remove # Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = remove # ignore/add/remove/force +sp_throw_paren = remove # Add or remove space between macro and value -sp_macro = add # ignore/add/remove/force +sp_macro = add # Add or remove space between macro function ')' and value -sp_macro_func = add # ignore/add/remove/force +sp_macro_func = add # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = remove # ignore/add/remove/force +sp_else_brace = remove # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = ignore # ignore/add/remove/force +sp_brace_typedef = ignore # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # Add or remove space before the '::' operator -sp_before_dc = ignore # ignore/add/remove/force +sp_before_dc = ignore # Add or remove space after the '::' operator -sp_after_dc = ignore # ignore/add/remove/force +sp_after_dc = ignore # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # Add or remove space after the '!' (not) operator. Default=Remove -sp_not = remove # ignore/add/remove/force +sp_not = remove # Add or remove space after the '~' (invert) operator. Default=Remove -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # Add or remove space after the '&' (address-of) operator. Default=Remove # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # Add or remove space around the '.' or '->' operators. Default=Remove -sp_member = remove # ignore/add/remove/force +sp_member = remove # Add or remove space after the '*' (dereference) operator. Default=Remove # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # Add or remove space before a backslash-newline at the end of a line. Default=Add -sp_before_nl_cont = add # ignore/add/remove/force +sp_before_nl_cont = add # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force +sp_after_oc_scope = ignore # Add or remove space after the colon in message specs # '-(int) f:(int) x;' vs '-(int) f: (int) x;' -sp_after_oc_colon = ignore # ignore/add/remove/force +sp_after_oc_colon = ignore # Add or remove space before the colon in message specs # '-(int) f: (int) x;' vs '-(int) f : (int) x;' -sp_before_oc_colon = ignore # ignore/add/remove/force +sp_before_oc_colon = ignore # Add or remove space after the colon in message specs # '[object setValue:1];' vs '[object setValue: 1];' -sp_after_send_oc_colon = ignore # ignore/add/remove/force +sp_after_send_oc_colon = ignore # Add or remove space before the colon in message specs # '[object setValue:1];' vs '[object setValue :1];' -sp_before_send_oc_colon = ignore # ignore/add/remove/force +sp_before_send_oc_colon = ignore # Add or remove space after the (type) in message specs # '-(int)f: (int) x;' vs '-(int)f: (int)x;' -sp_after_oc_type = ignore # ignore/add/remove/force +sp_after_oc_type = ignore # Add or remove space after the first (type) in message specs # '-(int) f:(int)x;' vs '-(int)f:(int)x;' -sp_after_oc_return_type = ignore # ignore/add/remove/force +sp_after_oc_return_type = ignore # Add or remove space between '@selector' and '(' # '@selector(msgName).' vs '@selector (msgName)' -sp_after_oc_at_sel = ignore # ignore/add/remove/force +sp_after_oc_at_sel = ignore # Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = ignore # ignore/add/remove/force +sp_cond_colon = ignore # Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = ignore # ignore/add/remove/force +sp_cond_question = ignore # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = ignore # ignore/add/remove/force +sp_case_label = ignore # Control the space around the D '..' operator. -sp_range = ignore # ignore/add/remove/force +sp_range = ignore # Control the space after the opening of a C++ comment '// A' vs '//A' -sp_cmt_cpp_start = ignore # ignore/add/remove/force +sp_cmt_cpp_start = ignore # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = true # false/true +align_keep_tabs = true # Whether to use tabs for aligning -align_with_tabs = true # false/true +align_with_tabs = true # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # Align variable definitions in prototypes and functions -align_func_params = false # false/true +align_func_params = false # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = false # false/true +align_same_func_call_params = false # The span for aligning variable definitions (0=don't align) -align_var_def_span = 0 # number +align_var_def_span = 0 # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 0 # number +align_var_def_star_style = 0 # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # Whether to align any attribute after the variable name -align_var_def_attribute = false # false/true +align_var_def_attribute = false # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = false # false/true +align_var_def_inline = false # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 0 # number +align_assign_span = 0 # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 0 # number +align_enum_equ_span = 0 # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # The span for aligning struct/union (0=don't align) -align_var_struct_span = 0 # number +align_var_struct_span = 0 # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 0 # number +align_struct_init_span = 0 # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number +align_typedef_gap = 0 # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 0 # number +align_typedef_span = 0 # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typedef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typedef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 0 # number +align_right_cmt_span = 0 # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. -align_right_cmt_gap = 0 # number +align_right_cmt_gap = 0 # Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore) -align_right_cmt_at_col = 0 # number +align_right_cmt_at_col = 0 # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # Align function protos on the 'operator' keyword instead of what follows -align_on_operator = false # false/true +align_on_operator = false # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true +align_single_line_func = false # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # The span for aligning ObjC msg spec (0=don't align) -align_oc_msg_spec_span = 0 # number +align_oc_msg_spec_span = 0 # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = false # false/true +align_nl_cont = false # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 0 # number +align_pp_define_gap = 0 # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 0 # number +align_pp_define_span = 0 # Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = true # false/true +align_left_shift = true # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = false # false/true +nl_assign_leave_one_liners = false # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = false # false/true +nl_class_leave_one_liners = false # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = false # false/true +nl_enum_leave_one_liners = false # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # Add or remove newlines at the start of the file -nl_start_of_file = ignore # ignore/add/remove/force +nl_start_of_file = ignore # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # Add or remove newline at the end of the file -nl_end_of_file = add # ignore/add/remove/force +nl_end_of_file = add # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 0 # number +nl_end_of_file_min = 0 # Add or remove newline between '=' and '{' -nl_assign_brace = ignore # ignore/add/remove/force +nl_assign_brace = ignore # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 0 # number +nl_func_var_def_blk = 0 # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = add # ignore/add/remove/force +nl_fcall_brace = add # Add or remove newline between 'enum' and '{' -nl_enum_brace = remove # ignore/add/remove/force +nl_enum_brace = remove # Add or remove newline between 'struct and '{' -nl_struct_brace = remove # ignore/add/remove/force +nl_struct_brace = remove # Add or remove newline between 'union' and '{' -nl_union_brace = remove # ignore/add/remove/force +nl_union_brace = remove # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # Add or remove newline between '}' and 'else' -nl_brace_else = remove # ignore/add/remove/force +nl_brace_else = remove # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = add # ignore/add/remove/force +nl_elseif_brace = add # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # Add or remove newline between 'else' and 'if' -nl_else_if = add # ignore/add/remove/force +nl_else_if = add # Add or remove newline between '}' and 'finally' -nl_brace_finally = add # ignore/add/remove/force +nl_brace_finally = add # Add or remove newline between 'finally' and '{' -nl_finally_brace = add # ignore/add/remove/force +nl_finally_brace = add # Add or remove newline between 'try' and '{' -nl_try_brace = add # ignore/add/remove/force +nl_try_brace = add # Add or remove newline between get/set and '{' -nl_getset_brace = ignore # ignore/add/remove/force +nl_getset_brace = ignore # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # Add or remove newline between 'catch' and '{' -nl_catch_brace = add # ignore/add/remove/force +nl_catch_brace = add # Add or remove newline between '}' and 'catch' -nl_brace_catch = add # ignore/add/remove/force +nl_brace_catch = add # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # Add or remove newline between two open or close braces. # Due to general newline/brace handling, REMOVE may not work. -nl_brace_brace = ignore # ignore/add/remove/force +nl_brace_brace = ignore # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = false # false/true +nl_multi_line_define = false # Whether to put a newline before 'case' statement -nl_before_case = false # false/true +nl_before_case = false # Add or remove newline between ')' and 'throw' -nl_before_throw = ignore # ignore/add/remove/force +nl_before_throw = ignore # Whether to put a newline after 'case' statement -nl_after_case = false # false/true +nl_after_case = false # Newline between namespace and { -nl_namespace_brace = ignore # ignore/add/remove/force +nl_namespace_brace = ignore # Add or remove newline between 'template<>' and whatever follows. -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # Add or remove newline between return type and function name in a function definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # Add or remove newline between return type and function name inside a class {} # Uses nl_func_type_name or nl_func_proto_type_name if set to ignore. -nl_func_type_name_class = ignore # ignore/add/remove/force +nl_func_type_name_class = ignore # Add or remove newline between function scope and name in a definition # Controls the newline after '::' in 'void A::f() { }' -nl_func_scope_name = ignore # ignore/add/remove/force +nl_func_scope_name = ignore # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = ignore # ignore/add/remove/force +nl_func_proto_type_name = ignore # Add or remove newline between a function name and the opening '(' -nl_func_paren = remove # ignore/add/remove/force +nl_func_paren = remove # Add or remove newline after '(' in a function declaration -nl_func_decl_start = remove # ignore/add/remove/force +nl_func_decl_start = remove # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = remove # ignore/add/remove/force +nl_func_decl_args = remove # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = remove # ignore/add/remove/force +nl_func_decl_end = remove # Add or remove newline between '()' in a function declaration. -nl_func_decl_empty = remove # ignore/add/remove/force +nl_func_decl_empty = remove # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # Whether to put a newline after 'return' statement -nl_after_return = false # false/true +nl_after_return = false # Add or remove a newline between the return keyword and return expression. -nl_return_expr = ignore # ignore/add/remove/force +nl_return_expr = ignore # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = false # false/true +nl_after_semicolon = false # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = false # false/true +nl_after_brace_open = false # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true +nl_after_brace_open_cmt = false # Whether to put a newline after a virtual brace open. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = false # false/true +nl_after_vbrace_open = false # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. -nl_after_brace_close = false # false/true +nl_after_brace_close = false # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true +nl_squeeze_ifdef = false # Add or remove newline before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # Add or remove newline after 'if' -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # Add or remove newline before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # Add or remove newline after 'for' -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # Add or remove newline before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # Add or remove newline after 'while' -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # Add or remove newline before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # Add or remove newline after 'switch' -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # Add or remove newline before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # Add or remove newline after 'do' -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # Whether to double-space before the close brace of a struct/union/enum -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # # Positioning options # # The position of arithmetic operators in wrapped expressions -pos_arith = ignore # ignore/lead/trail +pos_arith = ignore # The position of assignment in wrapped expressions -pos_assign = ignore # ignore/lead/trail +pos_assign = ignore # The position of boolean operators in wrapped expressions -pos_bool = ignore # ignore/lead/trail +pos_bool = ignore # The position of comparison operators in wrapped expressions -pos_compare = ignore # ignore/lead/trail +pos_compare = ignore # The position of conditional (b ? t : f) operators in wrapped expressions -pos_conditional = ignore # ignore/lead/trail +pos_conditional = ignore # The position of the comma in wrapped expressions -pos_comma = ignore # ignore/lead/trail +pos_comma = ignore # The position of the comma in the constructor initialization list -pos_class_comma = ignore # ignore/lead/trail +pos_class_comma = ignore # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true +ls_for_split_full = false # Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true +ls_func_split_full = false # # Blank line options # # The maximum consecutive newlines -nl_max = 0 # number +nl_max = 0 # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 0 # number +nl_after_func_proto_group = 0 # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 0 # number +nl_after_func_body = 0 # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 0 # number +nl_after_func_body_one_liner = 0 # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 0 # number +nl_before_block_comment = 0 # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # Whether to force a newline after a mulit-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 0 # number +nl_before_access_spec = 0 # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # The number of newlines between a function def and the function comment. # 0 = No change. -nl_comment_func_def = 0 # number +nl_comment_func_def = 0 # The number of newlines after a try-catch-finally block that isn't followed by a brace close. # 0 = No change. -nl_after_try_catch_finally = 0 # number +nl_after_try_catch_finally = 0 # The number of newlines before and after a property, indexer or event decl. # 0 = No change. -nl_around_cs_property = 0 # number +nl_around_cs_property = 0 # The number of newlines between the get/set/add/remove handlers in C#. # 0 = No change. -nl_between_get_set = 0 # number +nl_between_get_set = 0 # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = false # false/true +eat_blanks_after_open_brace = false # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = false # false/true +eat_blanks_before_close_brace = false # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = ignore # ignore/add/remove/force +mod_full_brace_do = ignore # Add or remove braces on single-line 'for' statement -mod_full_brace_for = ignore # ignore/add/remove/force +mod_full_brace_for = ignore # Add or remove braces on single-line function definitions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = ignore # ignore/add/remove/force +mod_full_brace_if = ignore # Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if. # If any must be braced, they are all braced. If all can be unbraced, then the braces are removed. -mod_full_brace_if_chain = false # false/true +mod_full_brace_if_chain = false # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # Add or remove braces on single-line 'while' statement -mod_full_brace_while = ignore # ignore/add/remove/force +mod_full_brace_while = ignore # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = ignore # ignore/add/remove/force +mod_paren_on_return = ignore # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = false # false/true +mod_full_paren_if_bool = false # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = false # false/true +mod_remove_extra_semicolon = false # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 0 # number +mod_add_long_function_closebrace_comment = 0 # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number +mod_add_long_switch_closebrace_comment = 0 # If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after # the #else, a comment will be added. -mod_add_long_ifdef_endif_comment = 0 # number +mod_add_long_ifdef_endif_comment = 0 # If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after # the #endif, a comment will be added. -mod_add_long_ifdef_else_comment = 0 # number +mod_add_long_ifdef_else_comment = 0 # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = false # false/true +mod_move_case_break = false # Will add or remove the braces around a fully braced case statement. # Will only remove the braces if there are no variable declarations in the block. -mod_case_brace = ignore # ignore/add/remove/force +mod_case_brace = ignore # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = false # false/true +mod_remove_empty_return = false # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # Set the comment reflow mode (default: 0) # 0: no reflowing (apart from the line wrapping due to cmt_width) # 1: no touching at all # 2: full reflow -cmt_reflow_mode = 0 # number +cmt_reflow_mode = 0 # If false, disable all multi-line comment changes, including cmt_width and leading chars. # Default is true. -cmt_indent_multi = true # false/true +cmt_indent_multi = true # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_footer = "" # string +cmt_insert_file_footer = "" # The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment. # Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment. # Will substitute $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true +cmt_insert_before_preproc = false # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. -pp_indent_count = 1 # number +pp_indent_count = 1 # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true +pp_if_indent_code = false # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/nl-comment.cfg b/tests/config/nl-comment.cfg index d41198fab3..47d2111d1a 100644 --- a/tests/config/nl-comment.cfg +++ b/tests/config/nl-comment.cfg @@ -2,55 +2,55 @@ # My favorite format # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 3 indent_columns = output_tab_size -indent_label = 2 # pos: absolute col, neg: relative column +indent_label = 2 indent_access_spec = 2 -indent_align_string = False # align broken strings +indent_align_string = False indent_brace = 0 indent_member = indent_columns -nl_assign_brace = add # "= {" vs "= \n {" -nl_enum_brace = add # "enum {" vs "enum \n {" -nl_union_brace = add # "union {" vs "union \n {" -nl_struct_brace = add # "struct {" vs "struct \n {" -nl_do_brace = add # "do {" vs "do \n {" -nl_if_brace = add # "if () {" vs "if () \n {" -nl_for_brace = add # "for () {" vs "for () \n {" -nl_try_brace = add # "for () {" vs "for () \n {" -nl_catch_brace = add # "for () {" vs "for () \n {" -nl_finally_brace = add # "for () {" vs "for () \n {" -nl_else_brace = add # "else {" vs "else \n {" -nl_while_brace = add # "while () {" vs "while () \n {" -nl_switch_brace = add # "switch () {" vs "switch () \n {" +nl_assign_brace = add +nl_enum_brace = add +nl_union_brace = add +nl_struct_brace = add +nl_do_brace = add +nl_if_brace = add +nl_for_brace = add +nl_try_brace = add +nl_catch_brace = add +nl_finally_brace = add +nl_else_brace = add +nl_while_brace = add +nl_switch_brace = add nl_func_var_def_blk = 1 nl_before_case = 1 -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_fcall_brace = add +nl_fdef_brace = add nl_after_return = TRUE nl_brace_while = remove nl_brace_else = add nl_squeeze_ifdef = TRUE -mod_paren_on_return = add # "return 1;" vs "return (1);" -mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" -mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" +mod_paren_on_return = add +mod_full_brace_if = add +mod_full_brace_for = add +mod_full_brace_do = add +mod_full_brace_while = add sp_before_byref = remove sp_before_semi = remove -sp_paren_paren = remove # space between (( and )) -sp_return_paren = remove # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_paren_paren = remove +sp_return_paren = remove +sp_sizeof_paren = remove +sp_before_sparen = force +sp_after_sparen = force +sp_after_cast = remove +sp_inside_braces = force +sp_inside_braces_struct = force +sp_inside_braces_enum = force sp_inside_paren = remove sp_inside_fparen = remove sp_inside_sparen = remove @@ -62,15 +62,15 @@ sp_bool = force sp_compare = force sp_assign = force sp_after_comma = force -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_func_def_paren = remove +sp_func_call_paren = remove +sp_func_proto_paren = remove sp_after_ptr_star = remove sp_before_ptr_star = force sp_between_ptr_star = remove -align_with_tabs = FALSE # use tabs to align -align_on_tabstop = FALSE # align on tabstops +align_with_tabs = FALSE +align_on_tabstop = FALSE align_enum_equ_span = 4 align_nl_cont = TRUE align_func_params = TRUE diff --git a/tests/config/nl_after_func_body-3.cfg b/tests/config/nl_after_func_body-3.cfg index 80146d8161..5e0d2d25fe 100644 --- a/tests/config/nl_after_func_body-3.cfg +++ b/tests/config/nl_after_func_body-3.cfg @@ -1,3 +1,3 @@ -output_tab_size = 4 # new tab size +output_tab_size = 4 indent_columns = output_tab_size nl_after_func_body = 3 diff --git a/tests/config/nl_brace_square.cfg b/tests/config/nl_brace_square.cfg index 1fc4f676c9..e582751b53 100644 --- a/tests/config/nl_brace_square.cfg +++ b/tests/config/nl_brace_square.cfg @@ -1,7 +1,7 @@ include "obj-c.cfg" -output_tab_size = 4 # new tab size +output_tab_size = 4 indent_columns = output_tab_size nl_brace_square = remove diff --git a/tests/config/nl_brace_test.cfg b/tests/config/nl_brace_test.cfg index b272fe53e2..c4cd5d3fec 100644 --- a/tests/config/nl_brace_test.cfg +++ b/tests/config/nl_brace_test.cfg @@ -5,19 +5,19 @@ # # The type of line endings -newlines = auto # auto/lf/crlf/cr +newlines = auto # The original size of tabs in the input -input_tab_size = 8 # number +input_tab_size = 8 # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 8 # number +output_tab_size = 8 # The ascii value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # # Indenting @@ -25,1103 +25,1103 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 2 # number +indent_columns = 2 # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # Whether the 'extern "C"' body is indented -indent_extern = false # false/true +indent_extern = false # Whether the 'class' body is indented -indent_class = false # false/true +indent_class = false # Whether to indent the stuff after a leading class colon -indent_class_colon = false # false/true +indent_class_colon = false # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level -indent_else_if = true # false/true +indent_else_if = true # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = false # false/true +indent_func_call_param = false # Same as indent_func_call_param, but for function defs -indent_func_def_param = false # false/true +indent_func_def_param = false # Same as indent_func_call_param, but for function protos -indent_func_proto_param = false # false/true +indent_func_proto_param = false # Same as indent_func_call_param, but for class declarations -indent_func_class_param = false # false/true +indent_func_class_param = false # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = false # false/true +indent_func_ctor_var_param = false # Same as indent_func_call_param, but for templates -indent_template_param = false # false/true +indent_template_param = false # Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true +indent_func_param_double = false # Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 0 # number +indent_func_const = 0 # Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 0 # number +indent_func_throw = 0 # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 0 # number +indent_member = 0 # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = false # false/true +indent_relative_single_line_comments = false # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 0 # number +indent_switch_case = 0 # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 0 # number +indent_case_brace = 0 # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 0 # number +indent_paren_close = 0 # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # Align continued statements at the '='. Default=True # If FALSE or the '=' is followed by a newline, the next line is indent one tab. -indent_align_assign = true # false/true +indent_align_assign = true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # Add or remove space around assignment '=' in enum -sp_enum_assign = force # ignore/add/remove/force +sp_enum_assign = force # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # Add or remove space inside '(' and ')' -sp_inside_paren = ignore # ignore/add/remove/force +sp_inside_paren = ignore # Add or remove space between nested parens -sp_paren_paren = ignore # ignore/add/remove/force +sp_paren_paren = ignore # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # Add or remove space between ')' and '{' -sp_paren_brace = add # ignore/add/remove/force +sp_paren_brace = add # Add or remove space before pointer star '*' -sp_before_ptr_star = add # ignore/add/remove/force +sp_before_ptr_star = add # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force +sp_before_unnamed_ptr_star = ignore # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = remove # ignore/add/remove/force +sp_after_ptr_star_func = remove # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = add # ignore/add/remove/force +sp_before_ptr_star_func = add # Add or remove space before a reference sign '&' -sp_before_byref = add # ignore/add/remove/force +sp_before_byref = add # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force +sp_before_unnamed_byref = ignore # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = ignore # ignore/add/remove/force +sp_after_byref = ignore # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = ignore # ignore/add/remove/force +sp_after_byref_func = ignore # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = ignore # ignore/add/remove/force +sp_before_byref_func = ignore # Add or remove space between type and word -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. -sp_template_angle = ignore # ignore/add/remove/force +sp_template_angle = ignore # Add or remove space before '<>' -sp_before_angle = add # ignore/add/remove/force +sp_before_angle = add # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # Add or remove space after '<>' -sp_after_angle = ignore # ignore/add/remove/force +sp_after_angle = ignore # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = remove # ignore/add/remove/force +sp_angle_paren = remove sp_angle_paren_empty = remove # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = add # ignore/add/remove/force +sp_angle_word = add # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = add # ignore/add/remove/force +sp_before_sparen = add # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = ignore # ignore/add/remove/force +sp_inside_sparen = ignore # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = ignore # ignore/add/remove/force +sp_after_sparen = ignore # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = add # ignore/add/remove/force +sp_sparen_brace = add # Add or remove space between 'invariant' and '(' in the D language. -sp_invariant_paren = ignore # ignore/add/remove/force +sp_invariant_paren = ignore # Add or remove space after the ')' in 'invariant (C) c' in the D language. -sp_after_invariant_paren = ignore # ignore/add/remove/force +sp_after_invariant_paren = ignore # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # Add or remove space before ';' -sp_before_semi = ignore # ignore/add/remove/force +sp_before_semi = ignore # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = ignore # ignore/add/remove/force +sp_before_semi_for = ignore # Add or remove space before a semicolon of an empty part of a for statment. -sp_before_semi_for_empty = ignore # ignore/add/remove/force +sp_before_semi_for_empty = ignore # Add or remove space after the final semicolon of an empty part of a for statment: for ( ; ; ). -sp_after_semi_for_empty = ignore # ignore/add/remove/force +sp_after_semi_for_empty = ignore # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # Add or remove space inside '[' and ']' -sp_inside_square = ignore # ignore/add/remove/force +sp_inside_square = ignore # Add or remove space after ',' -sp_after_comma = add # ignore/add/remove/force +sp_after_comma = add # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # Add or remove space after class ':' -sp_after_class_colon = ignore # ignore/add/remove/force +sp_after_class_colon = ignore # Add or remove space before class ':' -sp_before_class_colon = ignore # ignore/add/remove/force +sp_before_class_colon = ignore # Add or remove space before case ':' -sp_before_case_colon = remove # ignore/add/remove/force +sp_before_case_colon = remove # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = ignore # ignore/add/remove/force +sp_after_operator_sym = ignore # Add or remove space after C/D cast, ie 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = ignore # ignore/add/remove/force +sp_after_cast = ignore # Add or remove spaces inside cast parens -sp_inside_paren_cast = ignore # ignore/add/remove/force +sp_inside_paren_cast = ignore # Add or remove space between the type and open paren in a C++ cast, ie 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = ignore # ignore/add/remove/force +sp_cpp_cast_paren = ignore # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = ignore # ignore/add/remove/force +sp_sizeof_paren = ignore # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = add # ignore/add/remove/force +sp_inside_braces_enum = add # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = add # ignore/add/remove/force +sp_inside_braces_struct = add # Add or remove space inside '{' and '}' -sp_inside_braces = add # ignore/add/remove/force +sp_inside_braces = add # Add or remove space inside '{}' -sp_inside_braces_empty = remove # ignore/add/remove/force +sp_inside_braces_empty = remove # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = ignore # ignore/add/remove/force +sp_type_func = ignore # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = add # ignore/add/remove/force +sp_func_proto_paren = add # Add or remove space between function name and '(' on function definition -sp_func_def_paren = add # ignore/add/remove/force +sp_func_def_paren = add # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # Add or remove space inside function '(' and ')' -sp_inside_fparen = ignore # ignore/add/remove/force +sp_inside_fparen = ignore # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # Add or remove space between ')' and '{' of function -sp_fparen_brace = add # ignore/add/remove/force +sp_fparen_brace = add # Add or remove space between function name and '(' on function calls -sp_func_call_paren = ignore # ignore/add/remove/force +sp_func_call_paren = ignore # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = add # ignore/add/remove/force +sp_func_call_user_paren = add # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = ignore # ignore/add/remove/force +sp_func_class_paren = ignore # Add or remove space between 'return' and '(' -sp_return_paren = add # ignore/add/remove/force +sp_return_paren = add # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = add # ignore/add/remove/force +sp_defined_paren = add # Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = add # ignore/add/remove/force +sp_throw_paren = add # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = add # ignore/add/remove/force +sp_else_brace = add # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = add # ignore/add/remove/force +sp_brace_else = add # Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = add # ignore/add/remove/force +sp_brace_typedef = add # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = add # ignore/add/remove/force +sp_catch_brace = add # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = add # ignore/add/remove/force +sp_brace_catch = add # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = add # ignore/add/remove/force +sp_finally_brace = add # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = add # ignore/add/remove/force +sp_brace_finally = add # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = add # ignore/add/remove/force +sp_try_brace = add # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = add # ignore/add/remove/force +sp_getset_brace = add # Add or remove space before the '::' operator -sp_before_dc = remove # ignore/add/remove/force +sp_before_dc = remove # Add or remove space after the '::' operator -sp_after_dc = remove # ignore/add/remove/force +sp_after_dc = remove # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # Add or remove space after the '!' (not) operator. -sp_not = remove # ignore/add/remove/force +sp_not = remove # Add or remove space after the '~' (invert) operator. -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # Add or remove space after the '&' (address-of) operator. # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # Add or remove space around the '.' or '->' operators -sp_member = remove # ignore/add/remove/force +sp_member = remove # Add or remove space after the '*' (dereference) operator. # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7' -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;' -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # Add or remove space before a backslash-newline at the end of a line -sp_before_nl_cont = add # ignore/add/remove/force +sp_before_nl_cont = add # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force +sp_after_oc_scope = ignore # Add or remove space after the colon in message specs # '-(int) f:(int) x;' vs '-(int) f: (int) x;' -sp_after_oc_colon = ignore # ignore/add/remove/force +sp_after_oc_colon = ignore # Add or remove space before the colon in message specs # '-(int) f: (int) x;' vs '-(int) f : (int) x;' -sp_before_oc_colon = ignore # ignore/add/remove/force +sp_before_oc_colon = ignore # Add or remove space after the colon in message specs # '[object setValue:1];' vs '[object setValue: 1];' -sp_after_send_oc_colon = ignore # ignore/add/remove/force +sp_after_send_oc_colon = ignore # Add or remove space before the colon in message specs # '[object setValue:1];' vs '[object setValue :1];' -sp_before_send_oc_colon = ignore # ignore/add/remove/force +sp_before_send_oc_colon = ignore # Add or remove space after the (type) in message specs # '-(int) f: (int) x;' vs '-(int) f: (int)x;' -sp_after_oc_type = ignore # ignore/add/remove/force +sp_after_oc_type = ignore # Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = ignore # ignore/add/remove/force +sp_cond_colon = ignore # Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = ignore # ignore/add/remove/force +sp_cond_question = ignore # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = ignore # ignore/add/remove/force +sp_case_label = ignore # Control the space around the D '..' operator. -sp_range = ignore # ignore/add/remove/force +sp_range = ignore # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # Align variable definitions in prototypes and functions -align_func_params = true # false/true +align_func_params = true # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = false # false/true +align_same_func_call_params = false # The span for aligning variable definitions (0=don't align) -align_var_def_span = 1 # number +align_var_def_span = 1 # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 2 # number +align_var_def_star_style = 2 # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = true # false/true +align_var_def_inline = true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 1 # number +align_assign_span = 1 # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 1 # number +align_enum_equ_span = 1 # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 1 # number +align_enum_equ_thresh = 1 # The span for aligning struct/union (0=don't align) -align_var_struct_span = 1 # number +align_var_struct_span = 1 # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 1 # number +align_struct_init_span = 1 # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 1 # number +align_typedef_gap = 1 # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 1 # number +align_typedef_span = 1 # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 2 # number +align_typedef_star_style = 2 # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typdef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 1 # number +align_right_cmt_span = 1 # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = true # false/true +align_right_cmt_mix = true # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. -align_right_cmt_gap = 1 # number +align_right_cmt_gap = 1 # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true +align_single_line_func = false # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # The span for aligning ObjC msg spec (0=don't align) -align_oc_msg_spec_span = 0 # number +align_oc_msg_spec_span = 0 # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = false # false/true +align_nl_cont = false # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 0 # number +align_pp_define_gap = 0 # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 1 # number +align_pp_define_span = 1 # Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = true # false/true +align_left_shift = true # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = false # false/true +nl_assign_leave_one_liners = false # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = false # false/true +nl_class_leave_one_liners = false # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = false # false/true +nl_enum_leave_one_liners = false # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # Add or remove newlines at the start of the file -nl_start_of_file = ignore # ignore/add/remove/force +nl_start_of_file = ignore # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # Add or remove newline at the end of the file -nl_end_of_file = add # ignore/add/remove/force +nl_end_of_file = add # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # Add or remove newline between '=' and '{' -nl_assign_brace = ignore # ignore/add/remove/force +nl_assign_brace = ignore # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = ignore # ignore/add/remove/force +nl_fcall_brace = ignore # Add or remove newline between 'enum' and '{' -nl_enum_brace = add # ignore/add/remove/force +nl_enum_brace = add # Add or remove newline between 'struct and '{' -nl_struct_brace = add # ignore/add/remove/force +nl_struct_brace = add # Add or remove newline between 'union' and '{' -nl_union_brace = add # ignore/add/remove/force +nl_union_brace = add # Add or remove newline between 'if' and '{' -nl_if_brace = force # ignore/add/remove/force +nl_if_brace = force # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = add # ignore/add/remove/force +nl_elseif_brace = add # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # Add or remove newline between 'else' and 'if' -nl_else_if = ignore # ignore/add/remove/force +nl_else_if = ignore # Add or remove newline between '}' and 'finally' -nl_brace_finally = add # ignore/add/remove/force +nl_brace_finally = add # Add or remove newline between 'finally' and '{' -nl_finally_brace = add # ignore/add/remove/force +nl_finally_brace = add # Add or remove newline between 'try' and '{' -nl_try_brace = add # ignore/add/remove/force +nl_try_brace = add # Add or remove newline between get/set and '{' -nl_getset_brace = add # ignore/add/remove/force +nl_getset_brace = add # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # Add or remove newline between 'catch' and '{' -nl_catch_brace = add # ignore/add/remove/force +nl_catch_brace = add # Add or remove newline between '}' and 'catch' -nl_brace_catch = add # ignore/add/remove/force +nl_brace_catch = add # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = ignore # ignore/add/remove/force +nl_brace_while = ignore # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # Add or remove newline when condition spans two or more lines -nl_multi_line_cond = true # false/true +nl_multi_line_cond = true # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = false # false/true +nl_multi_line_define = false # Whether to put a newline before 'case' statement -nl_before_case = false # false/true +nl_before_case = false # Add or remove newline between ')' and 'throw' -nl_before_throw = ignore # ignore/add/remove/force +nl_before_throw = ignore # Whether to put a newline after 'case' statement -nl_after_case = false # false/true +nl_after_case = false # Newline between namespace and { -nl_namespace_brace = ignore # ignore/add/remove/force +nl_namespace_brace = ignore # Add or remove newline between 'template<>' and whatever follows. -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = force # ignore/add/remove/force +nl_class_init_args = force # Add or remove newline between return type and function name in definition -nl_func_type_name = ignore # ignore/add/remove/force +nl_func_type_name = ignore # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = ignore # ignore/add/remove/force +nl_func_proto_type_name = ignore # Add or remove newline between a function name and the opening '(' -nl_func_paren = ignore # ignore/add/remove/force +nl_func_paren = ignore # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = force # ignore/add/remove/force +nl_func_decl_args = force # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # Add or remove newline between function signature and '{' -nl_fdef_brace = force # ignore/add/remove/force +nl_fdef_brace = force # Whether to put a newline after 'return' statement -nl_after_return = false # false/true +nl_after_return = false # Add or remove a newline between the return keyword and return expression. -nl_return_expr = ignore # ignore/add/remove/force +nl_return_expr = ignore # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = true # false/true +nl_after_brace_open = true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true +nl_after_brace_open_cmt = false # Whether to put a newline after a virtual brace open. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = false # false/true +nl_after_vbrace_open = false # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true +nl_squeeze_ifdef = false # Add or remove newline before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # Add or remove newline after 'if' -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # Add or remove newline before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # Add or remove newline after 'for' -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # Add or remove newline before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # Add or remove newline after 'while' -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # Add or remove newline before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # Add or remove newline after 'switch' -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # Add or remove newline before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # Add or remove newline after 'do' -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # Whether to double-space before the close brace of a struct/union/enum -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # # Positioning options # # The position of arithmetic operators in wrapped expressions -pos_arith = ignore # ignore/lead/trail +pos_arith = ignore # The position of assignment in wrapped expressions -pos_assign = ignore # ignore/lead/trail +pos_assign = ignore # The position of boolean operators in wrapped expressions -pos_bool = ignore # ignore/lead/trail +pos_bool = ignore # The position of the comma in wrapped expressions -pos_comma = ignore # ignore/lead/trail +pos_comma = ignore # The position of the comma in the constructor initialization list -pos_class_comma = ignore # ignore/lead/trail +pos_class_comma = ignore # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 96 # number +code_width = 96 # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true +ls_for_split_full = false # Whether to fully split long function protos/calls at commas -ls_func_split_full = true # false/true +ls_func_split_full = true # # Blank line options # # The maximum consecutive newlines -nl_max = 0 # number +nl_max = 0 # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 0 # number +nl_after_func_proto_group = 0 # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 0 # number +nl_after_func_body = 0 # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 0 # number +nl_after_func_body_one_liner = 0 # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 0 # number +nl_before_block_comment = 0 # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # Whether to force a newline after a mulit-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 0 # number +nl_before_access_spec = 0 # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # The number of newlines between a function def and the function comment. # 0 = No change. -nl_comment_func_def = 0 # number +nl_comment_func_def = 0 # The number of newlines after a try-catch-finally block that isn't followed by a brace close. # 0 = No change. -nl_after_try_catch_finally = 0 # number +nl_after_try_catch_finally = 0 # The number of newlines before and after a property, indexer or event decl. # 0 = No change. -nl_around_cs_property = 0 # number +nl_around_cs_property = 0 # The number of newlines between the get/set/add/remove handlers in C#. # 0 = No change. -nl_between_get_set = 0 # number +nl_between_get_set = 0 # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = false # false/true +eat_blanks_after_open_brace = false # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = false # false/true +eat_blanks_before_close_brace = false # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = add # ignore/add/remove/force +mod_full_brace_function = add # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = add # ignore/add/remove/force +mod_paren_on_return = add # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = false # false/true +mod_full_paren_if_bool = false # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = false # false/true +mod_remove_extra_semicolon = false # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 0 # number +mod_add_long_function_closebrace_comment = 0 # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number +mod_add_long_switch_closebrace_comment = 0 # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = false # false/true +mod_move_case_break = false # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = false # false/true +mod_remove_empty_return = false # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # If false, disable all multi-line comment changes, including cmt_width and leading chars. # Default is true. -cmt_indent_multi = true # false/true +cmt_indent_multi = true # Whether to group c-comments that look like they are in a block -cmt_c_group = true # false/true +cmt_c_group = true # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = true # false/true +cmt_c_nl_start = true # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = true # false/true +cmt_c_nl_end = true # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = true # false/true +cmt_cpp_group = true # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = true # false/true +cmt_cpp_nl_start = true # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = true # false/true +cmt_cpp_nl_end = true # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitue $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # The filename that contains text to insert before a function implementation if the function isn't preceeded with a C/C++ comment. # Will substitue $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # The filename that contains text to insert before a class if the class isn't preceeded with a C/C++ comment. # Will substitue $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true +cmt_insert_before_preproc = false # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. -pp_indent_count = 1 # number +pp_indent_count = 1 # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true +pp_if_indent_code = false # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/nl_semicolon.cfg b/tests/config/nl_semicolon.cfg index e75523de1e..c366028de3 100644 --- a/tests/config/nl_semicolon.cfg +++ b/tests/config/nl_semicolon.cfg @@ -3,39 +3,39 @@ nl_after_semicolon = True nl_after_brace_open = True -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 3 indent_columns = output_tab_size -indent_label = 2 # pos: absolute col, neg: relative column -indent_align_string = False # align broken strings +indent_label = 2 +indent_align_string = False indent_brace = 0 indent_member = indent_columns -nl_assign_brace = add # "= {" vs "= \n {" -nl_enum_brace = add # "enum {" vs "enum \n {" -nl_union_brace = add # "union {" vs "union \n {" -nl_struct_brace = add # "struct {" vs "struct \n {" -nl_do_brace = add # "do {" vs "do \n {" -nl_if_brace = add # "if () {" vs "if () \n {" -nl_for_brace = add # "for () {" vs "for () \n {" -nl_else_brace = add # "else {" vs "else \n {" -nl_while_brace = add # "while () {" vs "while () \n {" -nl_switch_brace = add # "switch () {" vs "switch () \n {" +nl_assign_brace = add +nl_enum_brace = add +nl_union_brace = add +nl_struct_brace = add +nl_do_brace = add +nl_if_brace = add +nl_for_brace = add +nl_else_brace = add +nl_while_brace = add +nl_switch_brace = add nl_func_var_def_blk = 1 nl_before_case = 1 -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_fcall_brace = add +nl_fdef_brace = add nl_after_return = TRUE nl_brace_while = remove nl_brace_else = add nl_squeeze_ifdef = TRUE -mod_paren_on_return = add # "return 1;" vs "return (1);" -mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" -mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" +mod_paren_on_return = add +mod_full_brace_if = add +mod_full_brace_for = add +mod_full_brace_do = add +mod_full_brace_while = add sp_before_byref = remove sp_before_semi = remove @@ -43,15 +43,15 @@ sp_before_semi_for = remove sp_after_semi_for = force sp_before_semi_for_empty = remove sp_after_semi_for_empty = remove -sp_paren_paren = remove # space between (( and )) -sp_return_paren = remove # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_paren_paren = remove +sp_return_paren = remove +sp_sizeof_paren = remove +sp_before_sparen = force +sp_after_sparen = force +sp_after_cast = remove +sp_inside_braces = force +sp_inside_braces_struct = force +sp_inside_braces_enum = force sp_inside_paren = remove sp_inside_fparen = remove sp_inside_sparen = remove @@ -63,15 +63,15 @@ sp_bool = force sp_compare = force sp_assign = force sp_after_comma = force -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_func_def_paren = remove +sp_func_call_paren = remove +sp_func_proto_paren = remove sp_after_ptr_star = remove sp_before_ptr_star = force sp_between_ptr_star = remove -align_with_tabs = FALSE # use tabs to align -align_on_tabstop = FALSE # align on tabstops +align_with_tabs = FALSE +align_on_tabstop = FALSE align_enum_equ_span = 4 align_nl_cont = TRUE align_var_def_span = 2 diff --git a/tests/config/obj-c.cfg b/tests/config/obj-c.cfg index 1bec5914db..16d68e37d2 100644 --- a/tests/config/obj-c.cfg +++ b/tests/config/obj-c.cfg @@ -79,7 +79,7 @@ sp_after_oc_scope = remove sp_after_oc_type = force align_oc_msg_colon_span = 1 # align parameters in an Obj-C message on the ':' but stop after this many lines (0=don't align) -align_oc_msg_spec_span = 2 # the span for aligning ObjC msg spec (0=don't align) +align_oc_msg_spec_span = 2 sp_macro_func = ignore sp_else_brace = ignore diff --git a/tests/config/objc_complex_method.cfg b/tests/config/objc_complex_method.cfg index 32af23e4d7..7d53500b35 100644 --- a/tests/config/objc_complex_method.cfg +++ b/tests/config/objc_complex_method.cfg @@ -4,10 +4,10 @@ # $Id: objc.cfg 488 2009-10-08 12:44:38Z andreberg $ # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -output_tab_size = 4 # new tab size +indent_with_tabs = 0 +output_tab_size = 4 indent_columns = output_tab_size -indent_label = 2 # pos: absolute col, neg: relative column +indent_label = 2 indent_align_assign = FALSE # @@ -21,20 +21,20 @@ indent_switch_case = indent_columns # Inter-symbol newlines # -nl_enum_brace = remove # "enum {" vs "enum \n {" -nl_union_brace = remove # "union {" vs "union \n {" -nl_struct_brace = remove # "struct {" vs "struct \n {" -nl_do_brace = remove # "do {" vs "do \n {" -nl_if_brace = remove # "if () {" vs "if () \n {" -nl_for_brace = remove # "for () {" vs "for () \n {" -nl_else_brace = remove # "else {" vs "else \n {" -nl_while_brace = remove # "while () {" vs "while () \n {" -nl_switch_brace = remove # "switch () {" vs "switch () \n {" -nl_brace_while = remove # "} while" vs "} \n while" - cuddle while -nl_brace_else = remove # "} else" vs "} \n else" - cuddle else +nl_enum_brace = remove +nl_union_brace = remove +nl_struct_brace = remove +nl_do_brace = remove +nl_if_brace = remove +nl_for_brace = remove +nl_else_brace = remove +nl_while_brace = remove +nl_switch_brace = remove +nl_brace_while = remove +nl_brace_else = remove nl_func_var_def_blk = 1 -nl_fcall_brace = remove # "list_for_each() {" vs "list_for_each()\n{" -nl_fdef_brace = remove # "int foo() {" vs "int foo()\n{" +nl_fcall_brace = remove +nl_fdef_brace = remove # nl_after_return = TRUE; # nl_before_case = 1 @@ -43,12 +43,12 @@ nl_fdef_brace = remove # "int foo() {" vs "int foo()\n{" # Source code modifications # -mod_paren_on_return = ignore # "return 1;" vs "return (1);" -mod_full_brace_if = ignore # "if (a) a--;" vs "if (a) { a--; }" -mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = ignore # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = remove # "while (a) a--;" vs "while (a) { a--; }" -mod_full_brace_nl = 3 # don't remove if more than 3 newlines +mod_paren_on_return = ignore +mod_full_brace_if = ignore +mod_full_brace_for = add +mod_full_brace_do = ignore +mod_full_brace_while = remove +mod_full_brace_nl = 3 mod_add_long_ifdef_endif_comment = 20 mod_add_long_ifdef_else_comment = mod_add_long_ifdef_else_comment mod_add_long_switch_closebrace_comment = mod_add_long_ifdef_else_comment @@ -59,14 +59,14 @@ mod_add_long_function_closebrace_comment = mod_add_long_ifdef_else_comment # # sp_return_paren = force # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = add # "{ 1 }" vs "{1}" -sp_inside_braces_struct = add # "{ 1 }" vs "{1}" -sp_inside_braces_enum = add # "{ 1 }" vs "{1}" -sp_inside_fparen = remove # "func( param )" vs "func(param)" +sp_sizeof_paren = remove +sp_before_sparen = force +sp_after_sparen = force +sp_after_cast = remove +sp_inside_braces = add +sp_inside_braces_struct = add +sp_inside_braces_enum = add +sp_inside_fparen = remove sp_paren_brace = force sp_assign = add sp_arith = add @@ -74,9 +74,9 @@ sp_bool = add sp_compare = add sp_assign = add sp_after_comma = add -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_func_def_paren = remove +sp_func_call_paren = remove +sp_func_proto_paren = remove sp_before_ptr_star = force sp_after_ptr_star = force sp_before_unnamed_ptr_star = ignore @@ -105,8 +105,8 @@ sp_after_oc_at_sel = remove # Aligning stuff # -align_with_tabs = False # use tabs to align -align_on_tabstop = False # align on tabstops +align_with_tabs = False +align_on_tabstop = False # align_keep_tabs = True align_enum_equ_span = 4 # '=' in enum definition # align_nl_cont = True @@ -123,7 +123,7 @@ align_pp_define_span = 8 # Objective-C specifics align_oc_msg_colon_span = 1 # align parameters in an Obj-C message on the ':' but stop after this many lines (0=don't align) -align_oc_msg_spec_span = 0 # the span for aligning ObjC msg spec (0=don't align) +align_oc_msg_spec_span = 0 # # Line Splitting options @@ -135,7 +135,7 @@ align_oc_msg_spec_span = 0 # the span for aligning ObjC msg spec (0=do # Comment modifications # -cmt_star_cont = True # Whether to put a star on subsequent comment lines +cmt_star_cont = True diff --git a/tests/config/pbtech.cfg b/tests/config/pbtech.cfg index b1ff83130c..d1d43676d3 100644 --- a/tests/config/pbtech.cfg +++ b/tests/config/pbtech.cfg @@ -1,4 +1,4 @@ -newlines = auto # auto/lf/crlf/cr +newlines = auto input_tab_size = 4 output_tab_size = 4 @@ -10,15 +10,15 @@ tok_split_gte = true # tweaks for termplate >= etc indent_columns = 4 indent_with_tabs = 0 indent_cmt_with_tabs = false -indent_brace = 0 # Spaces to indent '{' from level +indent_brace = 0 indent_namespace = true # the 'namespace' body is indented -indent_extern = true # Whether the 'extern "C"' body is indented +indent_extern = true indent_class = true # method declarations and definitions indent_class_colon = true # indent the stuff after a leading class colon indent_ctor_init_leading = 4 # virtual indent from the ':' for member initializers. Default is 2. (applies to the leading colon case) -indent_ctor_init = 0 # # Additional indenting for constructor initializer list +indent_ctor_init = 0 indent_label = 0 # indent goto labels -indent_access_spec = -4 # Same as indent_label, but for access specifiers that are followed by a colon +indent_access_spec = -4 # # Spacing options @@ -58,13 +58,13 @@ sp_cmt_cpp_start = add # align_keep_tabs = false # keep non-indenting tabs -align_with_tabs = false # false/true +align_with_tabs = false align_on_tabstop = true # bump out to the next tab when aligning -align_var_def_span = 1 # The span for aligning variable definitions (0=don't align) -align_var_def_star_style = 1 # number -align_var_def_amp_style = 1 # number -align_var_struct_span = 1 # number +align_var_def_span = 1 +align_var_def_star_style = 1 +align_var_def_amp_style = 1 +align_var_struct_span = 1 # # Newline adding and removing options @@ -73,23 +73,23 @@ align_var_struct_span = 1 # number nl_enum_brace = add # newline between 'enum' and '{' # Add or remove newline between 'struct and '{' -nl_struct_brace = add # ignore/add/remove/force +nl_struct_brace = add # Add or remove newline between 'union' and '{' -nl_union_brace = ignore # ignore/add/remove/force +nl_union_brace = ignore # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = add # ignore/add/remove/force +nl_elseif_brace = add # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add nl_try_brace = add # newline between 'try' and '{' nl_for_brace = add # newline between 'for' and '{' @@ -99,8 +99,8 @@ nl_while_brace = add # newline between 'while' and '{' nl_do_brace = add # newline between 'do' and '{' nl_brace_while = remove # newline between '}' and 'while' of 'do' statement nl_switch_brace = add # newline between 'switch' and '{' -nl_after_case = true # Whether to put a newline after 'case' statement -nl_namespace_brace = add # Newline between namespace and { +nl_after_case = true +nl_namespace_brace = add nl_class_brace = add # newline between 'class' and '{' nl_after_vbrace_close = true # newline before return in: 'if (foo) a++; return;' nl_after_do = add # blank line after 'do/while' statement @@ -110,10 +110,10 @@ nl_after_do = add # blank line after 'do/while' statement # # The position of the comma in the constructor initialization list -pos_class_comma = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_comma = trail # The position of colons between constructor and member initialization -pos_class_colon = lead # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_colon = lead # # Code modifying options (non-whitespace) diff --git a/tests/config/pp_ret.cfg b/tests/config/pp_ret.cfg index 293f8d9353..e9c696de43 100644 --- a/tests/config/pp_ret.cfg +++ b/tests/config/pp_ret.cfg @@ -4,19 +4,19 @@ # # The type of line endings -newlines = auto # auto/lf/crlf/cr +newlines = auto # The original size of tabs in the input -input_tab_size = 8 # number +input_tab_size = 8 # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 8 # number +output_tab_size = 8 # The ascii value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # # Indenting @@ -24,726 +24,726 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 4 # number +indent_columns = 4 # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # Whether to indent strings broken by '\' so that they line up -indent_align_string = false # false/true +indent_align_string = false # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # Whether the 'namespace' body is indented -indent_namespace = true # false/true +indent_namespace = true # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # Whether to indent the stuff after a leading class colon -indent_class_colon = false # false/true +indent_class_colon = false # Whether to indent continued function call parameters one indent level (true) or aligns instead of indent (false) -indent_func_call_param = false # false/true +indent_func_call_param = false # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 0 # number +indent_member = 0 # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 0 # number +indent_switch_case = 0 # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 0 # number +indent_case_brace = 0 # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = -4 # number +indent_access_spec = -4 # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 0 # number +indent_paren_close = 0 # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = add # ignore/add/remove/force +sp_arith = add # Add or remove space around assignment operator '=', '+=', etc -sp_assign = add # ignore/add/remove/force +sp_assign = add # Add or remove space around boolean operators '&&' and '||' -sp_bool = add # ignore/add/remove/force +sp_bool = add # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = add # ignore/add/remove/force +sp_compare = add # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # Add or remove space before pointer star '*' -sp_before_ptr_star = remove # ignore/add/remove/force +sp_before_ptr_star = remove # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # Add or remove space after pointer star '*' -sp_after_ptr_star = add # ignore/add/remove/force +sp_after_ptr_star = add # Add or remove space before reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # Add or remove space after reference sign '&' -sp_after_byref = add # ignore/add/remove/force +sp_after_byref = add # Add or remove space before '<>' -sp_before_angle = ignore # ignore/add/remove/force +sp_before_angle = ignore # Add or remove space after '<>' -sp_after_angle = ignore # ignore/add/remove/force +sp_after_angle = ignore # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = ignore # ignore/add/remove/force +sp_angle_paren = ignore # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = ignore # ignore/add/remove/force +sp_angle_word = ignore # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = add # ignore/add/remove/force +sp_before_sparen = add # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = ignore # ignore/add/remove/force +sp_after_sparen = ignore # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = add # ignore/add/remove/force +sp_sparen_brace = add # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = remove # ignore/add/remove/force +sp_before_semi_for = remove # Add or remove space before a semicolon of an empty part of a for statment. -sp_before_semi_for_empty = add # ignore/add/remove/force +sp_before_semi_for_empty = add # Add or remove space after the final semicolon of an empty part of a for statment: for ( ; ; ). -sp_after_semi_for_empty = add # ignore/add/remove/force +sp_after_semi_for_empty = add # Add or remove space before '[' (except '[]') -sp_before_square = remove # ignore/add/remove/force +sp_before_square = remove # Add or remove space before '[]' -sp_before_squares = remove # ignore/add/remove/force +sp_before_squares = remove # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # Add or remove space after ',' -sp_after_comma = add # ignore/add/remove/force +sp_after_comma = add # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # Add or remove space between 'operator' and operator sign -sp_after_operator = remove # ignore/add/remove/force +sp_after_operator = remove # Add or remove space after cast -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # Add or remove spaces inside cast parens -sp_inside_paren_cast = remove # ignore/add/remove/force +sp_inside_paren_cast = remove # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = ignore # ignore/add/remove/force +sp_inside_braces_enum = ignore # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = ignore # ignore/add/remove/force +sp_inside_braces_struct = ignore # Add or remove space inside '{' and '}' -sp_inside_braces = ignore # ignore/add/remove/force +sp_inside_braces = ignore # Add or remove space inside '<' and '>' -sp_inside_angle = ignore # ignore/add/remove/force +sp_inside_angle = ignore # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = ignore # ignore/add/remove/force +sp_type_func = ignore # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # Add or remove space between ')' and '{' of function -sp_fparen_brace = ignore # ignore/add/remove/force +sp_fparen_brace = ignore # Add or remove space between function name and '(' on function calls -sp_func_call_paren = ignore # ignore/add/remove/force +sp_func_call_paren = ignore # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = ignore # ignore/add/remove/force +sp_func_class_paren = ignore # Add or remove space between 'return' and '(' -sp_return_paren = ignore # ignore/add/remove/force +sp_return_paren = ignore # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = ignore # ignore/add/remove/force +sp_else_brace = ignore # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # Add or remove space before the '::' operator -sp_before_dc = ignore # ignore/add/remove/force +sp_before_dc = ignore # Add or remove space after the '::' operator -sp_after_dc = ignore # ignore/add/remove/force +sp_after_dc = ignore # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # Align variable definitions in prototypes and functions -align_func_params = false # false/true +align_func_params = false # The span for aligning variable definitions (0=don't align) -align_var_def_span = 0 # number +align_var_def_span = 0 # How to align the star in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_star_style = 0 # number +align_var_def_star_style = 0 # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = false # false/true +align_var_def_inline = false # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 0 # number +align_assign_span = 0 # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 0 # number +align_enum_equ_span = 0 # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # The span for aligning struct/union (0=don't align) -align_var_struct_span = 0 # number +align_var_struct_span = 0 # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 0 # number +align_struct_init_span = 0 # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number +align_typedef_gap = 0 # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 0 # number +align_typedef_span = 0 # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typdef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 0 # number +align_right_cmt_span = 0 # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # Whether to align macros wrapped with a backslash and a newline -align_nl_cont = false # false/true +align_nl_cont = false # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 0 # number +align_pp_define_gap = 0 # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 0 # number +align_pp_define_span = 0 # # Newline adding and removing options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # Don't touch one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = true # false/true +nl_assign_leave_one_liners = true # Don't touch one-line function bodies inside a class xx { } body -nl_class_leave_one_liners = true # false/true +nl_class_leave_one_liners = true # Don't touch one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = true # false/true +nl_enum_leave_one_liners = true # Don't touch one-line get or set functions -nl_getset_leave_one_liners = true # false/true +nl_getset_leave_one_liners = true # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # Add or remove newline between '=' and '{' -nl_assign_brace = ignore # ignore/add/remove/force +nl_assign_brace = ignore # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 0 # number +nl_func_var_def_blk = 0 # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = ignore # ignore/add/remove/force +nl_fcall_brace = ignore # Add or remove newline between 'enum' and '{' -nl_enum_brace = ignore # ignore/add/remove/force +nl_enum_brace = ignore # Add or remove newline between 'struct and '{' -nl_struct_brace = ignore # ignore/add/remove/force +nl_struct_brace = ignore # Add or remove newline between 'union' and '{' -nl_union_brace = ignore # ignore/add/remove/force +nl_union_brace = ignore # Add or remove newline between 'if' and '{' -nl_if_brace = add # ignore/add/remove/force +nl_if_brace = add # Add or remove newline between '}' and 'else' -nl_brace_else = add # ignore/add/remove/force +nl_brace_else = add # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = add # ignore/add/remove/force +nl_elseif_brace = add # Add or remove newline between 'else' and '{' -nl_else_brace = add # ignore/add/remove/force +nl_else_brace = add # Add or remove newline between '}' and 'finally' -nl_brace_finally = add # ignore/add/remove/force +nl_brace_finally = add # Add or remove newline between 'finally' and '{' -nl_finally_brace = add # ignore/add/remove/force +nl_finally_brace = add # Add or remove newline between 'try' and '{' -nl_try_brace = add # ignore/add/remove/force +nl_try_brace = add # Add or remove newline between get/set and '{' -nl_getset_brace = ignore # ignore/add/remove/force +nl_getset_brace = ignore # Add or remove newline between 'for' and '{' -nl_for_brace = add # ignore/add/remove/force +nl_for_brace = add # Add or remove newline between 'catch' and '{' -nl_catch_brace = add # ignore/add/remove/force +nl_catch_brace = add # Add or remove newline between '}' and 'catch' -nl_brace_catch = add # ignore/add/remove/force +nl_brace_catch = add # Add or remove newline between 'while' and '{' -nl_while_brace = add # ignore/add/remove/force +nl_while_brace = add # Add or remove newline between 'do' and '{' -nl_do_brace = add # ignore/add/remove/force +nl_do_brace = add # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = add # ignore/add/remove/force +nl_brace_while = add # Add or remove newline between 'switch' and '{' -nl_switch_brace = add # ignore/add/remove/force +nl_switch_brace = add # Add or remove newline when condition spans two or more lines -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # Whether to put a newline before 'case' statement -nl_before_case = false # false/true +nl_before_case = false # Whether to put a newline after 'case' statement -nl_after_case = false # false/true +nl_after_case = false # Newline between namespace and { -nl_namespace_brace = add # ignore/add/remove/force +nl_namespace_brace = add # Add or remove newline between 'template<>' and 'class' -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # Add or remove newline between 'class' and '{' -nl_class_brace = add # ignore/add/remove/force +nl_class_brace = add # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # Add or remove newline between return type and function name in definition -nl_func_type_name = remove # ignore/add/remove/force +nl_func_type_name = remove # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = ignore # ignore/add/remove/force +nl_func_decl_end = ignore # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # Whether to put a newline after 'return' statement -nl_after_return = false # false/true +nl_after_return = false # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = true # false/true +nl_after_brace_open = true # Whether to put a newline after a virtual brace open. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = true # false/true +nl_after_vbrace_open = true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true +nl_squeeze_ifdef = false # Add or remove newline before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # Add or remove newline after 'if' -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # Add or remove newline before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # Add or remove newline after 'for' -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # Add or remove newline before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # Add or remove newline after 'while' -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # Add or remove newline before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # Add or remove newline after 'switch' -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # Add or remove newline before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # Add or remove newline after 'do' -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # Whether to double-space before the close brace of a struct/union/enum -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # # Positioning options # # The position of boolean operators in wrapped expressions -pos_bool = ignore # ignore/lead/trail +pos_bool = ignore # The position of the comma in wrapped expressions -pos_comma = ignore # ignore/lead/trail +pos_comma = ignore # The position of the comma in the constructor initialization list -pos_class_comma = ignore # ignore/lead/trail +pos_class_comma = ignore # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # # Line Splitting options # # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true +ls_for_split_full = false # Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true +ls_func_split_full = false # # Blank line options # # The maximum consecutive newlines -nl_max = 2 # number +nl_max = 2 # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 0 # number +nl_after_func_proto_group = 0 # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 0 # number +nl_after_func_body = 0 # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 0 # number +nl_after_func_body_one_liner = 0 # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 0 # number +nl_before_block_comment = 0 # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = ignore # ignore/add/remove/force +mod_full_brace_do = ignore # Add or remove braces on single-line 'for' statement -mod_full_brace_for = ignore # ignore/add/remove/force +mod_full_brace_for = ignore # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # Add or remove braces on single-line 'if' statement -mod_full_brace_if = ignore # ignore/add/remove/force +mod_full_brace_if = ignore # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # Add or remove braces on single-line 'while' statement -mod_full_brace_while = ignore # ignore/add/remove/force +mod_full_brace_while = ignore # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = ignore # ignore/add/remove/force +mod_paren_on_return = ignore # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = false # false/true +mod_full_paren_if_bool = false # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = false # false/true +mod_remove_extra_semicolon = false # # Comment modifications # # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # # Preprocessor options # # Add or remove indent of preprocessor directives -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # Add or remove space between # and, say, define -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/preproc-cleanup.cfg b/tests/config/preproc-cleanup.cfg index bccbb7a9a7..6d38d44a70 100644 --- a/tests/config/preproc-cleanup.cfg +++ b/tests/config/preproc-cleanup.cfg @@ -7,12 +7,12 @@ nl_after_brace_open = True newlines = LF # AUTO (default), CRLF, CR, or LF -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 3 indent_columns = output_tab_size # indent_label = 0 # pos: absolute col, neg: relative column -indent_align_string = False # align broken strings +indent_align_string = False indent_brace = 0 indent_class = true indent_member = indent_columns @@ -26,20 +26,20 @@ nl_before_block_comment = 2 nl_after_func_body = 2 nl_after_func_proto_group = 2 -nl_assign_brace = add # "= {" vs "= \n {" -nl_enum_brace = add # "enum {" vs "enum \n {" -nl_union_brace = add # "union {" vs "union \n {" -nl_struct_brace = add # "struct {" vs "struct \n {" -nl_do_brace = add # "do {" vs "do \n {" -nl_if_brace = add # "if () {" vs "if () \n {" -nl_for_brace = add # "for () {" vs "for () \n {" -nl_else_brace = add # "else {" vs "else \n {" -nl_while_brace = add # "while () {" vs "while () \n {" -nl_switch_brace = add # "switch () {" vs "switch () \n {" +nl_assign_brace = add +nl_enum_brace = add +nl_union_brace = add +nl_struct_brace = add +nl_do_brace = add +nl_if_brace = add +nl_for_brace = add +nl_else_brace = add +nl_while_brace = add +nl_switch_brace = add nl_func_var_def_blk = 1 nl_before_case = 1 -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_fcall_brace = add +nl_fdef_brace = add nl_after_return = TRUE nl_after_case = TRUE nl_brace_while = remove @@ -52,23 +52,23 @@ eat_blanks_before_close_brace = TRUE eat_blanks_after_open_brace = TRUE -mod_paren_on_return = add # "return 1;" vs "return (1);" -mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" -mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" +mod_paren_on_return = add +mod_full_brace_if = add +mod_full_brace_for = add +mod_full_brace_do = add +mod_full_brace_while = add sp_before_byref = remove sp_before_semi = remove -sp_paren_paren = remove # space between (( and )) -sp_return_paren = remove # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_paren_paren = remove +sp_return_paren = remove +sp_sizeof_paren = remove +sp_before_sparen = force +sp_after_sparen = force +sp_after_cast = remove +sp_inside_braces = force +sp_inside_braces_struct = force +sp_inside_braces_enum = force sp_inside_paren = remove sp_inside_fparen = remove sp_inside_sparen = remove @@ -80,9 +80,9 @@ sp_bool = force sp_compare = force sp_assign = force sp_after_comma = force -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_func_def_paren = remove +sp_func_call_paren = remove +sp_func_proto_paren = remove sp_func_class_paren = remove sp_before_angle = force sp_after_angle = force @@ -93,8 +93,8 @@ sp_after_ptr_star = remove sp_before_ptr_star = force sp_between_ptr_star = remove -align_with_tabs = FALSE # use tabs to align -align_on_tabstop = FALSE # align on tabstops +align_with_tabs = FALSE +align_on_tabstop = FALSE align_enum_equ_span = 16 align_nl_cont = TRUE align_var_def_span = 1 diff --git a/tests/config/rdan.cfg b/tests/config/rdan.cfg index 5a934a79da..c9c350a49e 100644 --- a/tests/config/rdan.cfg +++ b/tests/config/rdan.cfg @@ -17,19 +17,19 @@ # # The type of line endings -newlines = auto # auto/lf/crlf/cr +newlines = auto # The original size of tabs in the input -input_tab_size = 8 # number +input_tab_size = 8 # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 3 # number +output_tab_size = 3 # The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # # Indenting @@ -37,1047 +37,1047 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = output_tab_size # number +indent_columns = output_tab_size # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # The number of spaces to indent a namespace block -indent_namespace_level = 0 # number +indent_namespace_level = 0 # If the body of the namespace is longer than this number, it won't be indented. # Requires indent_namespace=true. Default=0 (no limit) -indent_namespace_limit = 0 # number +indent_namespace_limit = 0 # Whether the 'extern "C"' body is indented -indent_extern = false # false/true +indent_extern = false # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # Whether to indent the stuff after a leading class colon -indent_class_colon = true # false/true +indent_class_colon = true # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level -indent_else_if = false # false/true +indent_else_if = false # Amount to indent variable declarations after a open brace. neg=relative, pos=absolute -indent_var_def_blk = 0 # number +indent_var_def_blk = 0 # True: force indentation of function definition to start in column 1 # False: use the default behavior -indent_func_def_force_col1 = true # false/true +indent_func_def_force_col1 = true # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = false # false/true +indent_func_call_param = false # Same as indent_func_call_param, but for function defs -indent_func_def_param = false # false/true +indent_func_def_param = false # Same as indent_func_call_param, but for function protos -indent_func_proto_param = false # false/true +indent_func_proto_param = false # Same as indent_func_call_param, but for class declarations -indent_func_class_param = false # false/true +indent_func_class_param = false # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = false # false/true +indent_func_ctor_var_param = false # Same as indent_func_call_param, but for templates -indent_template_param = false # false/true +indent_template_param = false # Double the indent for indent_func_xxx_param options -indent_func_param_double = false # false/true +indent_func_param_double = false # Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 0 # number +indent_func_const = 0 # Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 0 # number +indent_func_throw = 0 # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = indent_columns # number +indent_member = indent_columns # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = false # false/true +indent_relative_single_line_comments = false # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = indent_columns # number +indent_switch_case = indent_columns # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 0 # number +indent_case_brace = 0 # Whether to indent comments found in first column -indent_col1_comment = true # false/true +indent_col1_comment = true # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 1 # number +indent_paren_close = 1 # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = true # false/true +indent_bool_paren = true # If 'indent_bool_paren' is true, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones -indent_first_bool_expr = true # false/true +indent_first_bool_expr = true # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # Align continued statements at the '='. Default=True # If FALSE or the '=' is followed by a newline, the next line is indent one tab. -indent_align_assign = true # false/true +indent_align_assign = true # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. -sp_before_assign = ignore # ignore/add/remove/force +sp_before_assign = ignore # Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. -sp_after_assign = ignore # ignore/add/remove/force +sp_after_assign = ignore # Add or remove space around assignment '=' in enum -sp_enum_assign = force # ignore/add/remove/force +sp_enum_assign = force # Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_before_assign = ignore # ignore/add/remove/force +sp_enum_before_assign = ignore # Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_after_assign = ignore # ignore/add/remove/force +sp_enum_after_assign = ignore # Add or remove space around preprocessor '##' concatenation operator. Default=Add -sp_pp_concat = ignore # ignore/add/remove/force +sp_pp_concat = ignore # Add or remove space after preprocessor '#' stringify operator. Default=Add -sp_pp_stringify = ignore # ignore/add/remove/force +sp_pp_stringify = ignore # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # Add or remove space between ')' and '{' -sp_paren_brace = ignore # ignore/add/remove/force +sp_paren_brace = ignore # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force +sp_before_unnamed_ptr_star = ignore # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = remove # ignore/add/remove/force +sp_after_ptr_star_func = remove # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = remove # ignore/add/remove/force +sp_before_ptr_star_func = remove # Add or remove space before a reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force +sp_before_unnamed_byref = ignore # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = remove # ignore/add/remove/force +sp_after_byref = remove # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = remove # ignore/add/remove/force +sp_after_byref_func = remove # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = remove # ignore/add/remove/force +sp_before_byref_func = remove # Add or remove space between type and word. Default=Force -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. -sp_template_angle = ignore # ignore/add/remove/force +sp_template_angle = ignore # Add or remove space before '<>' -sp_before_angle = remove # ignore/add/remove/force +sp_before_angle = remove # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # Add or remove space after '<>' -sp_after_angle = force # ignore/add/remove/force +sp_after_angle = force # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = ignore # ignore/add/remove/force +sp_angle_paren = ignore # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = ignore # ignore/add/remove/force +sp_angle_word = ignore # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # Add or remove space before if-condition ')'. Overrides sp_inside_sparen. -sp_inside_sparen_close = ignore # ignore/add/remove/force +sp_inside_sparen_close = ignore # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = add # ignore/add/remove/force +sp_sparen_brace = add # Add or remove space between 'invariant' and '(' in the D language. -sp_invariant_paren = ignore # ignore/add/remove/force +sp_invariant_paren = ignore # Add or remove space after the ')' in 'invariant (C) c' in the D language. -sp_after_invariant_paren = ignore # ignore/add/remove/force +sp_after_invariant_paren = ignore # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # Add or remove space before ';'. Default=Remove -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = ignore # ignore/add/remove/force +sp_before_semi_for = ignore # Add or remove space before a semicolon of an empty part of a for statement. -sp_before_semi_for_empty = force # ignore/add/remove/force +sp_before_semi_for_empty = force # Add or remove space after ';', except when followed by a comment. Default=Add -sp_after_semi = remove # ignore/add/remove/force +sp_after_semi = remove # Add or remove space after ';' in non-empty 'for' statements. Default=Force -sp_after_semi_for = force # ignore/add/remove/force +sp_after_semi_for = force # Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; ). -sp_after_semi_for_empty = force # ignore/add/remove/force +sp_after_semi_for_empty = force # Add or remove space before '[' (except '[]') -sp_before_square = remove # ignore/add/remove/force +sp_before_square = remove # Add or remove space before '[]' -sp_before_squares = remove # ignore/add/remove/force +sp_before_squares = remove # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # Add or remove space before the variadic '...' -sp_before_ellipsis = ignore # ignore/add/remove/force +sp_before_ellipsis = ignore # Add or remove space after class ':' -sp_after_class_colon = ignore # ignore/add/remove/force +sp_after_class_colon = ignore # Add or remove space before class ':' -sp_before_class_colon = ignore # ignore/add/remove/force +sp_before_class_colon = ignore # Add or remove space before case ':'. Default=Remove -sp_before_case_colon = remove # ignore/add/remove/force +sp_before_case_colon = remove # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = ignore # ignore/add/remove/force +sp_after_operator_sym = ignore # Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # Add or remove spaces inside cast parens -sp_inside_paren_cast = remove # ignore/add/remove/force +sp_inside_paren_cast = remove # Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = remove # ignore/add/remove/force +sp_cpp_cast_paren = remove # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = remove # ignore/add/remove/force +sp_inside_braces_enum = remove # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = remove # ignore/add/remove/force +sp_inside_braces_struct = remove # Add or remove space inside '{' and '}' -sp_inside_braces = remove # ignore/add/remove/force +sp_inside_braces = remove # Add or remove space inside '{}' -sp_inside_braces_empty = ignore # ignore/add/remove/force +sp_inside_braces_empty = ignore # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = remove # ignore/add/remove/force +sp_type_func = remove # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = remove # ignore/add/remove/force +sp_square_fparen = remove # Add or remove space between ')' and '{' of function -sp_fparen_brace = add # ignore/add/remove/force +sp_fparen_brace = add # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = remove # ignore/add/remove/force +sp_func_call_user_paren = remove # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # Add or remove space between 'return' and '(' -sp_return_paren = remove # ignore/add/remove/force +sp_return_paren = remove # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = remove # ignore/add/remove/force +sp_defined_paren = remove # Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = remove # ignore/add/remove/force +sp_throw_paren = remove # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # Add or remove space between macro function ')' and value -sp_macro_func = remove # ignore/add/remove/force +sp_macro_func = remove # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = ignore # ignore/add/remove/force +sp_else_brace = ignore # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = ignore # ignore/add/remove/force +sp_brace_typedef = ignore # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # Add or remove space before the '::' operator -sp_before_dc = remove # ignore/add/remove/force +sp_before_dc = remove # Add or remove space after the '::' operator -sp_after_dc = remove # ignore/add/remove/force +sp_after_dc = remove # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # Add or remove space after the '!' (not) operator. Default=Remove -sp_not = remove # ignore/add/remove/force +sp_not = remove # Add or remove space after the '~' (invert) operator. Default=Remove -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # Add or remove space after the '&' (address-of) operator. Default=Remove # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # Add or remove space around the '.' or '->' operators. Default=Remove -sp_member = remove # ignore/add/remove/force +sp_member = remove # Add or remove space after the '*' (dereference) operator. Default=Remove # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # Add or remove space before a backslash-newline at the end of a line. Default=Add -sp_before_nl_cont = force # ignore/add/remove/force +sp_before_nl_cont = force # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force +sp_after_oc_scope = ignore # Add or remove space after the colon in message specs # '-(int) f:(int) x;' vs '-(int) f: (int) x;' -sp_after_oc_colon = ignore # ignore/add/remove/force +sp_after_oc_colon = ignore # Add or remove space before the colon in message specs # '-(int) f: (int) x;' vs '-(int) f : (int) x;' -sp_before_oc_colon = ignore # ignore/add/remove/force +sp_before_oc_colon = ignore # Add or remove space after the colon in message specs # '[object setValue:1];' vs '[object setValue: 1];' -sp_after_send_oc_colon = ignore # ignore/add/remove/force +sp_after_send_oc_colon = ignore # Add or remove space before the colon in message specs # '[object setValue:1];' vs '[object setValue :1];' -sp_before_send_oc_colon = ignore # ignore/add/remove/force +sp_before_send_oc_colon = ignore # Add or remove space after the (type) in message specs # '-(int)f: (int) x;' vs '-(int)f: (int)x;' -sp_after_oc_type = ignore # ignore/add/remove/force +sp_after_oc_type = ignore # Add or remove space after the first (type) in message specs # '-(int) f:(int)x;' vs '-(int)f:(int)x;' -sp_after_oc_return_type = ignore # ignore/add/remove/force +sp_after_oc_return_type = ignore # Add or remove space between '@selector' and '(' # '@selector(msgName).' vs '@selector (msgName)' -sp_after_oc_at_sel = ignore # ignore/add/remove/force +sp_after_oc_at_sel = ignore # Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = force # ignore/add/remove/force +sp_cond_colon = force # Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = force # ignore/add/remove/force +sp_cond_question = force # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = force # ignore/add/remove/force +sp_case_label = force # Control the space around the D '..' operator. -sp_range = ignore # ignore/add/remove/force +sp_range = ignore # Control the space after the opening of a C++ comment '// A' vs '//A' -sp_cmt_cpp_start = ignore # ignore/add/remove/force +sp_cmt_cpp_start = ignore # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # Whether to use tabs for aligning -align_with_tabs = false # false/true +align_with_tabs = false # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # Whether to right-align numbers -align_number_right = true # false/true +align_number_right = true # Align variable definitions in prototypes and functions -align_func_params = true # false/true +align_func_params = true # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = false # false/true +align_same_func_call_params = false # The span for aligning variable definitions (0=don't align) -align_var_def_span = 1 # number +align_var_def_span = 1 # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 2 # number +align_var_def_star_style = 2 # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 2 # number +align_var_def_amp_style = 2 # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # Whether to align the colon in struct bit fields -align_var_def_colon = true # false/true +align_var_def_colon = true # Whether to align any attribute after the variable name -align_var_def_attribute = false # false/true +align_var_def_attribute = false # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = true # false/true +align_var_def_inline = true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 1 # number +align_assign_span = 1 # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 # !!!! 1 si possible de supprimer lignes vides dans enum # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 1 # number +align_enum_equ_span = 1 # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # The span for aligning struct/union (0=don't align) -align_var_struct_span = 99 # number +align_var_struct_span = 99 # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 3 # number +align_struct_init_span = 3 # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 1 # number +align_typedef_gap = 1 # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 1 # number +align_typedef_span = 1 # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typedef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 2 # number +align_typedef_star_style = 2 # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typedef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 2 # number +align_typedef_amp_style = 2 # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 3 # number +align_right_cmt_span = 3 # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. -align_right_cmt_gap = 0 # number +align_right_cmt_gap = 0 # Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore) -align_right_cmt_at_col = code_width # number +align_right_cmt_at_col = code_width # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 1 # number +align_func_proto_span = 1 # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # Align function protos on the 'operator' keyword instead of what follows -align_on_operator = false # false/true +align_on_operator = false # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true +align_single_line_func = false # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # The span for aligning ObjC msg spec (0=don't align) -align_oc_msg_spec_span = 0 # number +align_oc_msg_spec_span = 0 # !!!! analyser options ayant un impact sur le format des macros # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = false # false/true +align_nl_cont = false # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 1 # number +align_pp_define_gap = 1 # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 3 # number +align_pp_define_span = 3 # Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = false # false/true +align_left_shift = false # Align parameters in an Obj-C message on the ':' -align_oc_decl_colon = false # false/true +align_oc_decl_colon = false # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = true # false/true +nl_assign_leave_one_liners = true # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = true # false/true +nl_class_leave_one_liners = true # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = false # false/true +nl_enum_leave_one_liners = false # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # Add or remove newline between '=' and '{' -nl_assign_brace = force # ignore/add/remove/force +nl_assign_brace = force # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # The number of blank lines after a block of variable definitions -nl_func_var_def_blk = 2 # number +nl_func_var_def_blk = 2 # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = force # ignore/add/remove/force +nl_fcall_brace = force # Add or remove newline between 'enum' and '{' -nl_enum_brace = force # ignore/add/remove/force +nl_enum_brace = force # Add or remove newline between 'struct and '{' -nl_struct_brace = force # ignore/add/remove/force +nl_struct_brace = force # Add or remove newline between 'union' and '{' -nl_union_brace = force # ignore/add/remove/force +nl_union_brace = force # Add or remove newline between 'if' and '{' -nl_if_brace = force # ignore/add/remove/force +nl_if_brace = force # Add or remove newline between '}' and 'else' -nl_brace_else = force # ignore/add/remove/force +nl_brace_else = force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = ignore # ignore/add/remove/force +nl_elseif_brace = ignore # Add or remove newline between 'else' and '{' -nl_else_brace = force # ignore/add/remove/force +nl_else_brace = force # Add or remove newline between 'else' and 'if' -nl_else_if = remove # ignore/add/remove/force +nl_else_if = remove # Add or remove newline between '}' and 'finally' -nl_brace_finally = ignore # ignore/add/remove/force +nl_brace_finally = ignore # Add or remove newline between 'finally' and '{' -nl_finally_brace = ignore # ignore/add/remove/force +nl_finally_brace = ignore # Add or remove newline between 'try' and '{' -nl_try_brace = ignore # ignore/add/remove/force +nl_try_brace = ignore # Add or remove newline between get/set and '{' -nl_getset_brace = force # ignore/add/remove/force +nl_getset_brace = force # Add or remove newline between 'for' and '{' -nl_for_brace = force # ignore/add/remove/force +nl_for_brace = force # Add or remove newline between 'catch' and '{' -nl_catch_brace = ignore # ignore/add/remove/force +nl_catch_brace = ignore # Add or remove newline between '}' and 'catch' -nl_brace_catch = ignore # ignore/add/remove/force +nl_brace_catch = ignore # Add or remove newline between 'while' and '{' -nl_while_brace = force # ignore/add/remove/force +nl_while_brace = force # Add or remove newline between two open or close braces. # Due to general newline/brace handling, REMOVE may not work. -nl_brace_brace = ignore # ignore/add/remove/force +nl_brace_brace = ignore # Add or remove newline between 'do' and '{' -nl_do_brace = force # ignore/add/remove/force +nl_do_brace = force # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = force # ignore/add/remove/force +nl_brace_while = force # Add or remove newline between 'switch' and '{' -nl_switch_brace = force # ignore/add/remove/force +nl_switch_brace = force # !!!!!! ??? # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = false # false/true +nl_multi_line_define = false # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # Add or remove newline between ')' and 'throw' -nl_before_throw = ignore # ignore/add/remove/force +nl_before_throw = ignore # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # Newline between namespace and { -nl_namespace_brace = ignore # ignore/add/remove/force +nl_namespace_brace = ignore # Add or remove newline between 'template<>' and whatever follows. -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # Add or remove newline between 'class' and '{' -nl_class_brace = ignore # ignore/add/remove/force +nl_class_brace = ignore # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # Add or remove newline between return type and function name in a function definition -nl_func_type_name = remove # ignore/add/remove/force +nl_func_type_name = remove # Add or remove newline between return type and function name inside a class {} # Uses nl_func_type_name or nl_func_proto_type_name if set to ignore. -nl_func_type_name_class = ignore # ignore/add/remove/force +nl_func_type_name_class = ignore # Add or remove newline between function scope and name in a definition # Controls the newline after '::' in 'void A::f() { }' -nl_func_scope_name = ignore # ignore/add/remove/force +nl_func_scope_name = ignore # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = remove # ignore/add/remove/force +nl_func_proto_type_name = remove # Add or remove newline between a function name and the opening '(' -nl_func_paren = remove # ignore/add/remove/force +nl_func_paren = remove # Add or remove newline after '(' in a function declaration -nl_func_decl_start = remove # ignore/add/remove/force +nl_func_decl_start = remove # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = remove # ignore/add/remove/force +nl_func_decl_end = remove # Add or remove newline between '()' in a function declaration. -nl_func_decl_empty = ignore # ignore/add/remove/force +nl_func_decl_empty = ignore # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = add # Whether to put a newline after 'return' statement -nl_after_return = true # false/true +nl_after_return = true # Add or remove a newline between the return keyword and return expression. -nl_return_expr = remove # ignore/add/remove/force +nl_return_expr = remove # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = true # false/true +nl_after_brace_open = true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true +nl_after_brace_open_cmt = false # Whether to put a newline after a virtual brace open. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = false # false/true +nl_after_vbrace_open = false # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. -nl_after_brace_close = true # false/true +nl_after_brace_close = true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = true # false/true +nl_squeeze_ifdef = true # Add or remove blank line before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # Add or remove blank line after 'if' -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # Add or remove blank line before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # Add or remove blank line after 'for' -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # Add or remove blank line before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # Add or remove blank line after 'while' -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # Add or remove blank line before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # Add or remove blank line after 'switch' -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # Add or remove blank line before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # Add or remove blank line after 'do' -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # Whether to double-space before the close brace of a struct/union/enum # (lower priority than 'eat_blanks_before_close_brace') -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # # Positioning options # # The position of arithmetic operators in wrapped expressions -pos_arith = lead # ignore/lead/trail +pos_arith = lead # The position of assignment in wrapped expressions -pos_assign = trail # ignore/lead/trail +pos_assign = trail # The position of boolean operators in wrapped expressions -pos_bool = lead_force # ignore/lead/trail +pos_bool = lead_force # The position of comparison operators in wrapped expressions -pos_compare = lead # ignore/lead/trail +pos_compare = lead # The position of conditional (b ? t : f) operators in wrapped expressions -pos_conditional = lead_force # ignore/lead/trail +pos_conditional = lead_force # The position of the comma in wrapped expressions -pos_comma = trail # ignore/lead/trail +pos_comma = trail # The position of the comma in the constructor initialization list -pos_class_comma = ignore # ignore/lead/trail +pos_class_comma = ignore # The position of colons between constructor and member initialization -pos_class_colon = ignore # ignore/lead/trail +pos_class_colon = ignore # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 80 # number +code_width = 80 # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = true # false/true +ls_for_split_full = true # Whether to fully split long function protos/calls at commas -ls_func_split_full = true # false/true +ls_func_split_full = true # # Blank line options # # The maximum consecutive newlines -nl_max = 3 # number +nl_max = 3 # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 2 # number +nl_after_func_body_one_liner = 2 # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # Whether to force a newline after a mulit-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 0 # number +nl_before_access_spec = 0 # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # The number of newlines between a function def and the function comment. # 0 = No change. -nl_comment_func_def = 0 # number +nl_comment_func_def = 0 # The number of newlines after a try-catch-finally block that isn't followed by a brace close. # 0 = No change. -nl_after_try_catch_finally = 0 # number +nl_after_try_catch_finally = 0 # The number of newlines before and after a property, indexer or event decl. # 0 = No change. -nl_around_cs_property = 0 # number +nl_around_cs_property = 0 # The number of newlines between the get/set/add/remove handlers in C#. # 0 = No change. -nl_between_get_set = 0 # number +nl_between_get_set = 0 # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # # Code modifying options (non-whitespace) @@ -1085,181 +1085,181 @@ eat_blanks_before_close_brace = true # false/true # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # Add or remove braces on single-line function definitions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if. # If any must be braced, they are all braced. If all can be unbraced, then the braces are removed. -mod_full_brace_if_chain = false # false/true +mod_full_brace_if_chain = false # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = add # ignore/add/remove/force +mod_paren_on_return = add # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = true # false/true +mod_full_paren_if_bool = true # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = false # false/true +mod_remove_extra_semicolon = false # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 0 # number +mod_add_long_function_closebrace_comment = 0 # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number +mod_add_long_switch_closebrace_comment = 0 # If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after # the #else, a comment will be added. -mod_add_long_ifdef_endif_comment = 0 # number +mod_add_long_ifdef_endif_comment = 0 # If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after # the #endif, a comment will be added. -mod_add_long_ifdef_else_comment = 0 # number +mod_add_long_ifdef_else_comment = 0 # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = false # false/true +mod_move_case_break = false # Will add or remove the braces around a fully braced case statement. # Will only remove the braces if there are no variable declarations in the block. -mod_case_brace = remove # ignore/add/remove/force +mod_case_brace = remove # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = false # false/true +mod_remove_empty_return = false # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = code_width # number +cmt_width = code_width # Set the comment reflow mode (default: 0) # 0: no reflowing (apart from the line wrapping due to cmt_width) # 1: no touching at all # 2: full reflow -cmt_reflow_mode = 0 # number +cmt_reflow_mode = 0 # If false, disable all multi-line comment changes, including cmt_width and leading chars. # Default is true. -cmt_indent_multi = true # false/true +cmt_indent_multi = true # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # Whether to put a star on subsequent comment lines -cmt_star_cont = true # false/true +cmt_star_cont = true # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_footer = "" # string +cmt_insert_file_footer = "" # The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment. # Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment. # Will substitute $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true +cmt_insert_before_preproc = false # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = add # ignore/add/remove/force +pp_indent = add # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = true # false/true +pp_indent_at_level = true # If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. -pp_indent_count = 3 # number +pp_indent_count = 3 # Add or remove space after # based on pp_level of #if blocks -pp_space = remove # ignore/add/remove/force +pp_space = remove # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = true # false/true +pp_if_indent_code = true # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/sf.3266678.cfg b/tests/config/sf.3266678.cfg index 3fa1a4d0d4..6b2bcd1686 100644 --- a/tests/config/sf.3266678.cfg +++ b/tests/config/sf.3266678.cfg @@ -1,6 +1,6 @@ -sp_before_byref = remove # ignore/add/remove/force -sp_before_unnamed_byref = remove # ignore/add/remove/force -sp_after_byref = add # ignore/add/remove/force -sp_after_byref_func = add # ignore/add/remove/force -sp_before_byref_func = remove # ignore/add/remove/force -sp_after_type = force # ignore/add/remove/force +sp_before_byref = remove +sp_before_unnamed_byref = remove +sp_after_byref = add +sp_after_byref_func = add +sp_before_byref_func = remove +sp_after_type = force diff --git a/tests/config/sf.3315874.cfg b/tests/config/sf.3315874.cfg index fca83baf76..107900a65f 100644 --- a/tests/config/sf.3315874.cfg +++ b/tests/config/sf.3315874.cfg @@ -1,100 +1,100 @@ # # The type of line endings -newlines = lf # auto/lf/crlf/cr +newlines = lf -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 1 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 1 indent_columns = 4 -indent_label = 2 # pos: absolute col, neg: relative column -indent_align_string = False # align broken strings +indent_label = 2 +indent_align_string = False indent_brace = 0 # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. indent_switch_case = indent_columns -nl_enum_brace = force # "enum {" vs "enum \n {" -nl_union_brace = force # "union {" vs "union \n {" -nl_struct_brace = force # "struct {" vs "struct \n {" -nl_do_brace = force # "do {" vs "do \n {" -nl_if_brace = force # "if () {" vs "if () \n {" -nl_for_brace = force # "for () {" vs "for () \n {" -nl_else_brace = force # "else {" vs "else \n {" -nl_while_brace = force # "while () {" vs "while () \n {" -nl_switch_brace = force # "switch () {" vs "switch () \n {" +nl_enum_brace = force +nl_union_brace = force +nl_struct_brace = force +nl_do_brace = force +nl_if_brace = force +nl_for_brace = force +nl_else_brace = force +nl_while_brace = force +nl_switch_brace = force # nl_before_case = 1 -nl_fcall_brace = force # "foo() {" vs "foo()\n{" -nl_fdef_brace = force # "int foo() {" vs "int foo()\n{" +nl_fcall_brace = force +nl_fdef_brace = force nl_after_return = TRUE nl_brace_while = force nl_brace_else = force nl_squeeze_ifdef = TRUE # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # Add or remove newline after each ',' in a function definition -nl_func_def_args = force # ignore/add/remove/force +nl_func_def_args = force # Add or remove newline after '(' in a function declaration -nl_func_decl_start = ignore # ignore/add/remove/force +nl_func_decl_start = ignore # Add or remove newline after '(' in a function definition -nl_func_def_start = force # ignore/add/remove/force +nl_func_def_start = force # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 3 # number +nl_after_func_body = 3 # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 3 # number +nl_after_func_body_one_liner = 3 # The number of blank lines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 1 # number +nl_after_func_proto = 1 # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # The maximum consecutive newlines -nl_max = 2 # number +nl_max = 2 # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # Whether to force a newline after a multi-line comment. -nl_after_multiline_comment = true # false/true +nl_after_multiline_comment = true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = true # false/true +nl_after_brace_open = true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = true # false/true +nl_after_brace_open_cmt = true # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. -nl_after_brace_close = true # false/true +nl_after_brace_close = true # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 0 # number +nl_before_block_comment = 0 # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # Whether to force a newline after a multi-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # The minimum number of newlines after a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. @@ -117,21 +117,21 @@ nl_after_multiline_comment = false # false/true # mod_paren_on_return = add # "return 1;" vs "return (1);" -mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" -mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" +mod_full_brace_if = add +mod_full_brace_for = add +mod_full_brace_do = add +mod_full_brace_while = add sp_before_semi = remove -sp_paren_paren = force # space between (( and )) -sp_return_paren = force # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = force # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_paren_paren = force +sp_return_paren = force +sp_sizeof_paren = remove +sp_before_sparen = force +sp_after_sparen = force +sp_after_cast = force +sp_inside_braces = force +sp_inside_braces_struct = force +sp_inside_braces_enum = force sp_inside_paren = force sp_inside_fparen = force sp_inside_sparen = force @@ -142,56 +142,56 @@ sp_bool = force sp_compare = force sp_assign = force sp_after_comma = force -sp_func_def_paren = force # "int foo (){" vs "int foo(){" -sp_func_call_paren = force # "foo (" vs "foo(" -sp_func_proto_paren = force # "int foo ();" vs "int foo();" +sp_func_def_paren = force +sp_func_call_paren = force +sp_func_proto_paren = force # Add or remove space between type and word. Default=Force -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = ignore # ignore/add/remove/force +sp_after_ptr_star_func = ignore # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = ignore # ignore/add/remove/force +sp_before_ptr_star_func = ignore # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = remove # ignore/add/remove/force +sp_before_unnamed_ptr_star = remove # Add or remove space before a reference sign '&' -sp_before_byref = force # ignore/add/remove/force +sp_before_byref = force # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force +sp_before_unnamed_byref = ignore # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = remove # ignore/add/remove/force +sp_after_byref = remove # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = ignore # ignore/add/remove/force +sp_after_byref_func = ignore # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = ignore # ignore/add/remove/force +sp_before_byref_func = ignore # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = remove # ignore/add/remove/force +sp_after_operator_sym = remove @@ -199,8 +199,8 @@ sp_after_operator_sym = remove # ignore/add/remove/force -align_with_tabs = FALSE # use tabs to align -align_on_tabstop = FALSE # align on tabstops +align_with_tabs = FALSE +align_on_tabstop = FALSE align_enum_equ_span = 4 align_nl_cont = TRUE align_var_def_span = 2 @@ -209,33 +209,33 @@ align_var_def_inline = TRUE # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 0 # number +align_var_def_star_style = 0 # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 1 # number +align_var_def_star_style = 1 # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 1 # number +align_var_def_amp_style = 1 align_var_def_colon = TRUE align_assign_span = 100000 # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 align_struct_init_span = 3 align_var_struct_span = 3 align_right_cmt_span = 15 # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. This has to be > 0 to do anything. -align_right_cmt_gap = 1 # number +align_right_cmt_gap = 1 align_pp_define_span = 3 align_pp_define_gap = 4 @@ -245,23 +245,23 @@ align_typedef_gap = 3 align_func_params = true # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = true # false/true +align_same_func_call_params = true # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 100 # number +align_func_proto_span = 100 # Minimum gap between the return type and the function name. -align_func_proto_gap = 5 # number +align_func_proto_gap = 5 # Align function protos on the 'operator' keyword instead of what follows -align_on_operator = true # false/true +align_on_operator = true # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # The gap for aligning struct/union member definitions -align_var_struct_gap = 14 # number +align_var_struct_gap = 14 @@ -274,34 +274,34 @@ eat_blanks_after_open_brace = TRUE # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # Set the comment reflow mode (default: 0) # 0: no reflowing (apart from the line wrapping due to cmt_width) # 1: no touching at all # 2: full reflow -cmt_reflow_mode = 0 # number +cmt_reflow_mode = 0 # If false, disable all multi-line comment changes, including cmt_width. keyword substitution, and leading chars. # Default is true. -cmt_indent_multi = false # false/true +cmt_indent_multi = false # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = true # false/true +cmt_c_nl_start = true # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = true # false/true +cmt_c_nl_end = true # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # @@ -309,26 +309,26 @@ indent_col1_comment = false # false/true # # The position of arithmetic operators in wrapped expressions -pos_arith = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_arith = trail # The position of assignment in wrapped expressions. # Do not affect '=' followed by '{' -pos_assign = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_assign = trail # The position of boolean operators in wrapped expressions -pos_bool = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_bool = trail # The position of comparison operators in wrapped expressions -pos_compare = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_compare = trail # The position of conditional (b ? t : f) operators in wrapped expressions -pos_conditional = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_conditional = trail # The position of the comma in wrapped expressions -pos_comma = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_comma = trail # The position of the comma in the constructor initialization list -pos_class_comma = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_comma = trail # The position of colons between constructor and member initialization -pos_class_colon = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_colon = trail diff --git a/tests/config/sf574.cfg b/tests/config/sf574.cfg index 37e78a1d17..f951dd8ab3 100644 --- a/tests/config/sf574.cfg +++ b/tests/config/sf574.cfg @@ -5,33 +5,33 @@ # # The type of line endings -newlines = auto # auto/lf/crlf/cr +newlines = auto # The original size of tabs in the input -input_tab_size = 4 # number +input_tab_size = 4 # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 4 # number +output_tab_size = 4 # The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # Allow interpreting '>=' and '>>=' as part of a template in 'void f(list>=val);'. # If true (default), 'assert(x<0 && y>=3)' will be broken. # Improvements to template detection may make this option obsolete. -tok_split_gte = false # false/true +tok_split_gte = false # Control what to do with the UTF-8 BOM (recommend 'remove') -utf8_bom = ignore # ignore/add/remove/force +utf8_bom = ignore # If the file contains bytes with values between 128 and 255, but is not UTF-8, then output as UTF-8 -utf8_byte = false # false/true +utf8_byte = false # Force the output encoding to UTF-8 -utf8_force = false # false/true +utf8_force = false # # Indenting @@ -39,1590 +39,1590 @@ utf8_force = false # false/true # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 4 # number +indent_columns = 4 # The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents. # For FreeBSD, this is set to 4. Negative value is absolute and not increased for each ( level -indent_continue = 0 # number +indent_continue = 0 # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs to brace level, align with spaces # 2=indent and align with tabs, using spaces when not on a tabstop -indent_with_tabs = 0 # number +indent_with_tabs = 0 # Comments that are not a brace level are indented with tabs on a tabstop. # Requires indent_with_tabs=2. If false, will use spaces. -indent_cmt_with_tabs = false # false/true +indent_cmt_with_tabs = false # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # Disabled indenting class braces if indent_braces is true -indent_braces_no_class = false # false/true +indent_braces_no_class = false # Disabled indenting struct braces if indent_braces is true -indent_braces_no_struct = false # false/true +indent_braces_no_struct = false # Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # Whether the 'namespace' body is indented -indent_namespace = true # false/true +indent_namespace = true # The number of spaces to indent a namespace block -indent_namespace_level = 0 # number +indent_namespace_level = 0 # If the body of the namespace is longer than this number, it won't be indented. # Requires indent_namespace=true. Default=0 (no limit) -indent_namespace_limit = 0 # number +indent_namespace_limit = 0 # Whether the 'extern "C"' body is indented -indent_extern = false # false/true +indent_extern = false # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # Whether to indent the stuff after a leading base class colon -indent_class_colon = false # false/true +indent_class_colon = false # Whether to indent the stuff after a leading class initializer colon -indent_constr_colon = false # false/true +indent_constr_colon = false # Virtual indent from the ':' for member initializers. Default is 2 -indent_ctor_init_leading = 2 # number +indent_ctor_init_leading = 2 # Additional indenting for constructor initializer list -indent_ctor_init = 0 # number +indent_ctor_init = 0 # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level -indent_else_if = false # false/true +indent_else_if = false # Amount to indent variable declarations after a open brace. neg=relative, pos=absolute -indent_var_def_blk = 0 # number +indent_var_def_blk = 0 # Indent continued variable declarations instead of aligning. -indent_var_def_cont = false # false/true +indent_var_def_cont = false # True: force indentation of function definition to start in column 1 # False: use the default behavior -indent_func_def_force_col1 = false # false/true +indent_func_def_force_col1 = false # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = true # false/true +indent_func_call_param = true # Same as indent_func_call_param, but for function defs -indent_func_def_param = true # false/true +indent_func_def_param = true # Same as indent_func_call_param, but for function protos -indent_func_proto_param = true # false/true +indent_func_proto_param = true # Same as indent_func_call_param, but for class declarations -indent_func_class_param = true # false/true +indent_func_class_param = true # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = true # false/true +indent_func_ctor_var_param = true # Same as indent_func_call_param, but for templates -indent_template_param = true # false/true +indent_template_param = true # Double the indent for indent_func_xxx_param options -indent_func_param_double = true # false/true +indent_func_param_double = true # Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 8 # number +indent_func_const = 8 # Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 8 # number +indent_func_throw = 8 # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 8 # number +indent_member = 8 # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = false # false/true +indent_relative_single_line_comments = false # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 4 # number +indent_switch_case = 4 # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 0 # number +indent_case_brace = 0 # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = -2 # number +indent_label = -2 # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = -2 # number +indent_access_spec = -2 # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 0 # number +indent_paren_close = 0 # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # If 'indent_bool_paren' is true, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones -indent_first_bool_expr = false # false/true +indent_first_bool_expr = false # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # Don't change the relative indent of ESQL/C 'EXEC SQL' bodies -indent_preserve_sql = false # false/true +indent_preserve_sql = false # Align continued statements at the '='. Default=True # If FALSE or the '=' is followed by a newline, the next line is indent one tab. -indent_align_assign = false # false/true +indent_align_assign = false # Indent OC blocks at brace level instead of usual rules. -indent_oc_block = false # false/true +indent_oc_block = false # Indent OC blocks in a message relative to the parameter name. # 0=use indent_oc_block rules, 1+=spaces to indent -indent_oc_block_msg = 0 # number +indent_oc_block_msg = 0 # Minimum indent for subsequent parameters -indent_oc_msg_colon = 0 # number +indent_oc_msg_colon = 0 # If true, prioritize aligning with initial colon (and stripping spaces from lines, if necessary). # Default is true. -indent_oc_msg_prioritize_first_colon = true # false/true +indent_oc_msg_prioritize_first_colon = true # If indent_oc_block_msg and this option are on, blocks will be indented the way that Xcode does by default (from keyword if the parameter is on its own line; otherwise, from the previous indentation level). -indent_oc_block_msg_xcode_style = false # false/true +indent_oc_block_msg_xcode_style = false # If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is relative to a msg keyword. -indent_oc_block_msg_from_keyword = false # false/true +indent_oc_block_msg_from_keyword = false # If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is relative to a msg colon. -indent_oc_block_msg_from_colon = false # false/true +indent_oc_block_msg_from_colon = false # If indent_oc_block_msg and this option are on, blocks will be indented from where the block caret is. -indent_oc_block_msg_from_caret = false # false/true +indent_oc_block_msg_from_caret = false # If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is. -indent_oc_block_msg_from_brace = false # false/true +indent_oc_block_msg_from_brace = false # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # Add or remove space around '=' in C++11 lambda capture specifications. Overrides sp_assign -sp_cpp_lambda_assign = ignore # ignore/add/remove/force +sp_cpp_lambda_assign = ignore # Add or remove space after the capture specification in C++11 lambda. -sp_cpp_lambda_paren = ignore # ignore/add/remove/force +sp_cpp_lambda_paren = ignore # Add or remove space around assignment operator '=' in a prototype -sp_assign_default = force # ignore/add/remove/force +sp_assign_default = force # Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. -sp_before_assign = force # ignore/add/remove/force +sp_before_assign = force # Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. -sp_after_assign = force # ignore/add/remove/force +sp_after_assign = force # Add or remove space around assignment '=' in enum -sp_enum_assign = force # ignore/add/remove/force +sp_enum_assign = force # Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_before_assign = force # ignore/add/remove/force +sp_enum_before_assign = force # Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_after_assign = force # ignore/add/remove/force +sp_enum_after_assign = force # Add or remove space around preprocessor '##' concatenation operator. Default=Add -sp_pp_concat = force # ignore/add/remove/force +sp_pp_concat = force # Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator. -sp_pp_stringify = force # ignore/add/remove/force +sp_pp_stringify = force # Add or remove space before preprocessor '#' stringify operator as in '#define x(y) L#y'. -sp_before_pp_stringify = ignore # ignore/add/remove/force +sp_before_pp_stringify = ignore # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # Add or remove space between nested parens: '((' vs ') )' -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # Add or remove space between back-to-back parens: ')(' vs ') (' -sp_cparen_oparen = ignore # ignore/add/remove/force +sp_cparen_oparen = ignore # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # Add or remove space between ')' and '{' -sp_paren_brace = force # ignore/add/remove/force +sp_paren_brace = force # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force +sp_before_unnamed_ptr_star = ignore # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = remove # ignore/add/remove/force +sp_after_ptr_star_func = remove # Add or remove space after a pointer star '*', if followed by an open paren (function types). -sp_ptr_star_paren = remove # ignore/add/remove/force +sp_ptr_star_paren = remove # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = force # ignore/add/remove/force +sp_before_ptr_star_func = force # Add or remove space before a reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = remove # ignore/add/remove/force +sp_before_unnamed_byref = remove # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = force # ignore/add/remove/force +sp_after_byref = force # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = force # ignore/add/remove/force +sp_after_byref_func = force # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = remove # ignore/add/remove/force +sp_before_byref_func = remove # Add or remove space between type and word. Default=Force -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # Add or remove space before the paren in the D constructs 'template Foo(' and 'class Foo('. -sp_before_template_paren = ignore # ignore/add/remove/force +sp_before_template_paren = ignore # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. -sp_template_angle = remove # ignore/add/remove/force +sp_template_angle = remove # Add or remove space before '<>' -sp_before_angle = remove # ignore/add/remove/force +sp_before_angle = remove # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # Add or remove space after '<>' -sp_after_angle = ignore # ignore/add/remove/force +sp_after_angle = ignore # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = remove # ignore/add/remove/force +sp_angle_paren = remove sp_angle_paren_empty = remove # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = force # ignore/add/remove/force +sp_angle_word = force # Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add -sp_angle_shift = force # ignore/add/remove/force +sp_angle_shift = force # Permit removal of the space between '>>' in 'foo >' (C++11 only). Default=False # sp_angle_shift cannot remove the space without this option. -sp_permit_cpp11_shift = false # false/true +sp_permit_cpp11_shift = false # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # Add or remove space before if-condition ')'. Overrides sp_inside_sparen. -sp_inside_sparen_close = remove # ignore/add/remove/force +sp_inside_sparen_close = remove # Add or remove space after if-condition '('. Overrides sp_inside_sparen. -sp_inside_sparen_open = ignore # ignore/add/remove/force +sp_inside_sparen_open = ignore # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = force # ignore/add/remove/force +sp_sparen_brace = force # Add or remove space between 'invariant' and '(' in the D language. -sp_invariant_paren = ignore # ignore/add/remove/force +sp_invariant_paren = ignore # Add or remove space after the ')' in 'invariant (C) c' in the D language. -sp_after_invariant_paren = ignore # ignore/add/remove/force +sp_after_invariant_paren = ignore # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = force # ignore/add/remove/force +sp_special_semi = force # Add or remove space before ';'. Default=Remove -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = remove # ignore/add/remove/force +sp_before_semi_for = remove # Add or remove space before a semicolon of an empty part of a for statement. -sp_before_semi_for_empty = force # ignore/add/remove/force +sp_before_semi_for_empty = force # Add or remove space after ';', except when followed by a comment. Default=Add -sp_after_semi = force # ignore/add/remove/force +sp_after_semi = force # Add or remove space after ';' in non-empty 'for' statements. Default=Force -sp_after_semi_for = force # ignore/add/remove/force +sp_after_semi_for = force # Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; ). -sp_after_semi_for_empty = force # ignore/add/remove/force +sp_after_semi_for_empty = force # Add or remove space before '[' (except '[]') -sp_before_square = remove # ignore/add/remove/force +sp_before_square = remove # Add or remove space before '[]' -sp_before_squares = remove # ignore/add/remove/force +sp_before_squares = remove # Add or remove space inside a non-empty '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # Add or remove space between an open paren and comma: '(,' vs '( ,' -sp_paren_comma = force # ignore/add/remove/force +sp_paren_comma = force # Add or remove space before the variadic '...' when preceded by a non-punctuator -sp_before_ellipsis = remove # ignore/add/remove/force +sp_before_ellipsis = remove # Add or remove space after class ':' -sp_after_class_colon = force # ignore/add/remove/force +sp_after_class_colon = force # Add or remove space before class ':' -sp_before_class_colon = force # ignore/add/remove/force +sp_before_class_colon = force # Add or remove space after class constructor ':' -sp_after_constr_colon = ignore # ignore/add/remove/force +sp_after_constr_colon = ignore # Add or remove space before class constructor ':' -sp_before_constr_colon = ignore # ignore/add/remove/force +sp_before_constr_colon = ignore # Add or remove space before case ':'. Default=Remove -sp_before_case_colon = remove # ignore/add/remove/force +sp_before_case_colon = remove # Add or remove space between 'operator' and operator sign -sp_after_operator = remove # ignore/add/remove/force +sp_after_operator = remove # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = remove # ignore/add/remove/force +sp_after_operator_sym = remove # Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # Add or remove spaces inside cast parens -sp_inside_paren_cast = remove # ignore/add/remove/force +sp_inside_paren_cast = remove # Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = remove # ignore/add/remove/force +sp_cpp_cast_paren = remove # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = force # ignore/add/remove/force +sp_inside_braces_enum = force # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = ignore # ignore/add/remove/force +sp_inside_braces_struct = ignore # Add or remove space inside '{' and '}' -sp_inside_braces = force # ignore/add/remove/force +sp_inside_braces = force # Add or remove space inside '{}' -sp_inside_braces_empty = remove # ignore/add/remove/force +sp_inside_braces_empty = remove # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = force # ignore/add/remove/force +sp_type_func = force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # Add or remove space inside the first parens in the function type: 'void (*x)(...)' -sp_inside_tparen = remove # ignore/add/remove/force +sp_inside_tparen = remove # Add or remove between the parens in the function type: 'void (*x)(...)' -sp_after_tparen_close = remove # ignore/add/remove/force +sp_after_tparen_close = remove # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = remove # ignore/add/remove/force +sp_square_fparen = remove # Add or remove space between ')' and '{' of function -sp_fparen_brace = force # ignore/add/remove/force +sp_fparen_brace = force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # Add or remove space between function name and '()' on function calls without parameters. # If set to 'ignore' (the default), sp_func_call_paren is used. -sp_func_call_paren_empty = remove # ignore/add/remove/force +sp_func_call_paren_empty = remove # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = ignore # ignore/add/remove/force +sp_func_call_user_paren = ignore # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # Add or remove space between 'return' and '(' -sp_return_paren = remove # ignore/add/remove/force +sp_return_paren = remove # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = remove # ignore/add/remove/force +sp_attribute_paren = remove # Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = remove # ignore/add/remove/force +sp_defined_paren = remove # Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = force # ignore/add/remove/force +sp_throw_paren = force # Add or remove space between 'throw' and anything other than '(' as in '@throw [...];' -sp_after_throw = force # ignore/add/remove/force +sp_after_throw = force # Add or remove space between 'catch' and '(' in 'catch (something) { }' # If set to ignore, sp_before_sparen is used. -sp_catch_paren = force # ignore/add/remove/force +sp_catch_paren = force # Add or remove space between 'version' and '(' in 'version (something) { }' (D language) # If set to ignore, sp_before_sparen is used. -sp_version_paren = ignore # ignore/add/remove/force +sp_version_paren = ignore # Add or remove space between 'scope' and '(' in 'scope (something) { }' (D language) # If set to ignore, sp_before_sparen is used. -sp_scope_paren = ignore # ignore/add/remove/force +sp_scope_paren = ignore # Add or remove space between macro and value -sp_macro = force # ignore/add/remove/force +sp_macro = force # Add or remove space between macro function ')' and value -sp_macro_func = force # ignore/add/remove/force +sp_macro_func = force # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = force # ignore/add/remove/force +sp_else_brace = force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = force # ignore/add/remove/force +sp_brace_else = force # Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = force # ignore/add/remove/force +sp_brace_typedef = force # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = force # ignore/add/remove/force +sp_catch_brace = force # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = force # ignore/add/remove/force +sp_brace_catch = force # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = force # ignore/add/remove/force +sp_finally_brace = force # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = force # ignore/add/remove/force +sp_brace_finally = force # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = force # ignore/add/remove/force +sp_try_brace = force # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = force # ignore/add/remove/force +sp_getset_brace = force # Add or remove space between a variable and '{' for C++ uniform initialization -sp_word_brace = force # ignore/add/remove/force +sp_word_brace = force # Add or remove space between a variable and '{' for a namespace -sp_word_brace_ns = force # ignore/add/remove/force +sp_word_brace_ns = force # Add or remove space before the '::' operator -sp_before_dc = remove # ignore/add/remove/force +sp_before_dc = remove # Add or remove space after the '::' operator -sp_after_dc = remove # ignore/add/remove/force +sp_after_dc = remove # Add or remove around the D named array initializer ':' operator -sp_d_array_colon = ignore # ignore/add/remove/force +sp_d_array_colon = ignore # Add or remove space after the '!' (not) operator. Default=Remove -sp_not = remove # ignore/add/remove/force +sp_not = remove # Add or remove space after the '~' (invert) operator. Default=Remove -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # Add or remove space after the '&' (address-of) operator. Default=Remove # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # Add or remove space around the '.' or '->' operators. Default=Remove -sp_member = remove # ignore/add/remove/force +sp_member = remove # Add or remove space after the '*' (dereference) operator. Default=Remove # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # Add or remove space before a backslash-newline at the end of a line. Default=Add -sp_before_nl_cont = force # ignore/add/remove/force +sp_before_nl_cont = force # Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' -sp_after_oc_scope = ignore # ignore/add/remove/force +sp_after_oc_scope = ignore # Add or remove space after the colon in message specs # '-(int) f:(int) x;' vs '-(int) f: (int) x;' -sp_after_oc_colon = ignore # ignore/add/remove/force +sp_after_oc_colon = ignore # Add or remove space before the colon in message specs # '-(int) f: (int) x;' vs '-(int) f : (int) x;' -sp_before_oc_colon = ignore # ignore/add/remove/force +sp_before_oc_colon = ignore # Add or remove space after the colon in immutable dictionary expression # 'NSDictionary *test = @{@"foo" :@"bar"};' -sp_after_oc_dict_colon = ignore # ignore/add/remove/force +sp_after_oc_dict_colon = ignore # Add or remove space before the colon in immutable dictionary expression # 'NSDictionary *test = @{@"foo" :@"bar"};' -sp_before_oc_dict_colon = ignore # ignore/add/remove/force +sp_before_oc_dict_colon = ignore # Add or remove space after the colon in message specs # '[object setValue:1];' vs '[object setValue: 1];' -sp_after_send_oc_colon = ignore # ignore/add/remove/force +sp_after_send_oc_colon = ignore # Add or remove space before the colon in message specs # '[object setValue:1];' vs '[object setValue :1];' -sp_before_send_oc_colon = ignore # ignore/add/remove/force +sp_before_send_oc_colon = ignore # Add or remove space after the (type) in message specs # '-(int)f: (int) x;' vs '-(int)f: (int)x;' -sp_after_oc_type = ignore # ignore/add/remove/force +sp_after_oc_type = ignore # Add or remove space after the first (type) in message specs # '-(int) f:(int)x;' vs '-(int)f:(int)x;' -sp_after_oc_return_type = ignore # ignore/add/remove/force +sp_after_oc_return_type = ignore # Add or remove space between '@selector' and '(' # '@selector(msgName)' vs '@selector (msgName)' # Also applies to @protocol() constructs -sp_after_oc_at_sel = ignore # ignore/add/remove/force +sp_after_oc_at_sel = ignore # Add or remove space between '@selector(x)' and the following word # '@selector(foo) a:' vs '@selector(foo)a:' -sp_after_oc_at_sel_parens = ignore # ignore/add/remove/force +sp_after_oc_at_sel_parens = ignore # Add or remove space inside '@selector' parens # '@selector(foo)' vs '@selector( foo )' # Also applies to @protocol() constructs -sp_inside_oc_at_sel_parens = ignore # ignore/add/remove/force +sp_inside_oc_at_sel_parens = ignore # Add or remove space before a block pointer caret # '^int (int arg){...}' vs. ' ^int (int arg){...}' -sp_before_oc_block_caret = ignore # ignore/add/remove/force +sp_before_oc_block_caret = ignore # Add or remove space after a block pointer caret # '^int (int arg){...}' vs. '^ int (int arg){...}' -sp_after_oc_block_caret = ignore # ignore/add/remove/force +sp_after_oc_block_caret = ignore # Add or remove space between the receiver and selector in a message. # '[receiver selector ...]' -sp_after_oc_msg_receiver = ignore # ignore/add/remove/force +sp_after_oc_msg_receiver = ignore # Add or remove space after @property. -sp_after_oc_property = ignore # ignore/add/remove/force +sp_after_oc_property = ignore # Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = force # ignore/add/remove/force +sp_cond_colon = force # Add or remove space before the ':' in 'b ? t : f'. Overrides sp_cond_colon. -sp_cond_colon_before = force # ignore/add/remove/force +sp_cond_colon_before = force # Add or remove space after the ':' in 'b ? t : f'. Overrides sp_cond_colon. -sp_cond_colon_after = force # ignore/add/remove/force +sp_cond_colon_after = force # Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = force # ignore/add/remove/force +sp_cond_question = force # Add or remove space before the '?' in 'b ? t : f'. Overrides sp_cond_question. -sp_cond_question_before = force # ignore/add/remove/force +sp_cond_question_before = force # Add or remove space after the '?' in 'b ? t : f'. Overrides sp_cond_question. -sp_cond_question_after = force # ignore/add/remove/force +sp_cond_question_after = force # In the abbreviated ternary form (a ?: b), add/remove space between ? and :.'. Overrides all other sp_cond_* options. -sp_cond_ternary_short = force # ignore/add/remove/force +sp_cond_ternary_short = force # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = force # ignore/add/remove/force +sp_case_label = force # Control the space around the D '..' operator. -sp_range = ignore # ignore/add/remove/force +sp_range = ignore # Control the spacing after ':' in 'for (TYPE VAR : EXPR)' (Java) -sp_after_for_colon = ignore # ignore/add/remove/force +sp_after_for_colon = ignore # Control the spacing before ':' in 'for (TYPE VAR : EXPR)' (Java) -sp_before_for_colon = ignore # ignore/add/remove/force +sp_before_for_colon = ignore # Control the spacing in 'extern (C)' (D) -sp_extern_paren = ignore # ignore/add/remove/force +sp_extern_paren = ignore # Control the space after the opening of a C++ comment '// A' vs '//A' -sp_cmt_cpp_start = ignore # ignore/add/remove/force +sp_cmt_cpp_start = ignore # Controls the spaces between #else or #endif and a trailing comment -sp_endif_cmt = force # ignore/add/remove/force +sp_endif_cmt = force # Controls the spaces after 'new', 'delete', and 'delete[]' -sp_after_new = force # ignore/add/remove/force +sp_after_new = force # Controls the spaces before a trailing or embedded comment -sp_before_tr_emb_cmt = force # ignore/add/remove/force +sp_before_tr_emb_cmt = force # Number of spaces before a trailing or embedded comment -sp_num_before_tr_emb_cmt = 4 # number +sp_num_before_tr_emb_cmt = 4 # Control space between a Java annotation and the open paren. -sp_annotation_paren = ignore # ignore/add/remove/force +sp_annotation_paren = ignore # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # Whether to use tabs for aligning -align_with_tabs = false # false/true +align_with_tabs = false # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # Whether to keep whitespace not required for alignment. -align_keep_extra_space = false # false/true +align_keep_extra_space = false # Align variable definitions in prototypes and functions -align_func_params = false # false/true +align_func_params = false # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = false # false/true +align_same_func_call_params = false # The span for aligning variable definitions (0=don't align) -align_var_def_span = 0 # number +align_var_def_span = 0 # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 2 # number +align_var_def_star_style = 2 # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # Whether to align any attribute after the variable name -align_var_def_attribute = false # false/true +align_var_def_attribute = false # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = false # false/true +align_var_def_inline = false # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 0 # number +align_assign_span = 0 # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 0 # number +align_enum_equ_span = 0 # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # The span for aligning struct/union (0=don't align) -align_var_struct_span = 0 # number +align_var_struct_span = 0 # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 0 # number +align_struct_init_span = 0 # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number +align_typedef_gap = 0 # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 0 # number +align_typedef_span = 0 # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typedef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 2 # number +align_typedef_star_style = 2 # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typedef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 4 # number +align_right_cmt_span = 4 # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. This has to be > 0 to do anything. -align_right_cmt_gap = 0 # number +align_right_cmt_gap = 0 # Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore) -align_right_cmt_at_col = 0 # number +align_right_cmt_at_col = 0 # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # Align function protos on the 'operator' keyword instead of what follows -align_on_operator = false # false/true +align_on_operator = false # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true +align_single_line_func = false # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # The span for aligning ObjC msg spec (0=don't align) -align_oc_msg_spec_span = 0 # number +align_oc_msg_spec_span = 0 # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = false # false/true +align_nl_cont = false # # Align macro functions and variables together -align_pp_define_together = true # false/true +align_pp_define_together = true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 4 # number +align_pp_define_gap = 4 # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 4 # number +align_pp_define_span = 4 # Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = true # false/true +align_left_shift = true # Span for aligning parameters in an Obj-C message call on the ':' (0=don't align) -align_oc_msg_colon_span = 0 # number +align_oc_msg_colon_span = 0 # If true, always align with the first parameter, even if it is too short. -align_oc_msg_colon_first = false # false/true +align_oc_msg_colon_first = false # Aligning parameters in an Obj-C '+' or '-' declaration on the ':' -align_oc_decl_colon = false # false/true +align_oc_decl_colon = false # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = false # false/true +nl_assign_leave_one_liners = false # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = true # false/true +nl_class_leave_one_liners = true # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = true # false/true +nl_enum_leave_one_liners = true # Don't split one-line get or set functions -nl_getset_leave_one_liners = true # false/true +nl_getset_leave_one_liners = true # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = true # false/true +nl_func_leave_one_liners = true # Don't split one-line C++11 lambdas - '[]() { return 0; }' -nl_cpp_lambda_leave_one_liners = true # false/true +nl_cpp_lambda_leave_one_liners = true # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # Don't split one-line OC messages -nl_oc_msg_leave_one_liner = false # false/true +nl_oc_msg_leave_one_liner = false # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 2 # number +nl_end_of_file_min = 2 # Add or remove newline between '=' and '{' -nl_assign_brace = ignore # ignore/add/remove/force +nl_assign_brace = ignore # Add or remove newline between '=' and '[' (D only) -nl_assign_square = ignore # ignore/add/remove/force +nl_assign_square = ignore # Add or remove newline after '= [' (D only). Will also affect the newline before the ']' -nl_after_square_assign = ignore # ignore/add/remove/force +nl_after_square_assign = ignore # The number of blank lines after a block of variable definitions at the top of a function body # 0 = No change (default) -nl_func_var_def_blk = 0 # number +nl_func_var_def_blk = 0 # The number of newlines before a block of typedefs # 0 = No change (default) -nl_typedef_blk_start = 0 # number +nl_typedef_blk_start = 0 # The number of newlines after a block of typedefs # 0 = No change (default) -nl_typedef_blk_end = 0 # number +nl_typedef_blk_end = 0 # The maximum consecutive newlines within a block of typedefs # 0 = No change (default) -nl_typedef_blk_in = 0 # number +nl_typedef_blk_in = 0 # The number of newlines before a block of variable definitions not at the top of a function body # 0 = No change (default) -nl_var_def_blk_start = 0 # number +nl_var_def_blk_start = 0 # The number of newlines after a block of variable definitions not at the top of a function body # 0 = No change (default) -nl_var_def_blk_end = 0 # number +nl_var_def_blk_end = 0 # The maximum consecutive newlines within a block of variable definitions # 0 = No change (default) -nl_var_def_blk_in = 0 # number +nl_var_def_blk_in = 0 # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = remove # ignore/add/remove/force +nl_fcall_brace = remove # Add or remove newline between 'enum' and '{' -nl_enum_brace = remove # ignore/add/remove/force +nl_enum_brace = remove # Add or remove newline between 'struct and '{' -nl_struct_brace = force # ignore/add/remove/force +nl_struct_brace = force # Add or remove newline between 'union' and '{' -nl_union_brace = force # ignore/add/remove/force +nl_union_brace = force # Add or remove newline between 'if' and '{' -nl_if_brace = remove # ignore/add/remove/force +nl_if_brace = remove # Add or remove newline between '}' and 'else' -nl_brace_else = force # ignore/add/remove/force +nl_brace_else = force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = ignore # ignore/add/remove/force +nl_elseif_brace = ignore # Add or remove newline between 'else' and '{' -nl_else_brace = remove # ignore/add/remove/force +nl_else_brace = remove # Add or remove newline between 'else' and 'if' -nl_else_if = remove # ignore/add/remove/force +nl_else_if = remove # Add or remove newline between '}' and 'finally' -nl_brace_finally = force # ignore/add/remove/force +nl_brace_finally = force # Add or remove newline between 'finally' and '{' -nl_finally_brace = remove # ignore/add/remove/force +nl_finally_brace = remove # Add or remove newline between 'try' and '{' -nl_try_brace = remove # ignore/add/remove/force +nl_try_brace = remove # Add or remove newline between get/set and '{' -nl_getset_brace = ignore # ignore/add/remove/force +nl_getset_brace = ignore # Add or remove newline between 'for' and '{' -nl_for_brace = remove # ignore/add/remove/force +nl_for_brace = remove # Add or remove newline between 'catch' and '{' -nl_catch_brace = remove # ignore/add/remove/force +nl_catch_brace = remove # Add or remove newline between '}' and 'catch' -nl_brace_catch = force # ignore/add/remove/force +nl_brace_catch = force # Add or remove newline between '}' and ']' -nl_brace_square = ignore # ignore/add/remove/force +nl_brace_square = ignore # Add or remove newline between '}' and ')' in a function invocation -nl_brace_fparen = ignore # ignore/add/remove/force +nl_brace_fparen = ignore # Add or remove newline between 'while' and '{' -nl_while_brace = remove # ignore/add/remove/force +nl_while_brace = remove # Add or remove newline between 'scope (x)' and '{' (D) -nl_scope_brace = ignore # ignore/add/remove/force +nl_scope_brace = ignore # Add or remove newline between 'unittest' and '{' (D) -nl_unittest_brace = ignore # ignore/add/remove/force +nl_unittest_brace = ignore # Add or remove newline between 'version (x)' and '{' (D) -nl_version_brace = ignore # ignore/add/remove/force +nl_version_brace = ignore # Add or remove newline between 'using' and '{' -nl_using_brace = remove # ignore/add/remove/force +nl_using_brace = remove # Add or remove newline between two open or close braces. # Due to general newline/brace handling, REMOVE may not work. -nl_brace_brace = force # ignore/add/remove/force +nl_brace_brace = force # Add or remove newline between 'do' and '{' -nl_do_brace = remove # ignore/add/remove/force +nl_do_brace = remove # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # Add or remove newline between 'switch' and '{' -nl_switch_brace = remove # ignore/add/remove/force +nl_switch_brace = remove # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = true # false/true +nl_multi_line_cond = true # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = false # false/true +nl_multi_line_define = false # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # Add or remove newline between ')' and 'throw' -nl_before_throw = force # ignore/add/remove/force +nl_before_throw = force # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # Add or remove a newline between a case ':' and '{'. Overrides nl_after_case. -nl_case_colon_brace = remove # ignore/add/remove/force +nl_case_colon_brace = remove # Newline between namespace and { -nl_namespace_brace = force # ignore/add/remove/force +nl_namespace_brace = force # Add or remove newline between 'template<>' and whatever follows. -nl_template_class = ignore # ignore/add/remove/force +nl_template_class = ignore # Add or remove newline between 'class' and '{' -nl_class_brace = force # ignore/add/remove/force +nl_class_brace = force # Add or remove newline after each ',' in the class base list -nl_class_init_args = ignore # ignore/add/remove/force +nl_class_init_args = ignore # Add or remove newline after each ',' in the constructor member initialization -nl_constr_init_args = ignore # ignore/add/remove/force +nl_constr_init_args = ignore # Add or remove newline between return type and function name in a function definition -nl_func_type_name = remove # ignore/add/remove/force +nl_func_type_name = remove # Add or remove newline between return type and function name inside a class {} # Uses nl_func_type_name or nl_func_proto_type_name if set to ignore. -nl_func_type_name_class = remove # ignore/add/remove/force +nl_func_type_name_class = remove # Add or remove newline between function scope and name in a definition # Controls the newline after '::' in 'void A::f() { }' -nl_func_scope_name = remove # ignore/add/remove/force +nl_func_scope_name = remove # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = remove # ignore/add/remove/force +nl_func_proto_type_name = remove # Add or remove newline between a function name and the opening '(' -nl_func_paren = remove # ignore/add/remove/force +nl_func_paren = remove # Add or remove newline between a function name and the opening '(' in the definition -nl_func_def_paren = remove # ignore/add/remove/force +nl_func_def_paren = remove # Add or remove newline after '(' in a function declaration -nl_func_decl_start = remove # ignore/add/remove/force +nl_func_decl_start = remove # Add or remove newline after '(' in a function definition -nl_func_def_start = remove # ignore/add/remove/force +nl_func_def_start = remove # Overrides nl_func_decl_start when there is only one parameter. -nl_func_decl_start_single = ignore # ignore/add/remove/force +nl_func_decl_start_single = ignore # Overrides nl_func_def_start when there is only one parameter. -nl_func_def_start_single = ignore # ignore/add/remove/force +nl_func_def_start_single = ignore # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = ignore # ignore/add/remove/force +nl_func_decl_args = ignore # Add or remove newline after each ',' in a function definition -nl_func_def_args = ignore # ignore/add/remove/force +nl_func_def_args = ignore # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = remove # ignore/add/remove/force +nl_func_decl_end = remove # Add or remove newline before the ')' in a function definition -nl_func_def_end = remove # ignore/add/remove/force +nl_func_def_end = remove # Overrides nl_func_decl_end when there is only one parameter. -nl_func_decl_end_single = ignore # ignore/add/remove/force +nl_func_decl_end_single = ignore # Overrides nl_func_def_end when there is only one parameter. -nl_func_def_end_single = ignore # ignore/add/remove/force +nl_func_def_end_single = ignore # Add or remove newline between '()' in a function declaration. -nl_func_decl_empty = remove # ignore/add/remove/force +nl_func_decl_empty = remove # Add or remove newline between '()' in a function definition. -nl_func_def_empty = remove # ignore/add/remove/force +nl_func_def_empty = remove # Whether to put each OC message parameter on a separate line # See nl_oc_msg_leave_one_liner -nl_oc_msg_args = false # false/true +nl_oc_msg_args = false # Add or remove newline between function signature and '{' -nl_fdef_brace = force # ignore/add/remove/force +nl_fdef_brace = force # Add or remove newline between C++11 lambda signature and '{' -nl_cpp_ldef_brace = remove # ignore/add/remove/force +nl_cpp_ldef_brace = remove # Add or remove a newline between the return keyword and return expression. -nl_return_expr = remove # ignore/add/remove/force +nl_return_expr = remove # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = true # false/true +nl_after_brace_open = true # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true +nl_after_brace_open_cmt = false # Whether to put a newline after a virtual brace open with a non-empty body. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = true # false/true +nl_after_vbrace_open = true # Whether to put a newline after a virtual brace open with an empty body. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open_empty = true # false/true +nl_after_vbrace_open_empty = true # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. -nl_after_brace_close = false # false/true +nl_after_brace_close = false # Whether to put a newline after a virtual brace close. # Would add a newline before return in: 'if (foo) a++; return;' -nl_after_vbrace_close = true # false/true +nl_after_vbrace_close = true # Control the newline between the close brace and 'b' in: 'struct { int a; } b;' # Affects enums, unions, and structures. If set to ignore, uses nl_after_brace_close -nl_brace_struct_var = remove # ignore/add/remove/force +nl_brace_struct_var = remove # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true +nl_squeeze_ifdef = false # Add or remove blank line before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # Add or remove blank line after 'if' statement -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # Add or remove blank line before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # Add or remove blank line after 'for' statement -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # Add or remove blank line before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # Add or remove blank line after 'while' statement -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # Add or remove blank line before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # Add or remove blank line after 'switch' statement -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # Add or remove blank line before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # Add or remove blank line after 'do/while' statement -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # Whether to double-space before the close brace of a struct/union/enum # (lower priority than 'eat_blanks_before_close_brace') -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_class_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # Add or remove a newline around a class constructor colon. # Related to pos_constr_colon, nl_constr_init_args, and pos_constr_comma. -nl_constr_colon = ignore # ignore/add/remove/force +nl_constr_colon = ignore # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # # Positioning options # # The position of arithmetic operators in wrapped expressions -pos_arith = lead # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_arith = lead # The position of assignment in wrapped expressions. # Do not affect '=' followed by '{' -pos_assign = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_assign = ignore # The position of boolean operators in wrapped expressions -pos_bool = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_bool = ignore # The position of comparison operators in wrapped expressions -pos_compare = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_compare = ignore # The position of conditional (b ? t : f) operators in wrapped expressions -pos_conditional = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_conditional = ignore # The position of the comma in wrapped expressions -pos_comma = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_comma = ignore # The position of the comma in the class base list -pos_class_comma = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_comma = ignore # The position of the comma in the constructor initialization list -pos_constr_comma = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_constr_comma = ignore # The position of colons between class and base class list -pos_class_colon = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_colon = ignore # The position of colons between constructor and member initialization -pos_constr_colon = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_constr_colon = ignore # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true +ls_for_split_full = false # Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true +ls_func_split_full = false # Whether to split lines as close to code_width as possible and ignore some groupings -ls_code_width = false # false/true +ls_code_width = false # # Blank line options # # The maximum consecutive newlines -nl_max = 2 # number +nl_max = 2 # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 0 # number +nl_after_func_proto = 0 # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 1 # number +nl_after_func_proto_group = 1 # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # The number of newlines after '}' of a multi-line function body in a class declaration -nl_after_func_body_class = 0 # number +nl_after_func_body_class = 0 # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 0 # number +nl_after_func_body_one_liner = 0 # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 1 # number +nl_before_block_comment = 1 # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 1 # number +nl_before_c_comment = 1 # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 1 # number +nl_before_cpp_comment = 1 # Whether to force a newline after a multi-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # The number of newlines after '}' or ';' of a struct/enum/union definition -nl_after_struct = 0 # number +nl_after_struct = 0 # The number of newlines after '}' or ';' of a class definition -nl_after_class = 1 # number +nl_after_class = 1 # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 2 # number +nl_before_access_spec = 2 # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 0 # number +nl_after_access_spec = 0 # The number of newlines between a function def and the function comment. # 0 = No change. -nl_comment_func_def = 0 # number +nl_comment_func_def = 0 # The number of newlines after a try-catch-finally block that isn't followed by a brace close. # 0 = No change. -nl_after_try_catch_finally = 1 # number +nl_after_try_catch_finally = 1 # The number of newlines before and after a property, indexer or event decl. # 0 = No change. -nl_around_cs_property = 0 # number +nl_around_cs_property = 0 # The number of newlines between the get/set/add/remove handlers in C#. # 0 = No change. -nl_between_get_set = 0 # number +nl_between_get_set = 0 # Add or remove newline between C# property and the '{' -nl_property_brace = ignore # ignore/add/remove/force +nl_property_brace = ignore # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # How aggressively to remove extra newlines not in preproc. # 0: No change # 1: Remove most newlines not handled by other config # 2: Remove all newlines and reformat completely by config -nl_remove_extra_newlines = 0 # number +nl_remove_extra_newlines = 0 # Whether to put a blank line before 'return' statements, unless after an open brace. -nl_before_return = false # false/true +nl_before_return = false # Whether to put a blank line after 'return' statements, unless followed by a close brace. -nl_after_return = false # false/true +nl_after_return = false # Whether to put a newline after a Java annotation statement. # Only affects annotations that are after a newline. -nl_after_annotation = ignore # ignore/add/remove/force +nl_after_annotation = ignore # Controls the newline between two annotations. -nl_between_annotation = ignore # ignore/add/remove/force +nl_between_annotation = ignore # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = ignore # ignore/add/remove/force +mod_full_brace_do = ignore # Add or remove braces on single-line 'for' statement -mod_full_brace_for = ignore # ignore/add/remove/force +mod_full_brace_for = ignore # Add or remove braces on single-line function definitions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = ignore # ignore/add/remove/force +mod_full_brace_if = ignore # Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if. # If any must be braced, they are all braced. If all can be unbraced, then the braces are removed. -mod_full_brace_if_chain = true # false/true +mod_full_brace_if_chain = true # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 2 # number +mod_full_brace_nl = 2 # Add or remove braces on single-line 'while' statement -mod_full_brace_while = ignore # ignore/add/remove/force +mod_full_brace_while = ignore # Add or remove braces on single-line 'using ()' statement -mod_full_brace_using = ignore # ignore/add/remove/force +mod_full_brace_using = ignore # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = remove # ignore/add/remove/force +mod_paren_on_return = remove # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = true # false/true +mod_full_paren_if_bool = true # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = false # false/true +mod_remove_extra_semicolon = false # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 0 # number +mod_add_long_function_closebrace_comment = 0 # If a namespace body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_namespace_closebrace_comment = 0 # number +mod_add_long_namespace_closebrace_comment = 0 # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number +mod_add_long_switch_closebrace_comment = 0 # If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after # the #endif, a comment will be added. -mod_add_long_ifdef_endif_comment = 1 # number +mod_add_long_ifdef_endif_comment = 1 # If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after # the #else, a comment will be added. -mod_add_long_ifdef_else_comment = 1 # number +mod_add_long_ifdef_else_comment = 1 # If TRUE, will sort consecutive single-line 'import' statements [Java, D] -mod_sort_import = false # false/true +mod_sort_import = false # If TRUE, will sort consecutive single-line 'using' statements [C#] -mod_sort_using = false # false/true +mod_sort_using = false # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = false # false/true +mod_sort_include = false # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = false # false/true +mod_move_case_break = false # Will add or remove the braces around a fully braced case statement. # Will only remove the braces if there are no variable declarations in the block. -mod_case_brace = ignore # ignore/add/remove/force +mod_case_brace = ignore # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = true # false/true +mod_remove_empty_return = true # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # Set the comment reflow mode (default: 0) # 0: no reflowing (apart from the line wrapping due to cmt_width) # 1: no touching at all # 2: full reflow -cmt_reflow_mode = 0 # number +cmt_reflow_mode = 0 # If false, disable all multi-line comment changes, including cmt_width. keyword substitution, and leading chars. # Default is true. -cmt_indent_multi = true # false/true +cmt_indent_multi = true # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_footer = "" # string +cmt_insert_file_footer = "" # The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment. # Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment. # Will substitute $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # The filename that contains text to insert before a Obj-C message specification if the method isn't preceded with a C/C++ comment. # Will substitute $(message) with the function name and $(javaparam) with the javadoc @param and @return stuff. -cmt_insert_oc_msg_header = "" # string +cmt_insert_oc_msg_header = "" # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_oc_msg_header, cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true +cmt_insert_before_preproc = false # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. -pp_indent_count = 1 # number +pp_indent_count = 1 # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true +pp_if_indent_code = false # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/sf593.cfg b/tests/config/sf593.cfg index 6a1b03171a..5ffd1df73a 100644 --- a/tests/config/sf593.cfg +++ b/tests/config/sf593.cfg @@ -1,3 +1,3 @@ -indent_continue = 8 # number -code_width = 90 # number +indent_continue = 8 +code_width = 90 diff --git a/tests/config/sim.cfg b/tests/config/sim.cfg index 7a92b25046..2bd04569dd 100644 --- a/tests/config/sim.cfg +++ b/tests/config/sim.cfg @@ -5,19 +5,19 @@ # # The type of line endings -newlines = lf # auto/lf/crlf/cr +newlines = lf # The original size of tabs in the input -input_tab_size = 2 # number +input_tab_size = 2 # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 2 # number +output_tab_size = 2 # The ascii value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # # Indenting @@ -25,647 +25,647 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 2 # number +indent_columns = 2 # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # Whether to indent strings broken by '\' so that they line up -indent_align_string = false # false/true +indent_align_string = false # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 0 # number +indent_xml_string = 0 # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # Whether to indent the stuff after a leading class colon -indent_class_colon = true # false/true +indent_class_colon = true # Whether to indent continued function call parameters one indent level (true) or aligns instead of indent (false) -indent_func_call_param = true # false/true +indent_func_call_param = true # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 0 # number +indent_member = 0 # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 2 # number +indent_switch_case = 2 # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 0 # number +indent_case_brace = 0 # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = -2 # number +indent_label = -2 # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # Add or remove space between ')' and '{' -sp_paren_brace = force # ignore/add/remove/force +sp_paren_brace = force # Add or remove space before pointer star '*' -sp_before_ptr_star = remove # ignore/add/remove/force +sp_before_ptr_star = remove # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # Add or remove space after pointer star '*' -sp_after_ptr_star = force # ignore/add/remove/force +sp_after_ptr_star = force # Add or remove space before reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # Add or remove space after reference sign '&' -sp_after_byref = force # ignore/add/remove/force +sp_after_byref = force # Add or remove space before '<>' -sp_before_angle = remove # ignore/add/remove/force +sp_before_angle = remove # Add or remove space after '<>' -sp_after_angle = remove # ignore/add/remove/force +sp_after_angle = remove # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = ignore # ignore/add/remove/force +sp_angle_paren = ignore # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = ignore # ignore/add/remove/force +sp_angle_word = ignore # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = force # ignore/add/remove/force +sp_sparen_brace = force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = force # ignore/add/remove/force +sp_special_semi = force # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = ignore # ignore/add/remove/force +sp_before_semi_for = ignore # Add or remove space before a semicolon of an empty part of a for statement. -sp_before_semi_for_empty = ignore # ignore/add/remove/force +sp_before_semi_for_empty = ignore # Add or remove space before '[' (except '[]') -sp_before_square = remove # ignore/add/remove/force +sp_before_square = remove # Add or remove space before '[]' -sp_before_squares = remove # ignore/add/remove/force +sp_before_squares = remove # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # Add or remove space between 'operator' and operator sign -sp_after_operator = remove # ignore/add/remove/force +sp_after_operator = remove # Add or remove space after cast -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # Add or remove spaces inside cast parens -sp_inside_paren_cast = ignore # ignore/add/remove/force +sp_inside_paren_cast = ignore # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # Add or remove space after the tag keyword (Pawn) -sp_after_tag = ignore # ignore/add/remove/force +sp_after_tag = ignore # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = remove # ignore/add/remove/force +sp_inside_braces_enum = remove # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = remove # ignore/add/remove/force +sp_inside_braces_struct = remove # Add or remove space inside '{' and '}' -sp_inside_braces = remove # ignore/add/remove/force +sp_inside_braces = remove # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = ignore # ignore/add/remove/force +sp_type_func = ignore # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # Add or remove space between ')' and '{' of function -sp_fparen_brace = force # ignore/add/remove/force +sp_fparen_brace = force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # Add or remove space between 'return' and '(' -sp_return_paren = force # ignore/add/remove/force +sp_return_paren = force # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = force # ignore/add/remove/force +sp_else_brace = force # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = force # ignore/add/remove/force +sp_brace_else = force # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # Align variable definitions in prototypes and functions -align_func_params = false # false/true +align_func_params = false # The span for aligning variable definitions (0=don't align) -align_var_def_span = 0 # number +align_var_def_span = 0 # How to align the star in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_star_style = 2 # number +align_var_def_star_style = 2 # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = false # false/true +align_var_def_inline = false # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 0 # number +align_assign_span = 0 # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 0 # number +align_enum_equ_span = 0 # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # The span for aligning struct/union (0=don't align) -align_var_struct_span = 0 # number +align_var_struct_span = 0 # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 0 # number +align_struct_init_span = 0 # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number +align_typedef_gap = 0 # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 0 # number +align_typedef_span = 0 # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 0 # number +align_right_cmt_span = 0 # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # Whether to align macros wrapped with a backslash and a newline -align_nl_cont = true # false/true +align_nl_cont = true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 1 # number +align_pp_define_gap = 1 # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 0 # number +align_pp_define_span = 0 # # Newline adding and removing options # # Try to limit code width to N number of columns -code_width = 0 # number +code_width = 0 # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = true # false/true +nl_collapse_empty_body = true # Don't touch one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = false # false/true +nl_assign_leave_one_liners = false # Don't touch one-line function bodies inside a class xx { } body -nl_class_leave_one_liners = false # false/true +nl_class_leave_one_liners = false # Add or remove newlines at the start of the file -nl_start_of_file = remove # ignore/add/remove/force +nl_start_of_file = remove # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # Add or remove newline between '=' and '{' -nl_assign_brace = remove # ignore/add/remove/force +nl_assign_brace = remove # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 0 # number +nl_func_var_def_blk = 0 # Add or remove newline between function call and '(' -nl_fcall_brace = remove # ignore/add/remove/force +nl_fcall_brace = remove # Add or remove newline between 'enum' and '{' -nl_enum_brace = remove # ignore/add/remove/force +nl_enum_brace = remove # Add or remove newline between 'struct and '{' -nl_struct_brace = remove # ignore/add/remove/force +nl_struct_brace = remove # Add or remove newline between 'union' and '{' -nl_union_brace = remove # ignore/add/remove/force +nl_union_brace = remove # Add or remove newline between 'if' and '{' -nl_if_brace = remove # ignore/add/remove/force +nl_if_brace = remove # Add or remove newline between '}' and 'else' -nl_brace_else = remove # ignore/add/remove/force +nl_brace_else = remove # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = remove # ignore/add/remove/force +nl_elseif_brace = remove # Add or remove newline between 'else' and '{' -nl_else_brace = remove # ignore/add/remove/force +nl_else_brace = remove # Add or remove newline between '}' and 'finally' -nl_brace_finally = ignore # ignore/add/remove/force +nl_brace_finally = ignore # Add or remove newline between 'finally' and '{' -nl_finally_brace = ignore # ignore/add/remove/force +nl_finally_brace = ignore # Add or remove newline between 'try' and '{' -nl_try_brace = ignore # ignore/add/remove/force +nl_try_brace = ignore # Add or remove newline between get/set and '{' -nl_getset_brace = ignore # ignore/add/remove/force +nl_getset_brace = ignore # Add or remove newline between 'for' and '{' -nl_for_brace = remove # ignore/add/remove/force +nl_for_brace = remove # Add or remove newline between 'catch' and '{' -nl_catch_brace = ignore # ignore/add/remove/force +nl_catch_brace = ignore # Add or remove newline between '}' and 'catch' -nl_brace_catch = ignore # ignore/add/remove/force +nl_brace_catch = ignore # Add or remove newline between 'while' and '{' -nl_while_brace = remove # ignore/add/remove/force +nl_while_brace = remove # Add or remove newline between 'do' and '{' -nl_do_brace = remove # ignore/add/remove/force +nl_do_brace = remove # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # Add or remove newline between 'switch' and '{' -nl_switch_brace = remove # ignore/add/remove/force +nl_switch_brace = remove # Add or remove newline when condition spans two or more lines -nl_multi_line_cond = false # false/true +nl_multi_line_cond = false # Whether to put a newline before 'case' statement -nl_before_case = false # false/true +nl_before_case = false # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # Newline between namespace and { -nl_namespace_brace = remove # ignore/add/remove/force +nl_namespace_brace = remove # Add or remove newline between 'template<>' and 'class' -nl_template_class = force # ignore/add/remove/force +nl_template_class = force # Add or remove newline between 'class' and '{' -nl_class_brace = force # ignore/add/remove/force +nl_class_brace = force # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = force # ignore/add/remove/force +nl_class_init_args = force # Add or remove newline between return type and function name in definition -nl_func_type_name = remove # ignore/add/remove/force +nl_func_type_name = remove # Add or remove newline after '(' in a function declaration -nl_func_decl_start = remove # ignore/add/remove/force +nl_func_decl_start = remove # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = remove # ignore/add/remove/force +nl_func_decl_args = remove # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = remove # ignore/add/remove/force +nl_func_decl_end = remove # Add or remove newline between function signature and '{' -nl_fdef_brace = force # ignore/add/remove/force +nl_fdef_brace = force # Whether to put a newline after 'return' statement -nl_after_return = false # false/true +nl_after_return = false # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = false # false/true +nl_after_semicolon = false # Whether to put a newline after brace open -nl_after_brace_open = true # false/true +nl_after_brace_open = true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true +nl_squeeze_ifdef = false # Add or remove newline before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # Add or remove newline after 'if' -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # Add or remove newline before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # Add or remove newline after 'for' -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # Add or remove newline before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # Add or remove newline after 'while' -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # Add or remove newline before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # Add or remove newline after 'switch' -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # Add or remove newline before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # Add or remove newline after 'do' -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # Add or remove a newline around a class colon. Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = force # ignore/add/remove/force +nl_class_colon = force # # Positioning options # # The position of boolean operators in wrapped expressions -pos_bool = ignore # ignore/lead/trail +pos_bool = ignore # The position of the comma in wrapped expressions -pos_comma = trail # ignore/lead/trail +pos_comma = trail pos_class_comma = trail # The position of colons between constructor and member initialization -pos_class_colon = trail # ignore/lead/trail +pos_class_colon = trail # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = false # false/true +ls_for_split_full = false # Whether to fully split long function protos/calls at commas -ls_func_split_full = false # false/true +ls_func_split_full = false # # Blank line options # # The maximum consecutive newlines -nl_max = 3 # number +nl_max = 3 # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 1 # number +nl_after_func_proto = 1 # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 0 # number +nl_after_func_body_one_liner = 0 # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = false # false/true +eat_blanks_before_close_brace = false # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = ignore # ignore/add/remove/force +mod_full_brace_do = ignore # Add or remove braces on single-line 'for' statement -mod_full_brace_for = ignore # ignore/add/remove/force +mod_full_brace_for = ignore # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = ignore # ignore/add/remove/force +mod_full_brace_function = ignore # Add or remove braces on single-line 'if' statement -mod_full_brace_if = ignore # ignore/add/remove/force +mod_full_brace_if = ignore # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = remove # ignore/add/remove/force +mod_paren_on_return = remove # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = true # false/true +mod_pawn_semicolon = true # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = false # false/true +mod_full_paren_if_bool = false # # Comment modifications # # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # # Preprocessor options # # Add or remove indent of preprocessor directives -pp_indent = ignore # ignore/add/remove/force +pp_indent = ignore # Add or remove space between # and, say, define -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/sp_after_oc_at_sel_add.cfg b/tests/config/sp_after_oc_at_sel_add.cfg index 3ec8afe252..f53df24eb0 100644 --- a/tests/config/sp_after_oc_at_sel_add.cfg +++ b/tests/config/sp_after_oc_at_sel_add.cfg @@ -1,7 +1,7 @@ include "obj-c.cfg" -output_tab_size = 4 # new tab size +output_tab_size = 4 indent_columns = output_tab_size sp_after_oc_at_sel = add diff --git a/tests/config/sp_after_oc_at_sel_force.cfg b/tests/config/sp_after_oc_at_sel_force.cfg index 81ac3a06a2..756b2368e1 100644 --- a/tests/config/sp_after_oc_at_sel_force.cfg +++ b/tests/config/sp_after_oc_at_sel_force.cfg @@ -1,6 +1,6 @@ include "obj-c.cfg" -output_tab_size = 4 # new tab size +output_tab_size = 4 indent_columns = output_tab_size sp_after_oc_at_sel = force diff --git a/tests/config/sp_after_oc_at_sel_remove.cfg b/tests/config/sp_after_oc_at_sel_remove.cfg index 44c9078791..a4f209de2f 100644 --- a/tests/config/sp_after_oc_at_sel_remove.cfg +++ b/tests/config/sp_after_oc_at_sel_remove.cfg @@ -1,6 +1,6 @@ include "obj-c.cfg" -output_tab_size = 4 # new tab size +output_tab_size = 4 indent_columns = output_tab_size sp_after_oc_at_sel = remove diff --git a/tests/config/sp_after_oc_block_caret_add.cfg b/tests/config/sp_after_oc_block_caret_add.cfg index 7a133dc2bb..359751f91d 100644 --- a/tests/config/sp_after_oc_block_caret_add.cfg +++ b/tests/config/sp_after_oc_block_caret_add.cfg @@ -1,6 +1,6 @@ include "obj-c.cfg" -output_tab_size = 4 # new tab size +output_tab_size = 4 indent_columns = output_tab_size sp_after_oc_block_caret = add diff --git a/tests/config/sp_after_oc_block_caret_force.cfg b/tests/config/sp_after_oc_block_caret_force.cfg index 6fc1ccd906..a1d62e9e7e 100644 --- a/tests/config/sp_after_oc_block_caret_force.cfg +++ b/tests/config/sp_after_oc_block_caret_force.cfg @@ -1,7 +1,7 @@ include "obj-c.cfg" -output_tab_size = 4 # new tab size +output_tab_size = 4 indent_columns = output_tab_size sp_after_oc_block_caret = force diff --git a/tests/config/sp_after_oc_block_caret_remove.cfg b/tests/config/sp_after_oc_block_caret_remove.cfg index 3c7dba8941..d5f10480ab 100644 --- a/tests/config/sp_after_oc_block_caret_remove.cfg +++ b/tests/config/sp_after_oc_block_caret_remove.cfg @@ -1,6 +1,6 @@ include "obj-c.cfg" -output_tab_size = 4 # new tab size +output_tab_size = 4 indent_columns = output_tab_size sp_after_oc_block_caret = remove diff --git a/tests/config/sp_after_oc_return_type_add.cfg b/tests/config/sp_after_oc_return_type_add.cfg index 8432d3c525..f6eee2acb5 100644 --- a/tests/config/sp_after_oc_return_type_add.cfg +++ b/tests/config/sp_after_oc_return_type_add.cfg @@ -1,6 +1,6 @@ include "obj-c.cfg" -output_tab_size = 4 # new tab size +output_tab_size = 4 indent_columns = output_tab_size sp_after_oc_return_type = add diff --git a/tests/config/sp_after_oc_return_type_force.cfg b/tests/config/sp_after_oc_return_type_force.cfg index 8a5834b71d..5a3938cd05 100644 --- a/tests/config/sp_after_oc_return_type_force.cfg +++ b/tests/config/sp_after_oc_return_type_force.cfg @@ -1,6 +1,6 @@ include "obj-c.cfg" -output_tab_size = 4 # new tab size +output_tab_size = 4 indent_columns = output_tab_size sp_after_oc_return_type = force diff --git a/tests/config/sp_after_oc_return_type_remove.cfg b/tests/config/sp_after_oc_return_type_remove.cfg index 166ff5d50c..8b8aa02825 100644 --- a/tests/config/sp_after_oc_return_type_remove.cfg +++ b/tests/config/sp_after_oc_return_type_remove.cfg @@ -1,6 +1,6 @@ include "obj-c.cfg" -output_tab_size = 4 # new tab size +output_tab_size = 4 indent_columns = output_tab_size sp_after_oc_return_type = remove diff --git a/tests/config/sp_before_after_oc_block_caret_remove.cfg b/tests/config/sp_before_after_oc_block_caret_remove.cfg index c1e7984e75..f9442606ef 100644 --- a/tests/config/sp_before_after_oc_block_caret_remove.cfg +++ b/tests/config/sp_before_after_oc_block_caret_remove.cfg @@ -1,6 +1,6 @@ include "obj-c.cfg" -output_tab_size = 4 # new tab size +output_tab_size = 4 indent_columns = output_tab_size sp_before_oc_block_caret = remove diff --git a/tests/config/sp_before_oc_block_caret_add.cfg b/tests/config/sp_before_oc_block_caret_add.cfg index ceb14610b8..73a8897fef 100644 --- a/tests/config/sp_before_oc_block_caret_add.cfg +++ b/tests/config/sp_before_oc_block_caret_add.cfg @@ -1,7 +1,7 @@ include "obj-c.cfg" -output_tab_size = 4 # new tab size +output_tab_size = 4 indent_columns = output_tab_size sp_before_oc_block_caret = add diff --git a/tests/config/sp_before_oc_block_caret_force.cfg b/tests/config/sp_before_oc_block_caret_force.cfg index 2d70d61f07..0a964ffbe6 100644 --- a/tests/config/sp_before_oc_block_caret_force.cfg +++ b/tests/config/sp_before_oc_block_caret_force.cfg @@ -1,6 +1,6 @@ include "obj-c.cfg" -output_tab_size = 4 # new tab size +output_tab_size = 4 indent_columns = output_tab_size sp_before_oc_block_caret = force diff --git a/tests/config/sp_before_oc_block_caret_remove.cfg b/tests/config/sp_before_oc_block_caret_remove.cfg index b5d7b7bd0f..c53eaa75c0 100644 --- a/tests/config/sp_before_oc_block_caret_remove.cfg +++ b/tests/config/sp_before_oc_block_caret_remove.cfg @@ -1,6 +1,6 @@ include "obj-c.cfg" -output_tab_size = 4 # new tab size +output_tab_size = 4 indent_columns = output_tab_size sp_before_oc_block_caret = remove diff --git a/tests/config/sp_before_tr_emb_cmt-a.cfg b/tests/config/sp_before_tr_emb_cmt-a.cfg index 852b613649..e841a2108f 100644 --- a/tests/config/sp_before_tr_emb_cmt-a.cfg +++ b/tests/config/sp_before_tr_emb_cmt-a.cfg @@ -4,24 +4,24 @@ # # The type of line endings -newlines = auto # auto/lf/crlf/cr +newlines = auto # The original size of tabs in the input -input_tab_size = 8 # number +input_tab_size = 8 # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 8 # number +output_tab_size = 8 # The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # Allow interpreting '>=' and '>>=' as part of a template in 'void f(list>=val);'. # If true (default), 'assert(x<0 && y>=3)' will be broken. # Improvements to template detection may make this option obsolete. -tok_split_gte = false # false/true +tok_split_gte = false # # Indenting @@ -29,311 +29,311 @@ tok_split_gte = false # false/true # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 2 # number +indent_columns = 2 # The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents. # For FreeBSD, this is set to 4. -indent_continue = 0 # number +indent_continue = 0 # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs to brace level, align with spaces # 2=indent and align with tabs, using spaces when not on a tabstop -indent_with_tabs = 0 # number +indent_with_tabs = 0 # Comments that are not a brace level are indented with tabs on a tabstop. # Requires indent_with_tabs=2. If false, will use spaces. -indent_cmt_with_tabs = false # false/true +indent_cmt_with_tabs = false # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # Disabled indenting class braces if indent_braces is true -indent_braces_no_class = false # false/true +indent_braces_no_class = false # Disabled indenting struct braces if indent_braces is true -indent_braces_no_struct = false # false/true +indent_braces_no_struct = false # Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # The number of spaces to indent a namespace block -indent_namespace_level = 0 # number +indent_namespace_level = 0 # If the body of the namespace is longer than this number, it won't be indented. # Requires indent_namespace=true. Default=0 (no limit) -indent_namespace_limit = 0 # number +indent_namespace_limit = 0 # Whether the 'extern "C"' body is indented -indent_extern = false # false/true +indent_extern = false # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # Whether to indent the stuff after a leading class colon -indent_class_colon = true # false/true +indent_class_colon = true # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level -indent_else_if = false # false/true +indent_else_if = false # Amount to indent variable declarations after a open brace. neg=relative, pos=absolute -indent_var_def_blk = 0 # number +indent_var_def_blk = 0 # Indent continued variable declarations instead of aligning. -indent_var_def_cont = true # false/true +indent_var_def_cont = true # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = true # false/true +indent_func_call_param = true # Same as indent_func_call_param, but for function defs -indent_func_def_param = true # false/true +indent_func_def_param = true # Same as indent_func_call_param, but for function protos -indent_func_proto_param = true # false/true +indent_func_proto_param = true # Same as indent_func_call_param, but for class declarations -indent_func_class_param = true # false/true +indent_func_class_param = true # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = true # false/true +indent_func_ctor_var_param = true # Same as indent_func_call_param, but for templates -indent_template_param = true # false/true +indent_template_param = true # Double the indent for indent_func_xxx_param options -indent_func_param_double = true # false/true +indent_func_param_double = true # Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 0 # number +indent_func_const = 0 # Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 0 # number +indent_func_throw = 0 # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 2 # number +indent_member = 2 # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = true # false/true +indent_relative_single_line_comments = true # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 2 # number +indent_switch_case = 2 # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 2 # number +indent_case_brace = 2 # Whether to indent comments found in first column -indent_col1_comment = true # false/true +indent_col1_comment = true # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 2 # number +indent_label = 2 # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 2 # number +indent_access_spec = 2 # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 0 # number +indent_paren_close = 0 # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # If 'indent_bool_paren' is true, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones -indent_first_bool_expr = false # false/true +indent_first_bool_expr = false # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # Align continued statements at the '='. Default=True # If FALSE or the '=' is followed by a newline, the next line is indent one tab. -indent_align_assign = false # false/true +indent_align_assign = false # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = ignore # ignore/add/remove/force +sp_arith = ignore # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # Add or remove space around assignment operator '=' in a prototype -sp_assign_default = remove # ignore/add/remove/force +sp_assign_default = remove # Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. -sp_before_assign = ignore # ignore/add/remove/force +sp_before_assign = ignore # Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. -sp_after_assign = ignore # ignore/add/remove/force +sp_after_assign = ignore # Add or remove space around assignment '=' in enum -sp_enum_assign = force # ignore/add/remove/force +sp_enum_assign = force # Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_before_assign = ignore # ignore/add/remove/force +sp_enum_before_assign = ignore # Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_after_assign = ignore # ignore/add/remove/force +sp_enum_after_assign = ignore # Add or remove space around preprocessor '##' concatenation operator. Default=Add -sp_pp_concat = add # ignore/add/remove/force +sp_pp_concat = add # Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator. Default=Add -sp_pp_stringify = add # ignore/add/remove/force +sp_pp_stringify = add # Add or remove space around boolean operators '&&' and '||' -sp_bool = add # ignore/add/remove/force +sp_bool = add # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = add # ignore/add/remove/force +sp_compare = add # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # Add or remove space between nested parens -sp_paren_paren = ignore # ignore/add/remove/force +sp_paren_paren = ignore # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # Add or remove space between ')' and '{' -sp_paren_brace = remove # ignore/add/remove/force +sp_paren_brace = remove # Add or remove space before pointer star '*' -sp_before_ptr_star = remove # ignore/add/remove/force +sp_before_ptr_star = remove # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force +sp_before_unnamed_ptr_star = ignore # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = add # ignore/add/remove/force +sp_after_ptr_star = add # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = add # ignore/add/remove/force +sp_after_ptr_star_func = add # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = remove # ignore/add/remove/force +sp_before_ptr_star_func = remove # Add or remove space before a reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force +sp_before_unnamed_byref = ignore # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = add # ignore/add/remove/force +sp_after_byref = add # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = add # ignore/add/remove/force +sp_after_byref_func = add # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = remove # ignore/add/remove/force +sp_before_byref_func = remove # Add or remove space between type and word. Default=Force -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. -sp_template_angle = force # ignore/add/remove/force +sp_template_angle = force # Add or remove space before '<>' -sp_before_angle = ignore # ignore/add/remove/force +sp_before_angle = ignore # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # Add or remove space after '<>' -sp_after_angle = ignore # ignore/add/remove/force +sp_after_angle = ignore # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = ignore # ignore/add/remove/force +sp_angle_paren = ignore # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = force # ignore/add/remove/force +sp_angle_word = force # Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add -sp_angle_shift = add # ignore/add/remove/force +sp_angle_shift = add # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = add # ignore/add/remove/force +sp_before_sparen = add # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # Add or remove space before if-condition ')'. Overrides sp_inside_sparen. -sp_inside_sparen_close = ignore # ignore/add/remove/force +sp_inside_sparen_close = ignore # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = force # ignore/add/remove/force +sp_sparen_brace = force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # Add or remove space before ';'. Default=Remove -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = ignore # ignore/add/remove/force +sp_before_semi_for = ignore # Add or remove space before a semicolon of an empty part of a for statement. -sp_before_semi_for_empty = add # ignore/add/remove/force +sp_before_semi_for_empty = add # Add or remove space after ';', except when followed by a comment. Default=Add -sp_after_semi = ignore # ignore/add/remove/force +sp_after_semi = ignore # Add or remove space after ';' in non-empty 'for' statements. Default=Force -sp_after_semi_for = force # ignore/add/remove/force +sp_after_semi_for = force # Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; ). -sp_after_semi_for_empty = ignore # ignore/add/remove/force +sp_after_semi_for_empty = ignore # Add space before trailing comment, e.g., do_something(); // trailing comment sp_before_tr_emb_cmt = add @@ -342,908 +342,908 @@ sp_before_tr_emb_cmt = add sp_num_before_tr_emb_cmt = 2 # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # Add or remove space inside '[' and ']' -sp_inside_square = ignore # ignore/add/remove/force +sp_inside_square = ignore # Add or remove space after ',' -sp_after_comma = add # ignore/add/remove/force +sp_after_comma = add # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # Add or remove space between an open paren and comma: '(,' vs '( ,' -sp_paren_comma = force # ignore/add/remove/force +sp_paren_comma = force # Add or remove space before the variadic '...' when preceded by a non-punctuator -sp_before_ellipsis = ignore # ignore/add/remove/force +sp_before_ellipsis = ignore # Add or remove space after class ':' -sp_after_class_colon = add # ignore/add/remove/force +sp_after_class_colon = add # Add or remove space before class ':' -sp_before_class_colon = add # ignore/add/remove/force +sp_before_class_colon = add # Add or remove space before case ':'. Default=Remove -sp_before_case_colon = remove # ignore/add/remove/force +sp_before_case_colon = remove # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = remove # ignore/add/remove/force +sp_after_operator_sym = remove # Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = ignore # ignore/add/remove/force +sp_after_cast = ignore # Add or remove spaces inside cast parens -sp_inside_paren_cast = remove # ignore/add/remove/force +sp_inside_paren_cast = remove # Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = remove # ignore/add/remove/force +sp_cpp_cast_paren = remove # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = ignore # ignore/add/remove/force +sp_inside_braces_enum = ignore # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = ignore # ignore/add/remove/force +sp_inside_braces_struct = ignore # Add or remove space inside '{' and '}' -sp_inside_braces = ignore # ignore/add/remove/force +sp_inside_braces = ignore # Add or remove space inside '{}' -sp_inside_braces_empty = remove # ignore/add/remove/force +sp_inside_braces_empty = remove # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = ignore # ignore/add/remove/force +sp_type_func = ignore # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # Add or remove space between ')' and '{' of function -sp_fparen_brace = force # ignore/add/remove/force +sp_fparen_brace = force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = ignore # ignore/add/remove/force +sp_func_call_paren = ignore # Add or remove space between function name and '()' on function calls without parameters. # If set to 'ignore' (the default), sp_func_call_paren is used. -sp_func_call_paren_empty = ignore # ignore/add/remove/force +sp_func_call_paren_empty = ignore # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = ignore # ignore/add/remove/force +sp_func_call_user_paren = ignore # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # Add or remove space between 'return' and '(' -sp_return_paren = add # ignore/add/remove/force +sp_return_paren = add # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = ignore # ignore/add/remove/force +sp_defined_paren = ignore # Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = ignore # ignore/add/remove/force +sp_throw_paren = ignore # Add or remove space between 'catch' and '(' in 'catch (something) { }' # If set to ignore, sp_before_sparen is used. -sp_catch_paren = ignore # ignore/add/remove/force +sp_catch_paren = ignore # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = add # ignore/add/remove/force +sp_else_brace = add # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = add # ignore/add/remove/force +sp_brace_else = add # Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = add # ignore/add/remove/force +sp_brace_typedef = add # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = add # ignore/add/remove/force +sp_catch_brace = add # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = add # ignore/add/remove/force +sp_brace_catch = add # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = add # ignore/add/remove/force +sp_finally_brace = add # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = add # ignore/add/remove/force +sp_brace_finally = add # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = add # ignore/add/remove/force +sp_try_brace = add # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # Add or remove space before the '::' operator -sp_before_dc = remove # ignore/add/remove/force +sp_before_dc = remove # Add or remove space after the '::' operator -sp_after_dc = remove # ignore/add/remove/force +sp_after_dc = remove # Add or remove space after the '!' (not) operator. Default=Remove -sp_not = remove # ignore/add/remove/force +sp_not = remove # Add or remove space after the '~' (invert) operator. Default=Remove -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # Add or remove space after the '&' (address-of) operator. Default=Remove # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # Add or remove space around the '.' or '->' operators. Default=Remove -sp_member = remove # ignore/add/remove/force +sp_member = remove # Add or remove space after the '*' (dereference) operator. Default=Remove # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # Add or remove space before a backslash-newline at the end of a line. Default=Add -sp_before_nl_cont = add # ignore/add/remove/force +sp_before_nl_cont = add # Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = add # ignore/add/remove/force +sp_cond_colon = add # Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = add # ignore/add/remove/force +sp_cond_question = add # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = ignore # ignore/add/remove/force +sp_case_label = ignore # Control the space after the opening of a C++ comment '// A' vs '//A' -sp_cmt_cpp_start = add # ignore/add/remove/force +sp_cmt_cpp_start = add # Controls the spaces between #else or #endif and a trailing comment -sp_endif_cmt = ignore # ignore/add/remove/force +sp_endif_cmt = ignore # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # Whether to use tabs for aligning -align_with_tabs = false # false/true +align_with_tabs = false # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # Align variable definitions in prototypes and functions -align_func_params = false # false/true +align_func_params = false # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = false # false/true +align_same_func_call_params = false # The span for aligning variable definitions (0=don't align) -align_var_def_span = 0 # number +align_var_def_span = 0 # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 0 # number +align_var_def_star_style = 0 # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # Whether to align any attribute after the variable name -align_var_def_attribute = false # false/true +align_var_def_attribute = false # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = false # false/true +align_var_def_inline = false # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 0 # number +align_assign_span = 0 # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 0 # number +align_enum_equ_span = 0 # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # The span for aligning struct/union (0=don't align) -align_var_struct_span = 0 # number +align_var_struct_span = 0 # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 0 # number +align_struct_init_span = 0 # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number +align_typedef_gap = 0 # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 0 # number +align_typedef_span = 0 # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typedef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typedef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 0 # number +align_right_cmt_span = 0 # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. This has to be > 0 to do anything. -align_right_cmt_gap = 0 # number +align_right_cmt_gap = 0 # Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore) -align_right_cmt_at_col = 0 # number +align_right_cmt_at_col = 0 # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # Align function protos on the 'operator' keyword instead of what follows -align_on_operator = false # false/true +align_on_operator = false # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true +align_single_line_func = false # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = false # false/true +align_nl_cont = false # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 0 # number +align_pp_define_gap = 0 # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 0 # number +align_pp_define_span = 0 # Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = true # false/true +align_left_shift = true # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = true # false/true +nl_collapse_empty_body = true # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = true # false/true +nl_assign_leave_one_liners = true # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = true # false/true +nl_class_leave_one_liners = true # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = true # false/true +nl_enum_leave_one_liners = true # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # Add or remove newlines at the start of the file -nl_start_of_file = ignore # ignore/add/remove/force +nl_start_of_file = ignore # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # Add or remove newline between '=' and '{' -nl_assign_brace = remove # ignore/add/remove/force +nl_assign_brace = remove # The number of blank lines after a block of variable definitions -nl_func_var_def_blk = 0 # number +nl_func_var_def_blk = 0 # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = remove # ignore/add/remove/force +nl_fcall_brace = remove # Add or remove newline between 'enum' and '{' -nl_enum_brace = remove # ignore/add/remove/force +nl_enum_brace = remove # Add or remove newline between 'struct and '{' -nl_struct_brace = remove # ignore/add/remove/force +nl_struct_brace = remove # Add or remove newline between 'union' and '{' -nl_union_brace = remove # ignore/add/remove/force +nl_union_brace = remove # Add or remove newline between 'if' and '{' -nl_if_brace = remove # ignore/add/remove/force +nl_if_brace = remove # Add or remove newline between '}' and 'else' -nl_brace_else = remove # ignore/add/remove/force +nl_brace_else = remove # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = remove # ignore/add/remove/force +nl_elseif_brace = remove # Add or remove newline between 'else' and '{' -nl_else_brace = remove # ignore/add/remove/force +nl_else_brace = remove # Add or remove newline between 'else' and 'if' -nl_else_if = remove # ignore/add/remove/force +nl_else_if = remove # Add or remove newline between '}' and 'finally' -nl_brace_finally = remove # ignore/add/remove/force +nl_brace_finally = remove # Add or remove newline between 'finally' and '{' -nl_finally_brace = remove # ignore/add/remove/force +nl_finally_brace = remove # Add or remove newline between 'try' and '{' -nl_try_brace = remove # ignore/add/remove/force +nl_try_brace = remove # Add or remove newline between get/set and '{' -nl_getset_brace = ignore # ignore/add/remove/force +nl_getset_brace = ignore # Add or remove newline between 'for' and '{' -nl_for_brace = remove # ignore/add/remove/force +nl_for_brace = remove # Add or remove newline between 'catch' and '{' -nl_catch_brace = remove # ignore/add/remove/force +nl_catch_brace = remove # Add or remove newline between '}' and 'catch' -nl_brace_catch = remove # ignore/add/remove/force +nl_brace_catch = remove # Add or remove newline between 'while' and '{' -nl_while_brace = remove # ignore/add/remove/force +nl_while_brace = remove # Add or remove newline between 'using' and '{' -nl_using_brace = remove # ignore/add/remove/force +nl_using_brace = remove # Add or remove newline between two open or close braces. # Due to general newline/brace handling, REMOVE may not work. -nl_brace_brace = ignore # ignore/add/remove/force +nl_brace_brace = ignore # Add or remove newline between 'do' and '{' -nl_do_brace = remove # ignore/add/remove/force +nl_do_brace = remove # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # Add or remove newline between 'switch' and '{' -nl_switch_brace = remove # ignore/add/remove/force +nl_switch_brace = remove # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = true # false/true +nl_multi_line_cond = true # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = false # false/true +nl_multi_line_define = false # Whether to put a newline before 'case' statement -nl_before_case = false # false/true +nl_before_case = false # Add or remove newline between ')' and 'throw' -nl_before_throw = ignore # ignore/add/remove/force +nl_before_throw = ignore # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # Newline between namespace and { -nl_namespace_brace = remove # ignore/add/remove/force +nl_namespace_brace = remove # Add or remove newline between 'template<>' and whatever follows. -nl_template_class = force # ignore/add/remove/force +nl_template_class = force # Add or remove newline between 'class' and '{' -nl_class_brace = remove # ignore/add/remove/force +nl_class_brace = remove # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = add # ignore/add/remove/force +nl_class_init_args = add # Add or remove newline between return type and function name in a function definition -nl_func_type_name = remove # ignore/add/remove/force +nl_func_type_name = remove # Add or remove newline between return type and function name inside a class {} # Uses nl_func_type_name or nl_func_proto_type_name if set to ignore. -nl_func_type_name_class = remove # ignore/add/remove/force +nl_func_type_name_class = remove # Add or remove newline between function scope and name in a definition # Controls the newline after '::' in 'void A::f() { }' -nl_func_scope_name = remove # ignore/add/remove/force +nl_func_scope_name = remove # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = remove # ignore/add/remove/force +nl_func_proto_type_name = remove # Add or remove newline between a function name and the opening '(' -nl_func_paren = remove # ignore/add/remove/force +nl_func_paren = remove # Add or remove newline between a function name and the opening '(' in the definition -nl_func_def_paren = remove # ignore/add/remove/force +nl_func_def_paren = remove # Add or remove newline after '(' in a function declaration -nl_func_decl_start = add # ignore/add/remove/force +nl_func_decl_start = add # Add or remove newline after '(' in a function definition -nl_func_def_start = add # ignore/add/remove/force +nl_func_def_start = add # Overrides nl_func_decl_start when there is only one parameter. -nl_func_decl_start_single = remove # ignore/add/remove/force +nl_func_decl_start_single = remove # Overrides nl_func_def_start when there is only one parameter. -nl_func_def_start_single = remove # ignore/add/remove/force +nl_func_def_start_single = remove # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = add # ignore/add/remove/force +nl_func_decl_args = add # Add or remove newline after each ',' in a function definition -nl_func_def_args = add # ignore/add/remove/force +nl_func_def_args = add # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = remove # ignore/add/remove/force +nl_func_decl_end = remove # Add or remove newline before the ')' in a function definition -nl_func_def_end = remove # ignore/add/remove/force +nl_func_def_end = remove # Overrides nl_func_decl_end when there is only one parameter. -nl_func_decl_end_single = remove # ignore/add/remove/force +nl_func_decl_end_single = remove # Overrides nl_func_def_end when there is only one parameter. -nl_func_def_end_single = remove # ignore/add/remove/force +nl_func_def_end_single = remove # Add or remove newline between '()' in a function declaration. -nl_func_decl_empty = remove # ignore/add/remove/force +nl_func_decl_empty = remove # Add or remove newline between '()' in a function definition. -nl_func_def_empty = remove # ignore/add/remove/force +nl_func_def_empty = remove # Add or remove newline between function signature and '{' -nl_fdef_brace = remove # ignore/add/remove/force +nl_fdef_brace = remove # Whether to put a newline after 'return' statement -nl_after_return = false # false/true +nl_after_return = false # Add or remove a newline between the return keyword and return expression. -nl_return_expr = ignore # ignore/add/remove/force +nl_return_expr = ignore # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = false # false/true +nl_after_brace_open = false # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true +nl_after_brace_open_cmt = false # Whether to put a newline after a virtual brace open with a non-empty body. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = true # false/true +nl_after_vbrace_open = true # Whether to put a newline after a virtual brace open with an empty body. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open_empty = true # false/true +nl_after_vbrace_open_empty = true # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. -nl_after_brace_close = true # false/true +nl_after_brace_close = true # Whether to put a newline after a virtual brace close. # Would add a newline before return in: 'if (foo) a++; return;' -nl_after_vbrace_close = true # false/true +nl_after_vbrace_close = true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true +nl_squeeze_ifdef = false # Add or remove blank line before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # Add or remove blank line after 'if' statement -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # Add or remove blank line before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # Add or remove blank line after 'for' statement -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # Add or remove blank line before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # Add or remove blank line after 'while' statement -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # Add or remove blank line before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # Add or remove blank line after 'switch' statement -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # Add or remove blank line before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # Add or remove blank line after 'do/while' statement -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # Whether to double-space before the close brace of a struct/union/enum # (lower priority than 'eat_blanks_before_close_brace') -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # # Positioning options # # The position of arithmetic operators in wrapped expressions -pos_arith = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_arith = ignore # The position of assignment in wrapped expressions. # Do not affect '=' followed by '{' -pos_assign = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_assign = trail # The position of boolean operators in wrapped expressions -pos_bool = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_bool = trail # The position of comparison operators in wrapped expressions -pos_compare = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_compare = ignore # The position of conditional (b ? t : f) operators in wrapped expressions -pos_conditional = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_conditional = trail # The position of the comma in wrapped expressions -pos_comma = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_comma = ignore # The position of the comma in the constructor initialization list -pos_class_comma = trail_force # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_comma = trail_force # The position of colons between constructor and member initialization -pos_class_colon = lead # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_colon = lead # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 120 # number +code_width = 120 # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = true # false/true +ls_for_split_full = true # Whether to fully split long function protos/calls at commas -ls_func_split_full = true # false/true +ls_func_split_full = true # # Blank line options # # The maximum consecutive newlines -nl_max = 3 # number +nl_max = 3 # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 2 # number +nl_after_func_proto = 2 # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 2 # number +nl_after_func_body_one_liner = 2 # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 0 # number +nl_before_block_comment = 0 # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # Whether to force a newline after a multi-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 2 # number +nl_before_access_spec = 2 # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 1 # number +nl_after_access_spec = 1 # The number of newlines between a function def and the function comment. # 0 = No change. -nl_comment_func_def = 0 # number +nl_comment_func_def = 0 # The number of newlines after a try-catch-finally block that isn't followed by a brace close. # 0 = No change. -nl_after_try_catch_finally = 2 # number +nl_after_try_catch_finally = 2 # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = ignore # ignore/add/remove/force +mod_full_brace_do = ignore # Add or remove braces on single-line 'for' statement -mod_full_brace_for = ignore # ignore/add/remove/force +mod_full_brace_for = ignore # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = ignore # ignore/add/remove/force +mod_full_brace_if = ignore # Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if. # If any must be braced, they are all braced. If all can be unbraced, then the braces are removed. -mod_full_brace_if_chain = true # false/true +mod_full_brace_if_chain = true # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # Add or remove braces on single-line 'while' statement -mod_full_brace_while = ignore # ignore/add/remove/force +mod_full_brace_while = ignore # Add or remove braces on single-line 'using ()' statement -mod_full_brace_using = ignore # ignore/add/remove/force +mod_full_brace_using = ignore # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = ignore # ignore/add/remove/force +mod_paren_on_return = ignore # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = false # false/true +mod_full_paren_if_bool = false # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = true # false/true +mod_remove_extra_semicolon = true # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 0 # number +mod_add_long_function_closebrace_comment = 0 # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number +mod_add_long_switch_closebrace_comment = 0 # If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after # the #endif, a comment will be added. -mod_add_long_ifdef_endif_comment = 0 # number +mod_add_long_ifdef_endif_comment = 0 # If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after # the #else, a comment will be added. -mod_add_long_ifdef_else_comment = 0 # number +mod_add_long_ifdef_else_comment = 0 # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = true # false/true +mod_sort_include = true # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = false # false/true +mod_move_case_break = false # Will add or remove the braces around a fully braced case statement. # Will only remove the braces if there are no variable declarations in the block. -mod_case_brace = remove # ignore/add/remove/force +mod_case_brace = remove # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = true # false/true +mod_remove_empty_return = true # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # Set the comment reflow mode (default: 0) # 0: no reflowing (apart from the line wrapping due to cmt_width) # 1: no touching at all # 2: full reflow -cmt_reflow_mode = 0 # number +cmt_reflow_mode = 0 # If false, disable all multi-line comment changes, including cmt_width. keyword substitution, and leading chars. # Default is true. -cmt_indent_multi = true # false/true +cmt_indent_multi = true # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_footer = "" # string +cmt_insert_file_footer = "" # The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment. # Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment. # Will substitute $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_oc_msg_header, cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true +cmt_insert_before_preproc = false # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = remove # ignore/add/remove/force +pp_indent = remove # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. -pp_indent_count = 1 # number +pp_indent_count = 1 # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true +pp_if_indent_code = false # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/sp_before_tr_emb_cmt-f.cfg b/tests/config/sp_before_tr_emb_cmt-f.cfg index f6a67c2514..79350fbc81 100644 --- a/tests/config/sp_before_tr_emb_cmt-f.cfg +++ b/tests/config/sp_before_tr_emb_cmt-f.cfg @@ -4,24 +4,24 @@ # # The type of line endings -newlines = auto # auto/lf/crlf/cr +newlines = auto # The original size of tabs in the input -input_tab_size = 8 # number +input_tab_size = 8 # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 8 # number +output_tab_size = 8 # The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # Allow interpreting '>=' and '>>=' as part of a template in 'void f(list>=val);'. # If true (default), 'assert(x<0 && y>=3)' will be broken. # Improvements to template detection may make this option obsolete. -tok_split_gte = false # false/true +tok_split_gte = false # # Indenting @@ -29,311 +29,311 @@ tok_split_gte = false # false/true # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 2 # number +indent_columns = 2 # The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents. # For FreeBSD, this is set to 4. -indent_continue = 0 # number +indent_continue = 0 # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs to brace level, align with spaces # 2=indent and align with tabs, using spaces when not on a tabstop -indent_with_tabs = 0 # number +indent_with_tabs = 0 # Comments that are not a brace level are indented with tabs on a tabstop. # Requires indent_with_tabs=2. If false, will use spaces. -indent_cmt_with_tabs = false # false/true +indent_cmt_with_tabs = false # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # Disabled indenting class braces if indent_braces is true -indent_braces_no_class = false # false/true +indent_braces_no_class = false # Disabled indenting struct braces if indent_braces is true -indent_braces_no_struct = false # false/true +indent_braces_no_struct = false # Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # Whether the 'namespace' body is indented -indent_namespace = false # false/true +indent_namespace = false # The number of spaces to indent a namespace block -indent_namespace_level = 0 # number +indent_namespace_level = 0 # If the body of the namespace is longer than this number, it won't be indented. # Requires indent_namespace=true. Default=0 (no limit) -indent_namespace_limit = 0 # number +indent_namespace_limit = 0 # Whether the 'extern "C"' body is indented -indent_extern = false # false/true +indent_extern = false # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # Whether to indent the stuff after a leading class colon -indent_class_colon = true # false/true +indent_class_colon = true # False=treat 'else\nif' as 'else if' for indenting purposes # True=indent the 'if' one level -indent_else_if = false # false/true +indent_else_if = false # Amount to indent variable declarations after a open brace. neg=relative, pos=absolute -indent_var_def_blk = 0 # number +indent_var_def_blk = 0 # Indent continued variable declarations instead of aligning. -indent_var_def_cont = true # false/true +indent_var_def_cont = true # True: indent continued function call parameters one indent level # False: align parameters under the open paren -indent_func_call_param = true # false/true +indent_func_call_param = true # Same as indent_func_call_param, but for function defs -indent_func_def_param = true # false/true +indent_func_def_param = true # Same as indent_func_call_param, but for function protos -indent_func_proto_param = true # false/true +indent_func_proto_param = true # Same as indent_func_call_param, but for class declarations -indent_func_class_param = true # false/true +indent_func_class_param = true # Same as indent_func_call_param, but for class variable constructors -indent_func_ctor_var_param = true # false/true +indent_func_ctor_var_param = true # Same as indent_func_call_param, but for templates -indent_template_param = true # false/true +indent_template_param = true # Double the indent for indent_func_xxx_param options -indent_func_param_double = true # false/true +indent_func_param_double = true # Indentation column for standalone 'const' function decl/proto qualifier -indent_func_const = 0 # number +indent_func_const = 0 # Indentation column for standalone 'throw' function decl/proto qualifier -indent_func_throw = 0 # number +indent_func_throw = 0 # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 2 # number +indent_member = 2 # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # If set, will indent trailing single line ('//') comments relative # to the code instead of trying to keep the same absolute column -indent_relative_single_line_comments = true # false/true +indent_relative_single_line_comments = true # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 2 # number +indent_switch_case = 2 # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 2 # number +indent_case_brace = 2 # Whether to indent comments found in first column -indent_col1_comment = true # false/true +indent_col1_comment = true # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 2 # number +indent_label = 2 # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 2 # number +indent_access_spec = 2 # Indent the code after an access specifier by one level. # If set, this option forces 'indent_access_spec=0' -indent_access_spec_body = false # false/true +indent_access_spec_body = false # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # Controls the indent of a close paren after a newline. # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 0 # number +indent_paren_close = 0 # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren -indent_comma_paren = false # false/true +indent_comma_paren = false # Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren -indent_bool_paren = false # false/true +indent_bool_paren = false # If 'indent_bool_paren' is true, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones -indent_first_bool_expr = false # false/true +indent_first_bool_expr = false # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # Align continued statements at the '='. Default=True # If FALSE or the '=' is followed by a newline, the next line is indent one tab. -indent_align_assign = false # false/true +indent_align_assign = false # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = ignore # ignore/add/remove/force +sp_arith = ignore # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # Add or remove space around assignment operator '=' in a prototype -sp_assign_default = remove # ignore/add/remove/force +sp_assign_default = remove # Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign. -sp_before_assign = ignore # ignore/add/remove/force +sp_before_assign = ignore # Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign. -sp_after_assign = ignore # ignore/add/remove/force +sp_after_assign = ignore # Add or remove space around assignment '=' in enum -sp_enum_assign = force # ignore/add/remove/force +sp_enum_assign = force # Add or remove space before assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_before_assign = ignore # ignore/add/remove/force +sp_enum_before_assign = ignore # Add or remove space after assignment '=' in enum. Overrides sp_enum_assign. -sp_enum_after_assign = ignore # ignore/add/remove/force +sp_enum_after_assign = ignore # Add or remove space around preprocessor '##' concatenation operator. Default=Add -sp_pp_concat = add # ignore/add/remove/force +sp_pp_concat = add # Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator. Default=Add -sp_pp_stringify = add # ignore/add/remove/force +sp_pp_stringify = add # Add or remove space around boolean operators '&&' and '||' -sp_bool = add # ignore/add/remove/force +sp_bool = add # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = add # ignore/add/remove/force +sp_compare = add # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # Add or remove space between nested parens -sp_paren_paren = ignore # ignore/add/remove/force +sp_paren_paren = ignore # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # Add or remove space between ')' and '{' -sp_paren_brace = remove # ignore/add/remove/force +sp_paren_brace = remove # Add or remove space before pointer star '*' -sp_before_ptr_star = remove # ignore/add/remove/force +sp_before_ptr_star = remove # Add or remove space before pointer star '*' that isn't followed by a variable name # If set to 'ignore', sp_before_ptr_star is used instead. -sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force +sp_before_unnamed_ptr_star = ignore # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = add # ignore/add/remove/force +sp_after_ptr_star = add # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = add # ignore/add/remove/force +sp_after_ptr_star_func = add # Add or remove space before a pointer star '*', if followed by a func proto/def. -sp_before_ptr_star_func = remove # ignore/add/remove/force +sp_before_ptr_star_func = remove # Add or remove space before a reference sign '&' -sp_before_byref = remove # ignore/add/remove/force +sp_before_byref = remove # Add or remove space before a reference sign '&' that isn't followed by a variable name # If set to 'ignore', sp_before_byref is used instead. -sp_before_unnamed_byref = ignore # ignore/add/remove/force +sp_before_unnamed_byref = ignore # Add or remove space after reference sign '&', if followed by a word. -sp_after_byref = add # ignore/add/remove/force +sp_after_byref = add # Add or remove space after a reference sign '&', if followed by a func proto/def. -sp_after_byref_func = add # ignore/add/remove/force +sp_after_byref_func = add # Add or remove space before a reference sign '&', if followed by a func proto/def. -sp_before_byref_func = remove # ignore/add/remove/force +sp_before_byref_func = remove # Add or remove space between type and word. Default=Force -sp_after_type = force # ignore/add/remove/force +sp_after_type = force # Add or remove space in 'template <' vs 'template<'. # If set to ignore, sp_before_angle is used. -sp_template_angle = force # ignore/add/remove/force +sp_template_angle = force # Add or remove space before '<>' -sp_before_angle = ignore # ignore/add/remove/force +sp_before_angle = ignore # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # Add or remove space after '<>' -sp_after_angle = ignore # ignore/add/remove/force +sp_after_angle = ignore # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = ignore # ignore/add/remove/force +sp_angle_paren = ignore # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = force # ignore/add/remove/force +sp_angle_word = force # Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add -sp_angle_shift = add # ignore/add/remove/force +sp_angle_shift = add # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = add # ignore/add/remove/force +sp_before_sparen = add # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # Add or remove space before if-condition ')'. Overrides sp_inside_sparen. -sp_inside_sparen_close = ignore # ignore/add/remove/force +sp_inside_sparen_close = ignore # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = force # ignore/add/remove/force +sp_sparen_brace = force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = ignore # ignore/add/remove/force +sp_special_semi = ignore # Add or remove space before ';'. Default=Remove -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = ignore # ignore/add/remove/force +sp_before_semi_for = ignore # Add or remove space before a semicolon of an empty part of a for statement. -sp_before_semi_for_empty = add # ignore/add/remove/force +sp_before_semi_for_empty = add # Add or remove space after ';', except when followed by a comment. Default=Add -sp_after_semi = ignore # ignore/add/remove/force +sp_after_semi = ignore # Add or remove space after ';' in non-empty 'for' statements. Default=Force -sp_after_semi_for = force # ignore/add/remove/force +sp_after_semi_for = force # Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; ). -sp_after_semi_for_empty = ignore # ignore/add/remove/force +sp_after_semi_for_empty = ignore # Add space before trailing comment, e.g., do_something(); // trailing comment sp_before_tr_emb_cmt = force @@ -342,908 +342,908 @@ sp_before_tr_emb_cmt = force sp_num_before_tr_emb_cmt = 2 # Add or remove space before '[' (except '[]') -sp_before_square = ignore # ignore/add/remove/force +sp_before_square = ignore # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # Add or remove space inside '[' and ']' -sp_inside_square = ignore # ignore/add/remove/force +sp_inside_square = ignore # Add or remove space after ',' -sp_after_comma = add # ignore/add/remove/force +sp_after_comma = add # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # Add or remove space between an open paren and comma: '(,' vs '( ,' -sp_paren_comma = force # ignore/add/remove/force +sp_paren_comma = force # Add or remove space before the variadic '...' when preceded by a non-punctuator -sp_before_ellipsis = ignore # ignore/add/remove/force +sp_before_ellipsis = ignore # Add or remove space after class ':' -sp_after_class_colon = add # ignore/add/remove/force +sp_after_class_colon = add # Add or remove space before class ':' -sp_before_class_colon = add # ignore/add/remove/force +sp_before_class_colon = add # Add or remove space before case ':'. Default=Remove -sp_before_case_colon = remove # ignore/add/remove/force +sp_before_case_colon = remove # Add or remove space between 'operator' and operator sign -sp_after_operator = ignore # ignore/add/remove/force +sp_after_operator = ignore # Add or remove space between the operator symbol and the open paren, as in 'operator ++(' -sp_after_operator_sym = remove # ignore/add/remove/force +sp_after_operator_sym = remove # Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' -sp_after_cast = ignore # ignore/add/remove/force +sp_after_cast = ignore # Add or remove spaces inside cast parens -sp_inside_paren_cast = remove # ignore/add/remove/force +sp_inside_paren_cast = remove # Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)' -sp_cpp_cast_paren = remove # ignore/add/remove/force +sp_cpp_cast_paren = remove # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = ignore # ignore/add/remove/force +sp_inside_braces_enum = ignore # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = ignore # ignore/add/remove/force +sp_inside_braces_struct = ignore # Add or remove space inside '{' and '}' -sp_inside_braces = ignore # ignore/add/remove/force +sp_inside_braces = ignore # Add or remove space inside '{}' -sp_inside_braces_empty = remove # ignore/add/remove/force +sp_inside_braces_empty = remove # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = ignore # ignore/add/remove/force +sp_type_func = ignore # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = ignore # ignore/add/remove/force +sp_square_fparen = ignore # Add or remove space between ')' and '{' of function -sp_fparen_brace = force # ignore/add/remove/force +sp_fparen_brace = force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = ignore # ignore/add/remove/force +sp_func_call_paren = ignore # Add or remove space between function name and '()' on function calls without parameters. # If set to 'ignore' (the default), sp_func_call_paren is used. -sp_func_call_paren_empty = ignore # ignore/add/remove/force +sp_func_call_paren_empty = ignore # Add or remove space between the user function name and '(' on function calls # You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file. -sp_func_call_user_paren = ignore # ignore/add/remove/force +sp_func_call_user_paren = ignore # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # Add or remove space between 'return' and '(' -sp_return_paren = add # ignore/add/remove/force +sp_return_paren = add # Add or remove space between '__attribute__' and '(' -sp_attribute_paren = ignore # ignore/add/remove/force +sp_attribute_paren = ignore # Add or remove space between 'defined' and '(' in '#if defined (FOO)' -sp_defined_paren = ignore # ignore/add/remove/force +sp_defined_paren = ignore # Add or remove space between 'throw' and '(' in 'throw (something)' -sp_throw_paren = ignore # ignore/add/remove/force +sp_throw_paren = ignore # Add or remove space between 'catch' and '(' in 'catch (something) { }' # If set to ignore, sp_before_sparen is used. -sp_catch_paren = ignore # ignore/add/remove/force +sp_catch_paren = ignore # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = add # ignore/add/remove/force +sp_else_brace = add # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = add # ignore/add/remove/force +sp_brace_else = add # Add or remove space between '}' and the name of a typedef on the same line -sp_brace_typedef = add # ignore/add/remove/force +sp_brace_typedef = add # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = add # ignore/add/remove/force +sp_catch_brace = add # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = add # ignore/add/remove/force +sp_brace_catch = add # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = add # ignore/add/remove/force +sp_finally_brace = add # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = add # ignore/add/remove/force +sp_brace_finally = add # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = add # ignore/add/remove/force +sp_try_brace = add # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # Add or remove space before the '::' operator -sp_before_dc = remove # ignore/add/remove/force +sp_before_dc = remove # Add or remove space after the '::' operator -sp_after_dc = remove # ignore/add/remove/force +sp_after_dc = remove # Add or remove space after the '!' (not) operator. Default=Remove -sp_not = remove # ignore/add/remove/force +sp_not = remove # Add or remove space after the '~' (invert) operator. Default=Remove -sp_inv = remove # ignore/add/remove/force +sp_inv = remove # Add or remove space after the '&' (address-of) operator. Default=Remove # This does not affect the spacing after a '&' that is part of a type. -sp_addr = remove # ignore/add/remove/force +sp_addr = remove # Add or remove space around the '.' or '->' operators. Default=Remove -sp_member = remove # ignore/add/remove/force +sp_member = remove # Add or remove space after the '*' (dereference) operator. Default=Remove # This does not affect the spacing after a '*' that is part of a type. -sp_deref = remove # ignore/add/remove/force +sp_deref = remove # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove -sp_sign = remove # ignore/add/remove/force +sp_sign = remove # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove -sp_incdec = remove # ignore/add/remove/force +sp_incdec = remove # Add or remove space before a backslash-newline at the end of a line. Default=Add -sp_before_nl_cont = add # ignore/add/remove/force +sp_before_nl_cont = add # Add or remove space around the ':' in 'b ? t : f' -sp_cond_colon = add # ignore/add/remove/force +sp_cond_colon = add # Add or remove space around the '?' in 'b ? t : f' -sp_cond_question = add # ignore/add/remove/force +sp_cond_question = add # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here. -sp_case_label = ignore # ignore/add/remove/force +sp_case_label = ignore # Control the space after the opening of a C++ comment '// A' vs '//A' -sp_cmt_cpp_start = add # ignore/add/remove/force +sp_cmt_cpp_start = add # Controls the spaces between #else or #endif and a trailing comment -sp_endif_cmt = ignore # ignore/add/remove/force +sp_endif_cmt = ignore # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # Whether to use tabs for aligning -align_with_tabs = false # false/true +align_with_tabs = false # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # Whether to right-align numbers -align_number_right = false # false/true +align_number_right = false # Align variable definitions in prototypes and functions -align_func_params = false # false/true +align_func_params = false # Align parameters in single-line functions that have the same name. # The function names must already be aligned with each other. -align_same_func_call_params = false # false/true +align_same_func_call_params = false # The span for aligning variable definitions (0=don't align) -align_var_def_span = 0 # number +align_var_def_span = 0 # How to align the star in variable definitions. # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 0 # number +align_var_def_star_style = 0 # How to align the '&' in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_amp_style = 0 # number +align_var_def_amp_style = 0 # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 0 # number +align_var_def_thresh = 0 # The gap for aligning variable definitions -align_var_def_gap = 0 # number +align_var_def_gap = 0 # Whether to align the colon in struct bit fields -align_var_def_colon = false # false/true +align_var_def_colon = false # Whether to align any attribute after the variable name -align_var_def_attribute = false # false/true +align_var_def_attribute = false # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = false # false/true +align_var_def_inline = false # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 0 # number +align_assign_span = 0 # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 0 # number +align_assign_thresh = 0 # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 0 # number +align_enum_equ_span = 0 # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 0 # number +align_enum_equ_thresh = 0 # The span for aligning struct/union (0=don't align) -align_var_struct_span = 0 # number +align_var_struct_span = 0 # The threshold for aligning struct/union member definitions (0=no limit) -align_var_struct_thresh = 0 # number +align_var_struct_thresh = 0 # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 0 # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 0 # number +align_struct_init_span = 0 # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number +align_typedef_gap = 0 # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 0 # number +align_typedef_span = 0 # How to align typedef'd functions with other typedefs # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 0 # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typedef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 0 # number +align_typedef_star_style = 0 # Controls the positioning of the '&' in typedefs. Just try it. # 0: Align on typedef type, ignore '&' # 1: The '&' is part of type name: typedef int &pint; # 2: The '&' is part of the type, but dangling: typedef int &pint; -align_typedef_amp_style = 0 # number +align_typedef_amp_style = 0 # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 0 # number +align_right_cmt_span = 0 # If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment -align_right_cmt_mix = false # false/true +align_right_cmt_mix = false # If a trailing comment is more than this number of columns away from the text it follows, # it will qualify for being aligned. This has to be > 0 to do anything. -align_right_cmt_gap = 0 # number +align_right_cmt_gap = 0 # Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore) -align_right_cmt_at_col = 0 # number +align_right_cmt_at_col = 0 # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 0 # number +align_func_proto_span = 0 # Minimum gap between the return type and the function name. -align_func_proto_gap = 0 # number +align_func_proto_gap = 0 # Align function protos on the 'operator' keyword instead of what follows -align_on_operator = false # false/true +align_on_operator = false # Whether to mix aligning prototype and variable declarations. # If true, align_var_def_XXX options are used instead of align_func_proto_XXX options. -align_mix_var_proto = false # false/true +align_mix_var_proto = false # Align single-line functions with function prototypes, uses align_func_proto_span -align_single_line_func = false # false/true +align_single_line_func = false # Aligning the open brace of single-line functions. # Requires align_single_line_func=true, uses align_func_proto_span -align_single_line_brace = false # false/true +align_single_line_brace = false # Gap for align_single_line_brace. -align_single_line_brace_gap = 0 # number +align_single_line_brace_gap = 0 # Whether to align macros wrapped with a backslash and a newline. # This will not work right if the macro contains a multi-line comment. -align_nl_cont = false # false/true +align_nl_cont = false # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 0 # number +align_pp_define_gap = 0 # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 0 # number +align_pp_define_span = 0 # Align lines that start with '<<' with previous '<<'. Default=true -align_left_shift = true # false/true +align_left_shift = true # # Newline adding and removing options # # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = true # false/true +nl_collapse_empty_body = true # Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = true # false/true +nl_assign_leave_one_liners = true # Don't split one-line braced statements inside a class xx { } body -nl_class_leave_one_liners = true # false/true +nl_class_leave_one_liners = true # Don't split one-line enums: 'enum foo { BAR = 15 };' -nl_enum_leave_one_liners = true # false/true +nl_enum_leave_one_liners = true # Don't split one-line get or set functions -nl_getset_leave_one_liners = false # false/true +nl_getset_leave_one_liners = false # Don't split one-line function definitions - 'int foo() { return 0; }' -nl_func_leave_one_liners = false # false/true +nl_func_leave_one_liners = false # Don't split one-line if/else statements - 'if(a) b++;' -nl_if_leave_one_liners = false # false/true +nl_if_leave_one_liners = false # Add or remove newlines at the start of the file -nl_start_of_file = ignore # ignore/add/remove/force +nl_start_of_file = ignore # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # Add or remove newline between '=' and '{' -nl_assign_brace = remove # ignore/add/remove/force +nl_assign_brace = remove # The number of blank lines after a block of variable definitions -nl_func_var_def_blk = 0 # number +nl_func_var_def_blk = 0 # Add or remove newline between a function call's ')' and '{', as in: # list_for_each(item, &list) { } -nl_fcall_brace = remove # ignore/add/remove/force +nl_fcall_brace = remove # Add or remove newline between 'enum' and '{' -nl_enum_brace = remove # ignore/add/remove/force +nl_enum_brace = remove # Add or remove newline between 'struct and '{' -nl_struct_brace = remove # ignore/add/remove/force +nl_struct_brace = remove # Add or remove newline between 'union' and '{' -nl_union_brace = remove # ignore/add/remove/force +nl_union_brace = remove # Add or remove newline between 'if' and '{' -nl_if_brace = remove # ignore/add/remove/force +nl_if_brace = remove # Add or remove newline between '}' and 'else' -nl_brace_else = remove # ignore/add/remove/force +nl_brace_else = remove # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = remove # ignore/add/remove/force +nl_elseif_brace = remove # Add or remove newline between 'else' and '{' -nl_else_brace = remove # ignore/add/remove/force +nl_else_brace = remove # Add or remove newline between 'else' and 'if' -nl_else_if = remove # ignore/add/remove/force +nl_else_if = remove # Add or remove newline between '}' and 'finally' -nl_brace_finally = remove # ignore/add/remove/force +nl_brace_finally = remove # Add or remove newline between 'finally' and '{' -nl_finally_brace = remove # ignore/add/remove/force +nl_finally_brace = remove # Add or remove newline between 'try' and '{' -nl_try_brace = remove # ignore/add/remove/force +nl_try_brace = remove # Add or remove newline between get/set and '{' -nl_getset_brace = ignore # ignore/add/remove/force +nl_getset_brace = ignore # Add or remove newline between 'for' and '{' -nl_for_brace = remove # ignore/add/remove/force +nl_for_brace = remove # Add or remove newline between 'catch' and '{' -nl_catch_brace = remove # ignore/add/remove/force +nl_catch_brace = remove # Add or remove newline between '}' and 'catch' -nl_brace_catch = remove # ignore/add/remove/force +nl_brace_catch = remove # Add or remove newline between 'while' and '{' -nl_while_brace = remove # ignore/add/remove/force +nl_while_brace = remove # Add or remove newline between 'using' and '{' -nl_using_brace = remove # ignore/add/remove/force +nl_using_brace = remove # Add or remove newline between two open or close braces. # Due to general newline/brace handling, REMOVE may not work. -nl_brace_brace = ignore # ignore/add/remove/force +nl_brace_brace = ignore # Add or remove newline between 'do' and '{' -nl_do_brace = remove # ignore/add/remove/force +nl_do_brace = remove # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # Add or remove newline between 'switch' and '{' -nl_switch_brace = remove # ignore/add/remove/force +nl_switch_brace = remove # Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc. # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace. -nl_multi_line_cond = true # false/true +nl_multi_line_cond = true # Force a newline in a define after the macro name for multi-line defines. -nl_multi_line_define = false # false/true +nl_multi_line_define = false # Whether to put a newline before 'case' statement -nl_before_case = false # false/true +nl_before_case = false # Add or remove newline between ')' and 'throw' -nl_before_throw = ignore # ignore/add/remove/force +nl_before_throw = ignore # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # Newline between namespace and { -nl_namespace_brace = remove # ignore/add/remove/force +nl_namespace_brace = remove # Add or remove newline between 'template<>' and whatever follows. -nl_template_class = force # ignore/add/remove/force +nl_template_class = force # Add or remove newline between 'class' and '{' -nl_class_brace = remove # ignore/add/remove/force +nl_class_brace = remove # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = add # ignore/add/remove/force +nl_class_init_args = add # Add or remove newline between return type and function name in a function definition -nl_func_type_name = remove # ignore/add/remove/force +nl_func_type_name = remove # Add or remove newline between return type and function name inside a class {} # Uses nl_func_type_name or nl_func_proto_type_name if set to ignore. -nl_func_type_name_class = remove # ignore/add/remove/force +nl_func_type_name_class = remove # Add or remove newline between function scope and name in a definition # Controls the newline after '::' in 'void A::f() { }' -nl_func_scope_name = remove # ignore/add/remove/force +nl_func_scope_name = remove # Add or remove newline between return type and function name in a prototype -nl_func_proto_type_name = remove # ignore/add/remove/force +nl_func_proto_type_name = remove # Add or remove newline between a function name and the opening '(' -nl_func_paren = remove # ignore/add/remove/force +nl_func_paren = remove # Add or remove newline between a function name and the opening '(' in the definition -nl_func_def_paren = remove # ignore/add/remove/force +nl_func_def_paren = remove # Add or remove newline after '(' in a function declaration -nl_func_decl_start = add # ignore/add/remove/force +nl_func_decl_start = add # Add or remove newline after '(' in a function definition -nl_func_def_start = add # ignore/add/remove/force +nl_func_def_start = add # Overrides nl_func_decl_start when there is only one parameter. -nl_func_decl_start_single = remove # ignore/add/remove/force +nl_func_decl_start_single = remove # Overrides nl_func_def_start when there is only one parameter. -nl_func_def_start_single = remove # ignore/add/remove/force +nl_func_def_start_single = remove # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = add # ignore/add/remove/force +nl_func_decl_args = add # Add or remove newline after each ',' in a function definition -nl_func_def_args = add # ignore/add/remove/force +nl_func_def_args = add # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = remove # ignore/add/remove/force +nl_func_decl_end = remove # Add or remove newline before the ')' in a function definition -nl_func_def_end = remove # ignore/add/remove/force +nl_func_def_end = remove # Overrides nl_func_decl_end when there is only one parameter. -nl_func_decl_end_single = remove # ignore/add/remove/force +nl_func_decl_end_single = remove # Overrides nl_func_def_end when there is only one parameter. -nl_func_def_end_single = remove # ignore/add/remove/force +nl_func_def_end_single = remove # Add or remove newline between '()' in a function declaration. -nl_func_decl_empty = remove # ignore/add/remove/force +nl_func_decl_empty = remove # Add or remove newline between '()' in a function definition. -nl_func_def_empty = remove # ignore/add/remove/force +nl_func_def_empty = remove # Add or remove newline between function signature and '{' -nl_fdef_brace = remove # ignore/add/remove/force +nl_fdef_brace = remove # Whether to put a newline after 'return' statement -nl_after_return = false # false/true +nl_after_return = false # Add or remove a newline between the return keyword and return expression. -nl_return_expr = ignore # ignore/add/remove/force +nl_return_expr = ignore # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # Whether to put a newline after brace open. # This also adds a newline before the matching brace close. -nl_after_brace_open = false # false/true +nl_after_brace_open = false # If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is # placed between the open brace and a trailing single-line comment. -nl_after_brace_open_cmt = false # false/true +nl_after_brace_open_cmt = false # Whether to put a newline after a virtual brace open with a non-empty body. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open = true # false/true +nl_after_vbrace_open = true # Whether to put a newline after a virtual brace open with an empty body. # These occur in un-braced if/while/do/for statement bodies. -nl_after_vbrace_open_empty = true # false/true +nl_after_vbrace_open_empty = true # Whether to put a newline after a brace close. # Does not apply if followed by a necessary ';'. -nl_after_brace_close = true # false/true +nl_after_brace_close = true # Whether to put a newline after a virtual brace close. # Would add a newline before return in: 'if (foo) a++; return;' -nl_after_vbrace_close = true # false/true +nl_after_vbrace_close = true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = false # false/true +nl_squeeze_ifdef = false # Add or remove blank line before 'if' -nl_before_if = ignore # ignore/add/remove/force +nl_before_if = ignore # Add or remove blank line after 'if' statement -nl_after_if = ignore # ignore/add/remove/force +nl_after_if = ignore # Add or remove blank line before 'for' -nl_before_for = ignore # ignore/add/remove/force +nl_before_for = ignore # Add or remove blank line after 'for' statement -nl_after_for = ignore # ignore/add/remove/force +nl_after_for = ignore # Add or remove blank line before 'while' -nl_before_while = ignore # ignore/add/remove/force +nl_before_while = ignore # Add or remove blank line after 'while' statement -nl_after_while = ignore # ignore/add/remove/force +nl_after_while = ignore # Add or remove blank line before 'switch' -nl_before_switch = ignore # ignore/add/remove/force +nl_before_switch = ignore # Add or remove blank line after 'switch' statement -nl_after_switch = ignore # ignore/add/remove/force +nl_after_switch = ignore # Add or remove blank line before 'do' -nl_before_do = ignore # ignore/add/remove/force +nl_before_do = ignore # Add or remove blank line after 'do/while' statement -nl_after_do = ignore # ignore/add/remove/force +nl_after_do = ignore # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # Whether to double-space before the close brace of a struct/union/enum # (lower priority than 'eat_blanks_before_close_brace') -nl_ds_struct_enum_close_brace = false # false/true +nl_ds_struct_enum_close_brace = false # Add or remove a newline around a class colon. # Related to pos_class_colon, nl_class_init_args, and pos_comma. -nl_class_colon = ignore # ignore/add/remove/force +nl_class_colon = ignore # Change simple unbraced if statements into a one-liner # 'if(b)\n i++;' => 'if(b) i++;' -nl_create_if_one_liner = false # false/true +nl_create_if_one_liner = false # Change simple unbraced for statements into a one-liner # 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' -nl_create_for_one_liner = false # false/true +nl_create_for_one_liner = false # Change simple unbraced while statements into a one-liner # 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' -nl_create_while_one_liner = false # false/true +nl_create_while_one_liner = false # # Positioning options # # The position of arithmetic operators in wrapped expressions -pos_arith = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_arith = ignore # The position of assignment in wrapped expressions. # Do not affect '=' followed by '{' -pos_assign = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_assign = trail # The position of boolean operators in wrapped expressions -pos_bool = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_bool = trail # The position of comparison operators in wrapped expressions -pos_compare = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_compare = ignore # The position of conditional (b ? t : f) operators in wrapped expressions -pos_conditional = trail # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_conditional = trail # The position of the comma in wrapped expressions -pos_comma = ignore # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_comma = ignore # The position of the comma in the constructor initialization list -pos_class_comma = trail_force # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_comma = trail_force # The position of colons between constructor and member initialization -pos_class_colon = lead # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_class_colon = lead # # Line Splitting options # # Try to limit code width to N number of columns -code_width = 120 # number +code_width = 120 # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = true # false/true +ls_for_split_full = true # Whether to fully split long function protos/calls at commas -ls_func_split_full = true # false/true +ls_func_split_full = true # # Blank line options # # The maximum consecutive newlines -nl_max = 3 # number +nl_max = 3 # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 2 # number +nl_after_func_proto = 2 # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 2 # number +nl_after_func_body_one_liner = 2 # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 0 # number +nl_before_block_comment = 0 # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 0 # number +nl_before_c_comment = 0 # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 0 # number +nl_before_cpp_comment = 0 # Whether to force a newline after a multi-line comment. -nl_after_multiline_comment = false # false/true +nl_after_multiline_comment = false # The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # Will not change the newline count if after a brace open. # 0 = No change. -nl_before_access_spec = 2 # number +nl_before_access_spec = 2 # The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label. # 0 = No change. -nl_after_access_spec = 1 # number +nl_after_access_spec = 1 # The number of newlines between a function def and the function comment. # 0 = No change. -nl_comment_func_def = 0 # number +nl_comment_func_def = 0 # The number of newlines after a try-catch-finally block that isn't followed by a brace close. # 0 = No change. -nl_after_try_catch_finally = 2 # number +nl_after_try_catch_finally = 2 # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = ignore # ignore/add/remove/force +mod_full_brace_do = ignore # Add or remove braces on single-line 'for' statement -mod_full_brace_for = ignore # ignore/add/remove/force +mod_full_brace_for = ignore # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. -mod_full_brace_if = ignore # ignore/add/remove/force +mod_full_brace_if = ignore # Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if. # If any must be braced, they are all braced. If all can be unbraced, then the braces are removed. -mod_full_brace_if_chain = true # false/true +mod_full_brace_if_chain = true # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # Add or remove braces on single-line 'while' statement -mod_full_brace_while = ignore # ignore/add/remove/force +mod_full_brace_while = ignore # Add or remove braces on single-line 'using ()' statement -mod_full_brace_using = ignore # ignore/add/remove/force +mod_full_brace_using = ignore # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = ignore # ignore/add/remove/force +mod_paren_on_return = ignore # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = false # false/true +mod_full_paren_if_bool = false # Whether to remove superfluous semicolons -mod_remove_extra_semicolon = true # false/true +mod_remove_extra_semicolon = true # If a function body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_function_closebrace_comment = 0 # number +mod_add_long_function_closebrace_comment = 0 # If a switch body exceeds the specified number of newlines and doesn't have a comment after # the close brace, a comment will be added. -mod_add_long_switch_closebrace_comment = 0 # number +mod_add_long_switch_closebrace_comment = 0 # If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after # the #endif, a comment will be added. -mod_add_long_ifdef_endif_comment = 0 # number +mod_add_long_ifdef_endif_comment = 0 # If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after # the #else, a comment will be added. -mod_add_long_ifdef_else_comment = 0 # number +mod_add_long_ifdef_else_comment = 0 # If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] # This is generally a bad idea, as it may break your code. -mod_sort_include = true # false/true +mod_sort_include = true # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = false # false/true +mod_move_case_break = false # Will add or remove the braces around a fully braced case statement. # Will only remove the braces if there are no variable declarations in the block. -mod_case_brace = remove # ignore/add/remove/force +mod_case_brace = remove # If TRUE, it will remove a void 'return;' that appears as the last statement in a function. -mod_remove_empty_return = true # false/true +mod_remove_empty_return = true # # Comment modifications # # Try to wrap comments at cmt_width columns -cmt_width = 0 # number +cmt_width = 0 # Set the comment reflow mode (default: 0) # 0: no reflowing (apart from the line wrapping due to cmt_width) # 1: no touching at all # 2: full reflow -cmt_reflow_mode = 0 # number +cmt_reflow_mode = 0 # If false, disable all multi-line comment changes, including cmt_width. keyword substitution, and leading chars. # Default is true. -cmt_indent_multi = true # false/true +cmt_indent_multi = true # Whether to group c-comments that look like they are in a block -cmt_c_group = false # false/true +cmt_c_group = false # Whether to put an empty '/*' on the first line of the combined c-comment -cmt_c_nl_start = false # false/true +cmt_c_nl_start = false # Whether to put a newline before the closing '*/' of the combined c-comment -cmt_c_nl_end = false # false/true +cmt_c_nl_end = false # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of # the comment are the same length. Default=True -cmt_multi_check_last = true # false/true +cmt_multi_check_last = true # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_header = "" # string +cmt_insert_file_header = "" # The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment. # Will substitute $(filename) with the current file's name. -cmt_insert_file_footer = "" # string +cmt_insert_file_footer = "" # The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment. # Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } -cmt_insert_func_header = "" # string +cmt_insert_func_header = "" # The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment. # Will substitute $(class) with the class name. -cmt_insert_class_header = "" # string +cmt_insert_class_header = "" # If a preprocessor is encountered when stepping backwards from a function name, then # this option decides whether the comment should be inserted. # Affects cmt_insert_oc_msg_header, cmt_insert_func_header and cmt_insert_class_header. -cmt_insert_before_preproc = false # false/true +cmt_insert_before_preproc = false # # Preprocessor options # # Control indent of preprocessors inside #if blocks at brace level 0 -pp_indent = remove # ignore/add/remove/force +pp_indent = remove # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) -pp_indent_at_level = false # false/true +pp_indent_at_level = false # If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1. -pp_indent_count = 1 # number +pp_indent_count = 1 # Add or remove space after # based on pp_level of #if blocks -pp_space = ignore # ignore/add/remove/force +pp_space = ignore # Sets the number of spaces added with pp_space -pp_space_count = 0 # number +pp_space_count = 0 # The indent for #region and #endregion in C# and '#pragma region' in C/C++ -pp_indent_region = 0 # number +pp_indent_region = 0 # Whether to indent the code between #region and #endregion -pp_region_indent_code = false # false/true +pp_region_indent_code = false # If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level -pp_indent_if = 0 # number +pp_indent_if = 0 # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = false # false/true +pp_if_indent_code = false # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = false # false/true +pp_define_at_level = false # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/sp_block_as_argument.cfg b/tests/config/sp_block_as_argument.cfg index 39535423c4..ca901f5fe7 100644 --- a/tests/config/sp_block_as_argument.cfg +++ b/tests/config/sp_block_as_argument.cfg @@ -1,6 +1,6 @@ include "obj-c.cfg" -output_tab_size = 4 # new tab size +output_tab_size = 4 indent_columns = output_tab_size sp_before_oc_block_caret = remove diff --git a/tests/config/sp_block_as_argument5.cfg b/tests/config/sp_block_as_argument5.cfg index 34d25895b3..5b6090d128 100644 --- a/tests/config/sp_block_as_argument5.cfg +++ b/tests/config/sp_block_as_argument5.cfg @@ -6,7 +6,7 @@ indent_oc_block_msg_from_colon = false indent_oc_block_msg_from_brace = false indent_oc_block_msg_from_caret = false -indent_oc_msg_colon = 1 # the span for aligning ObjC msg spec (0=don't align) +indent_oc_msg_colon = 1 #align_oc_msg_colon_first = true -align_oc_msg_spec_span = 20 # the span for aligning ObjC msg spec (0=don't align) +align_oc_msg_spec_span = 20 indent_oc_block_msg_xcode_style = true diff --git a/tests/config/wessex.cfg b/tests/config/wessex.cfg index e01a8302a8..7ea1c95724 100644 --- a/tests/config/wessex.cfg +++ b/tests/config/wessex.cfg @@ -4,19 +4,19 @@ # # The type of line endings -newlines = auto # auto/lf/crlf/cr +newlines = auto # The original size of tabs in the input -input_tab_size = 4 # number +input_tab_size = 4 # The size of tabs in the output (only used if align_with_tabs=true) -output_tab_size = 4 # number +output_tab_size = 4 # The ascii value of the string escape char, usually 92 (\) or 94 (^). (Pawn) -string_escape_char = 92 # number +string_escape_char = 92 # Alternate string escape char for Pawn. Only works right before the quote char. -string_escape_char2 = 0 # number +string_escape_char2 = 0 # # Indenting @@ -24,641 +24,641 @@ string_escape_char2 = 0 # number # The number of columns to indent per level. # Usually 2, 3, 4, or 8. -indent_columns = 4 # number +indent_columns = 4 # How to use tabs when indenting code # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number +indent_with_tabs = 0 # Whether to indent strings broken by '\' so that they line up -indent_align_string = true # false/true +indent_align_string = true # The number of spaces to indent multi-line XML strings. # Requires indent_align_string=True -indent_xml_string = 4 # number +indent_xml_string = 4 # Spaces to indent '{' from level -indent_brace = 0 # number +indent_brace = 0 # Whether braces are indented to the body level -indent_braces = false # false/true +indent_braces = false # Disabled indenting function braces if indent_braces is true -indent_braces_no_func = false # false/true +indent_braces_no_func = false # Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. -indent_brace_parent = false # false/true +indent_brace_parent = false # Whether the 'namespace' body is indented -indent_namespace = true # false/true +indent_namespace = true # Whether the 'class' body is indented -indent_class = true # false/true +indent_class = true # Whether to indent the stuff after a leading class colon -indent_class_colon = true # false/true +indent_class_colon = true # Whether to indent continued function call parameters one indent level (true) or aligns instead of indent (false) -indent_func_call_param = false # false/true +indent_func_call_param = false # The number of spaces to indent a continued '->' or '.' # Usually set to 0, 1, or indent_columns. -indent_member = 0 # number +indent_member = 0 # Spaces to indent single line ('//') comments on lines before code -indent_sing_line_comments = 0 # number +indent_sing_line_comments = 0 # Spaces to indent 'case' from 'switch' # Usually 0 or indent_columns. -indent_switch_case = 4 # number +indent_switch_case = 4 # Spaces to shift the 'case' line, without affecting any other lines # Usually 0. -indent_case_shift = 0 # number +indent_case_shift = 0 # Spaces to indent '{' from 'case'. # By default, the brace will appear under the 'c' in case. # Usually set to 0 or indent_columns. -indent_case_brace = 0 # number +indent_case_brace = 0 # Whether to indent comments found in first column -indent_col1_comment = false # false/true +indent_col1_comment = false # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 1 # Same as indent_label, but for access specifiers that are followed by a colon -indent_access_spec = 1 # number +indent_access_spec = 1 # If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) -indent_paren_nl = false # false/true +indent_paren_nl = false # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) -indent_square_nl = false # false/true +indent_square_nl = false # # Spacing options # # Add or remove space around arithmetic operator '+', '-', '/', '*', etc -sp_arith = force # ignore/add/remove/force +sp_arith = force # Add or remove space around assignment operator '=', '+=', etc -sp_assign = force # ignore/add/remove/force +sp_assign = force # Add or remove space around boolean operators '&&' and '||' -sp_bool = force # ignore/add/remove/force +sp_bool = force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = force # ignore/add/remove/force +sp_compare = force # Add or remove space inside '(' and ')' -sp_inside_paren = remove # ignore/add/remove/force +sp_inside_paren = remove # Add or remove space between nested parens -sp_paren_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # Whether to balance spaces inside nested parens -sp_balance_nested_parens = false # false/true +sp_balance_nested_parens = false # Add or remove space between ')' and '{' -sp_paren_brace = force # ignore/add/remove/force +sp_paren_brace = force # Add or remove space before pointer star '*' -sp_before_ptr_star = force # ignore/add/remove/force +sp_before_ptr_star = force # Add or remove space between pointer stars '*' -sp_between_ptr_star = remove # ignore/add/remove/force +sp_between_ptr_star = remove # Add or remove space after pointer star '*' -sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star = remove # Add or remove space before reference sign '&' -sp_before_byref = force # ignore/add/remove/force +sp_before_byref = force # Add or remove space after reference sign '&' -sp_after_byref = remove # ignore/add/remove/force +sp_after_byref = remove # Add or remove space before '<>' -sp_before_angle = remove # ignore/add/remove/force +sp_before_angle = remove # Add or remove space after '<>' -sp_after_angle = force # ignore/add/remove/force +sp_after_angle = force # Add or remove space between '<>' and '(' as found in 'new List();' -sp_angle_paren = remove # ignore/add/remove/force +sp_angle_paren = remove sp_angle_paren_empty = remove # Add or remove space between '<>' and a word as in 'List m;' -sp_angle_word = force # ignore/add/remove/force +sp_angle_word = force # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = force # ignore/add/remove/force +sp_before_sparen = force # Add or remove space inside if-condition '(' and ')' -sp_inside_sparen = remove # ignore/add/remove/force +sp_inside_sparen = remove # Add or remove space after ')' of 'if', 'for', 'switch', and 'while' -sp_after_sparen = force # ignore/add/remove/force +sp_after_sparen = force # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' -sp_sparen_brace = force # ignore/add/remove/force +sp_sparen_brace = force # Add or remove space before empty statement ';' on 'if', 'for' and 'while' -sp_special_semi = remove # ignore/add/remove/force +sp_special_semi = remove # Add or remove space before ';' -sp_before_semi = remove # ignore/add/remove/force +sp_before_semi = remove # Add or remove space before ';' in non-empty 'for' statements -sp_before_semi_for = remove # ignore/add/remove/force +sp_before_semi_for = remove # Add or remove space before a semicolon of an empty part of a for statment. -sp_before_semi_for_empty = remove # ignore/add/remove/force +sp_before_semi_for_empty = remove # Add or remove space before '[' (except '[]') -sp_before_square = remove # ignore/add/remove/force +sp_before_square = remove # Add or remove space before '[]' -sp_before_squares = ignore # ignore/add/remove/force +sp_before_squares = ignore # Add or remove space inside '[' and ']' -sp_inside_square = remove # ignore/add/remove/force +sp_inside_square = remove # Add or remove space after ',' -sp_after_comma = force # ignore/add/remove/force +sp_after_comma = force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = remove # Add or remove space between 'operator' and operator sign -sp_after_operator = force # ignore/add/remove/force +sp_after_operator = force # Add or remove space after cast -sp_after_cast = remove # ignore/add/remove/force +sp_after_cast = remove # Add or remove spaces inside cast parens -sp_inside_paren_cast = remove # ignore/add/remove/force +sp_inside_paren_cast = remove # Add or remove space between 'sizeof' and '(' -sp_sizeof_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # Add or remove space after the tag keyword (Pawn) -sp_after_tag = remove # ignore/add/remove/force +sp_after_tag = remove # Add or remove space inside enum '{' and '}' -sp_inside_braces_enum = remove # ignore/add/remove/force +sp_inside_braces_enum = remove # Add or remove space inside struct/union '{' and '}' -sp_inside_braces_struct = remove # ignore/add/remove/force +sp_inside_braces_struct = remove # Add or remove space inside '{' and '}' -sp_inside_braces = remove # ignore/add/remove/force +sp_inside_braces = remove # Add or remove space inside '<' and '>' -sp_inside_angle = remove # ignore/add/remove/force +sp_inside_angle = remove # Add or remove space between return type and function name # A minimum of 1 is forced except for pointer return types. -sp_type_func = force # ignore/add/remove/force +sp_type_func = force # Add or remove space between function name and '(' on function declaration -sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_proto_paren = remove # Add or remove space between function name and '(' on function definition -sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # Add or remove space inside empty function '()' -sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparens = remove # Add or remove space inside function '(' and ')' -sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_fparen = remove # Add or remove space between ']' and '(' when part of a function call. -sp_square_fparen = remove # ignore/add/remove/force +sp_square_fparen = remove # Add or remove space between ')' and '{' of function -sp_fparen_brace = force # ignore/add/remove/force +sp_fparen_brace = force # Add or remove space between function name and '(' on function calls -sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren = remove # Add or remove space between a constructor/destructor and the open paren -sp_func_class_paren = remove # ignore/add/remove/force +sp_func_class_paren = remove # Add or remove space between 'return' and '(' -sp_return_paren = force # ignore/add/remove/force +sp_return_paren = force # Add or remove space between macro and value -sp_macro = ignore # ignore/add/remove/force +sp_macro = ignore # Add or remove space between macro function ')' and value -sp_macro_func = ignore # ignore/add/remove/force +sp_macro_func = ignore # Add or remove space between 'else' and '{' if on the same line -sp_else_brace = ignore # ignore/add/remove/force +sp_else_brace = ignore # Add or remove space between '}' and 'else' if on the same line -sp_brace_else = ignore # ignore/add/remove/force +sp_brace_else = ignore # Add or remove space between 'catch' and '{' if on the same line -sp_catch_brace = ignore # ignore/add/remove/force +sp_catch_brace = ignore # Add or remove space between '}' and 'catch' if on the same line -sp_brace_catch = ignore # ignore/add/remove/force +sp_brace_catch = ignore # Add or remove space between 'finally' and '{' if on the same line -sp_finally_brace = ignore # ignore/add/remove/force +sp_finally_brace = ignore # Add or remove space between '}' and 'finally' if on the same line -sp_brace_finally = ignore # ignore/add/remove/force +sp_brace_finally = ignore # Add or remove space between 'try' and '{' if on the same line -sp_try_brace = ignore # ignore/add/remove/force +sp_try_brace = ignore # Add or remove space between get/set and '{' if on the same line -sp_getset_brace = ignore # ignore/add/remove/force +sp_getset_brace = ignore # # Code alignment (not left column spaces/tabs) # # Whether to keep non-indenting tabs -align_keep_tabs = false # false/true +align_keep_tabs = false # Whether to use tabs for alinging -align_with_tabs = false # false/true +align_with_tabs = false # Whether to bump out to the next tab when aligning -align_on_tabstop = false # false/true +align_on_tabstop = false # Whether to right-align numbers -align_number_right = true # false/true +align_number_right = true # Align variable definitions in prototypes and functions -align_func_params = true # false/true +align_func_params = true # The span for aligning variable definitions (0=don't align) -align_var_def_span = 4 # number +align_var_def_span = 4 # How to align the star in variable definitions. # 0=Part of the type # 1=Part of the variable # 2=Dangling -align_var_def_star_style = 1 # number +align_var_def_star_style = 1 # The threshold for aligning variable definitions (0=no limit) -align_var_def_thresh = 4 # number +align_var_def_thresh = 4 # Whether to align the colon in struct bit fields -align_var_def_colon = true # false/true +align_var_def_colon = true # Whether to align inline struct/enum/union variable definitions -align_var_def_inline = true # false/true +align_var_def_inline = true # The span for aligning on '=' in assignments (0=don't align) -align_assign_span = 4 # number +align_assign_span = 4 # The threshold for aligning on '=' in assignments (0=no limit) -align_assign_thresh = 4 # number +align_assign_thresh = 4 # The span for aligning on '=' in enums (0=don't align) -align_enum_equ_span = 4 # number +align_enum_equ_span = 4 # The threshold for aligning on '=' in enums (0=no limit) -align_enum_equ_thresh = 4 # number +align_enum_equ_thresh = 4 # The span for aligning struct/union (0=don't align) -align_var_struct_span = 4 # number +align_var_struct_span = 4 # The span for aligning struct initializer values (0=don't align) -align_struct_init_span = 4 # number +align_struct_init_span = 4 # The minimum space between the type and the synonym of a typedef -align_typedef_gap = 0 # number +align_typedef_gap = 0 # The span for aligning single-line typedefs (0=don't align) -align_typedef_span = 4 # number +align_typedef_span = 4 # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typdef type, ignore '*' # 1: The '*' is part of type name: typedef int *pint; # 2: The '*' is part of the type, but dangling: typedef int *pint; -align_typedef_star_style = 1 # number +align_typedef_star_style = 1 # The span for aligning comments that end lines (0=don't align) -align_right_cmt_span = 4 # number +align_right_cmt_span = 4 # The span for aligning function prototypes (0=don't align) -align_func_proto_span = 4 # number +align_func_proto_span = 4 # Whether to align macros wrapped with a backslash and a newline -align_nl_cont = true # false/true +align_nl_cont = true # The minimum space between label and value of a preprocessor define -align_pp_define_gap = 0 # number +align_pp_define_gap = 0 # The span for aligning on '#define' bodies (0=don't align) -align_pp_define_span = 4 # number +align_pp_define_span = 4 # # Newline adding and removing options # # Try to limit code width to N number of columns -code_width = 120 # number +code_width = 120 # Whether to collapse empty blocks between '{' and '}' -nl_collapse_empty_body = false # false/true +nl_collapse_empty_body = false # Don't touch one-line braced assignments - 'foo_t f = { 1, 2 };' -nl_assign_leave_one_liners = false # false/true +nl_assign_leave_one_liners = false # Don't touch one-line function bodies inside a class xx { } body -nl_class_leave_one_liners = false # false/true +nl_class_leave_one_liners = false # Add or remove newlines at the start of the file -nl_start_of_file = ignore # ignore/add/remove/force +nl_start_of_file = ignore # The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' -nl_start_of_file_min = 0 # number +nl_start_of_file_min = 0 # Add or remove newline at the end of the file -nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file = force # The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') -nl_end_of_file_min = 1 # number +nl_end_of_file_min = 1 # Add or remove newline between '=' and '{' -nl_assign_brace = force # ignore/add/remove/force +nl_assign_brace = force # The number of newlines after a block of variable definitions -nl_func_var_def_blk = 1 # number +nl_func_var_def_blk = 1 # Add or remove newline between function call and '(' -nl_fcall_brace = remove # ignore/add/remove/force +nl_fcall_brace = remove # Add or remove newline between 'enum' and '{' -nl_enum_brace = force # ignore/add/remove/force +nl_enum_brace = force # Add or remove newline between 'struct and '{' -nl_struct_brace = force # ignore/add/remove/force +nl_struct_brace = force # Add or remove newline between 'union' and '{' -nl_union_brace = force # ignore/add/remove/force +nl_union_brace = force # Add or remove newline between 'if' and '{' -nl_if_brace = force # ignore/add/remove/force +nl_if_brace = force # Add or remove newline between '}' and 'else' -nl_brace_else = force # ignore/add/remove/force +nl_brace_else = force # Add or remove newline between 'else if' and '{' # If set to ignore, nl_if_brace is used instead -nl_elseif_brace = force # ignore/add/remove/force +nl_elseif_brace = force # Add or remove newline between 'else' and '{' -nl_else_brace = force # ignore/add/remove/force +nl_else_brace = force # Add or remove newline between '}' and 'finally' -nl_brace_finally = ignore # ignore/add/remove/force +nl_brace_finally = ignore # Add or remove newline between 'finally' and '{' -nl_finally_brace = ignore # ignore/add/remove/force +nl_finally_brace = ignore # Add or remove newline between 'try' and '{' -nl_try_brace = force # ignore/add/remove/force +nl_try_brace = force # Add or remove newline between get/set and '{' -nl_getset_brace = ignore # ignore/add/remove/force +nl_getset_brace = ignore # Add or remove newline between 'for' and '{' -nl_for_brace = force # ignore/add/remove/force +nl_for_brace = force # Add or remove newline between 'catch' and '{' -nl_catch_brace = force # ignore/add/remove/force +nl_catch_brace = force # Add or remove newline between '}' and 'catch' -nl_brace_catch = force # ignore/add/remove/force +nl_brace_catch = force # Add or remove newline between 'while' and '{' -nl_while_brace = force # ignore/add/remove/force +nl_while_brace = force # Add or remove newline between 'do' and '{' -nl_do_brace = force # ignore/add/remove/force +nl_do_brace = force # Add or remove newline between '}' and 'while' of 'do' statement -nl_brace_while = remove # ignore/add/remove/force +nl_brace_while = remove # Add or remove newline between 'switch' and '{' -nl_switch_brace = force # ignore/add/remove/force +nl_switch_brace = force # Whether to put a newline before 'case' statement -nl_before_case = true # false/true +nl_before_case = true # Whether to put a newline after 'case' statement -nl_after_case = true # false/true +nl_after_case = true # Newline between namespace and { -nl_namespace_brace = force # ignore/add/remove/force +nl_namespace_brace = force # Add or remove newline between 'template<>' and 'class' -nl_template_class = force # ignore/add/remove/force +nl_template_class = force # Add or remove newline between 'class' and '{' -nl_class_brace = force # ignore/add/remove/force +nl_class_brace = force # Add or remove newline after each ',' in the constructor member initialization -nl_class_init_args = force # ignore/add/remove/force +nl_class_init_args = force # Add or remove newline between return type and function name in definition -nl_func_type_name = remove # ignore/add/remove/force +nl_func_type_name = remove # Add or remove newline after '(' in a function declaration -nl_func_decl_start = remove # ignore/add/remove/force +nl_func_decl_start = remove # Add or remove newline after each ',' in a function declaration -nl_func_decl_args = force # ignore/add/remove/force +nl_func_decl_args = force # Add or remove newline before the ')' in a function declaration -nl_func_decl_end = remove # ignore/add/remove/force +nl_func_decl_end = remove # Add or remove newline between function signature and '{' -nl_fdef_brace = force # ignore/add/remove/force +nl_fdef_brace = force # Whether to put a newline after 'return' statement -nl_after_return = false # false/true +nl_after_return = false # Whether to put a newline after semicolons, except in 'for' statements -nl_after_semicolon = true # false/true +nl_after_semicolon = true # Whether to put a newline after brace open -nl_after_brace_open = true # false/true +nl_after_brace_open = true # Whether to alter newlines in '#define' macros -nl_define_macro = false # false/true +nl_define_macro = false # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' -nl_squeeze_ifdef = true # false/true +nl_squeeze_ifdef = true # Add or remove newline before 'if' -nl_before_if = force # ignore/add/remove/force +nl_before_if = force # Add or remove newline after 'if' -nl_after_if = remove # ignore/add/remove/force +nl_after_if = remove # Add or remove newline before 'for' -nl_before_for = force # ignore/add/remove/force +nl_before_for = force # Add or remove newline after 'for' -nl_after_for = remove # ignore/add/remove/force +nl_after_for = remove # Add or remove newline before 'while' -nl_before_while = force # ignore/add/remove/force +nl_before_while = force # Add or remove newline after 'while' -nl_after_while = remove # ignore/add/remove/force +nl_after_while = remove # Add or remove newline before 'switch' -nl_before_switch = force # ignore/add/remove/force +nl_before_switch = force # Add or remove newline after 'switch' -nl_after_switch = remove # ignore/add/remove/force +nl_after_switch = remove # Add or remove newline before 'do' -nl_before_do = force # ignore/add/remove/force +nl_before_do = force # Add or remove newline after 'do' -nl_after_do = remove # ignore/add/remove/force +nl_after_do = remove # Whether to double-space commented-entries in struct/enum -nl_ds_struct_enum_cmt = false # false/true +nl_ds_struct_enum_cmt = false # # Positioning options # # The position of boolean operators in wrapped expressions -pos_bool = trail # ignore/lead/trail +pos_bool = trail # The position of the comma in wrapped expressions -pos_comma = trail # ignore/lead/trail +pos_comma = trail # The position of colons between constructor and member initialization -pos_class_colon = lead # ignore/lead/trail +pos_class_colon = lead # Whether to fully split long 'for' statements at semi-colons -ls_for_split_full = true # false/true +ls_for_split_full = true # Whether to fully split long function protos/calls at commas -ls_func_split_full = true # false/true +ls_func_split_full = true # # Blank line options # # The maximum consecutive newlines -nl_max = 2 # number +nl_max = 2 # The number of newlines after a function prototype, if followed by another function prototype -nl_after_func_proto = 1 # number +nl_after_func_proto = 1 # The number of newlines after a function prototype, if not followed by another function prototype -nl_after_func_proto_group = 2 # number +nl_after_func_proto_group = 2 # The number of newlines after '}' of a multi-line function body -nl_after_func_body = 2 # number +nl_after_func_body = 2 # The number of newlines after '}' of a single line function body -nl_after_func_body_one_liner = 2 # number +nl_after_func_body_one_liner = 2 # The minimum number of newlines before a multi-line comment. # Doesn't apply if after a brace open or another multi-line comment. -nl_before_block_comment = 2 # number +nl_before_block_comment = 2 # The minimum number of newlines before a single-line C comment. # Doesn't apply if after a brace open or other single-line C comments. -nl_before_c_comment = 2 # number +nl_before_c_comment = 2 # The minimum number of newlines before a CPP comment. # Doesn't apply if after a brace open or other CPP comments. -nl_before_cpp_comment = 2 # number +nl_before_cpp_comment = 2 # Whether to remove blank lines after '{' -eat_blanks_after_open_brace = true # false/true +eat_blanks_after_open_brace = true # Whether to remove blank lines before '}' -eat_blanks_before_close_brace = true # false/true +eat_blanks_before_close_brace = true # # Code modifying options (non-whitespace) # # Add or remove braces on single-line 'do' statement -mod_full_brace_do = add # ignore/add/remove/force +mod_full_brace_do = add # Add or remove braces on single-line 'for' statement -mod_full_brace_for = add # ignore/add/remove/force +mod_full_brace_for = add # Add or remove braces on single-line function defintions. (Pawn) -mod_full_brace_function = add # ignore/add/remove/force +mod_full_brace_function = add # Add or remove braces on single-line 'if' statement -mod_full_brace_if = add # ignore/add/remove/force +mod_full_brace_if = add # Don't remove braces around statements that span N newlines -mod_full_brace_nl = 0 # number +mod_full_brace_nl = 0 # Add or remove braces on single-line 'while' statement -mod_full_brace_while = add # ignore/add/remove/force +mod_full_brace_while = add # Add or remove unnecessary paren on 'return' statement -mod_paren_on_return = remove # ignore/add/remove/force +mod_paren_on_return = remove # Whether to change optional semicolons to real semicolons -mod_pawn_semicolon = false # false/true +mod_pawn_semicolon = false # Add parens on 'while' and 'if' statement around bools -mod_full_paren_if_bool = true # false/true +mod_full_paren_if_bool = true # # Comment modifications # # Whether to group cpp-comments that look like they are in a block -cmt_cpp_group = false # false/true +cmt_cpp_group = false # Whether to put an empty '/*' on the first line of the combined cpp-comment -cmt_cpp_nl_start = false # false/true +cmt_cpp_nl_start = false # Whether to put a newline before the closing '*/' of the combined cpp-comment -cmt_cpp_nl_end = false # false/true +cmt_cpp_nl_end = false # Whether to change cpp-comments into c-comments -cmt_cpp_to_c = false # false/true +cmt_cpp_to_c = false # Whether to put a star on subsequent comment lines -cmt_star_cont = false # false/true +cmt_star_cont = false # The number of spaces to insert at the start of subsequent comment lines -cmt_sp_before_star_cont = 0 # number +cmt_sp_before_star_cont = 0 # The number of spaces to insert after the star on subsequent comment lines -cmt_sp_after_star_cont = 0 # number +cmt_sp_after_star_cont = 0 # # Preprocessor options # # Add or remove indent of preprocessor directives -pp_indent = remove # ignore/add/remove/force +pp_indent = remove # Add or remove space between # and, say, define -pp_space = remove # ignore/add/remove/force +pp_space = remove # You can force a token to be a type with the 'type' option. # Example: diff --git a/tests/config/xml-str.cfg b/tests/config/xml-str.cfg index 20906f7308..9d693bf0cb 100644 --- a/tests/config/xml-str.cfg +++ b/tests/config/xml-str.cfg @@ -2,53 +2,53 @@ # My favorite format # -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size +indent_with_tabs = 0 +input_tab_size = 8 +output_tab_size = 3 indent_columns = output_tab_size -indent_label = 2 # pos: absolute col, neg: relative column +indent_label = 2 indent_access_spec = 2 -indent_align_string = True # align broken strings -indent_xml_string = 2 # align broken strings +indent_align_string = True +indent_xml_string = 2 indent_brace = 0 indent_member = indent_columns -nl_assign_brace = add # "= {" vs "= \n {" -nl_enum_brace = add # "enum {" vs "enum \n {" -nl_union_brace = add # "union {" vs "union \n {" -nl_struct_brace = add # "struct {" vs "struct \n {" -nl_do_brace = add # "do {" vs "do \n {" -nl_if_brace = add # "if () {" vs "if () \n {" -nl_for_brace = add # "for () {" vs "for () \n {" -nl_else_brace = add # "else {" vs "else \n {" -nl_while_brace = add # "while () {" vs "while () \n {" -nl_switch_brace = add # "switch () {" vs "switch () \n {" +nl_assign_brace = add +nl_enum_brace = add +nl_union_brace = add +nl_struct_brace = add +nl_do_brace = add +nl_if_brace = add +nl_for_brace = add +nl_else_brace = add +nl_while_brace = add +nl_switch_brace = add nl_func_var_def_blk = 1 nl_before_case = 1 -nl_fcall_brace = add # "foo() {" vs "foo()\n{" -nl_fdef_brace = add # "int foo() {" vs "int foo()\n{" +nl_fcall_brace = add +nl_fdef_brace = add nl_after_return = TRUE nl_brace_while = remove nl_brace_else = add nl_squeeze_ifdef = TRUE -mod_paren_on_return = add # "return 1;" vs "return (1);" -mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }" -mod_full_brace_for = add # "for () a--;" vs "for () { a--; }" -mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();" -mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }" +mod_paren_on_return = add +mod_full_brace_if = add +mod_full_brace_for = add +mod_full_brace_do = add +mod_full_brace_while = add sp_before_byref = remove sp_before_semi = remove -sp_paren_paren = remove # space between (( and )) -sp_return_paren = remove # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = force # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = remove # "(int) a" vs "(int)a" -sp_inside_braces = force # "{ 1 }" vs "{1}" -sp_inside_braces_struct = force # "{ 1 }" vs "{1}" -sp_inside_braces_enum = force # "{ 1 }" vs "{1}" +sp_paren_paren = remove +sp_return_paren = remove +sp_sizeof_paren = remove +sp_before_sparen = force +sp_after_sparen = force +sp_after_cast = remove +sp_inside_braces = force +sp_inside_braces_struct = force +sp_inside_braces_enum = force sp_inside_paren = remove sp_inside_fparen = remove sp_inside_sparen = remove @@ -60,15 +60,15 @@ sp_bool = force sp_compare = force sp_assign = force sp_after_comma = force -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +sp_func_def_paren = remove +sp_func_call_paren = remove +sp_func_proto_paren = remove sp_after_ptr_star = remove sp_before_ptr_star = force sp_between_ptr_star = remove -align_with_tabs = FALSE # use tabs to align -align_on_tabstop = FALSE # align on tabstops +align_with_tabs = FALSE +align_on_tabstop = FALSE align_enum_equ_span = 4 align_nl_cont = TRUE align_var_def_span = 2 diff --git a/tests/default_strings.txt b/tests/default_strings.txt new file mode 100644 index 0000000000..4c7bf2fcfb --- /dev/null +++ b/tests/default_strings.txt @@ -0,0 +1,1246 @@ +0 = No change +0 = No change (default) +0: Align on typdef type, ignore '&' +0: Align on typdef type, ignore '*' +0: Align on typedef type, ignore '&' +0: Align on typedef type, ignore '*' +0: Don't mix them at all +0: Indent to body level +0: No change +0: no reflowing (apart from the line wrapping due to cmt_width) +0: indent preprocessors using output_tab_size +0: (Default) off +0=Part of the type +0=Part of the type 'void * foo;' +0=no change (default) +0=spaces only +0=use indent_oc_block rules, 1+=spaces to indent +1: Align under the open paren +1: Remove most newlines not handled by other config +1: The '&' is part of type name: typedef int &pint; +1: The '*' is part of type name: typedef int *pint; +1: When the `if_false` is a continuation, indent it under `if_false` +1: align the open paren with the types +1: no touching at all +1=Part of the variable +1=Part of the variable 'void *foo;' +1=indent with tabs to brace level, align with spaces +1=indent with tabs to brace level, align with spaces (default) +1=indent with tabs, align with spaces +2: Indent to the brace level +2: Remove all newlines and reformat completely by config +2: The '&' is part of the type, but dangling: typedef int &pint; +2: The '*' is part of the type, but dangling: typedef int *pint; +2: The '*' is part of the type: typedef int * pint; +2: When the `:` is a continuation, indent it under `?` +2: align the function type name with the other type names +2: full reflow +2=Dangling +2=Dangling 'void *foo;' +2=indent and align with tabs +2=indent and align with tabs, using spaces when not on a tabstop +Additional indenting for constructor initializer list +Additional indent for constructor initializer list +Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc +Add or remove around the D named array initializer ':' operator +Add or remove a newline around a class colon +Add or remove a newline around a class colon. Related to pos_class_colon, nl_class_init_args, and pos_comma +Add or remove a newline around a class constructor colon +Add or remove a newline before/after a class colon, +Add or remove a newline between a case ':' and '{'. Overrides nl_after_case +Add or remove a newline between the return keyword and return expression +Add or remove between the parens in the function type: 'void (*x)(...)' +Add or remove blank line after 'do/while' statement +Add or remove blank line after 'for' statement +Add or remove blank line after 'func_class_def' statement +Add or remove blank line after 'func_class_proto' statement +Add or remove blank line after 'if' statement +Add or remove blank line after 'switch' statement +Add or remove blank line after 'synchronized' statement +Add or remove blank line after 'while' statement +Add or remove blank line before 'do' +Add or remove blank line before 'for' +Add or remove blank line before 'func_class_def' +Add or remove blank line before 'func_class_proto' +Add or remove blank line before 'if' +Add or remove blank line before 'switch' +Add or remove blank line before 'synchronized' +Add or remove blank line before 'while' +Add or remove braces on single-line function definitions. (Pawn) +Add or remove braces on single-line function defintions. (Pawn) +Add or remove braces on single-line 'do' statement +Add or remove braces on single-line 'for' statement +Add or remove braces on single-line 'if' statement +Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else' +Add or remove braces on single-line 'using ()' statement +Add or remove braces on single-line 'while' statement +Add or remove indent of preprocessor directives +Add or remove newlines at the start of the file +Add or remove newline after each ',' in a function declaration +Add or remove newline after each ',' in a function definition +Add or remove newline after each ',' in the class base list +Add or remove newline after each ',' in the constructor member initialization +Add or remove newline after 'do' +Add or remove newline after 'for' +Add or remove newline after 'if' +Add or remove newline after 'switch' +Add or remove newline after 'while' +Add or remove newline after '(' in a function declaration +Add or remove newline after '(' in a function definition +Add or remove newline after '= [' (D only). Will also affect the newline before the ']' +Add or remove newline at the end of the file +Add or remove newline before closing parenthesis +Add or remove newline before first element, after comma, and after last element in enum +Add or remove newline before the ')' in a function declaration +Add or remove newline before the ')' in a function definition +Add or remove newline before 'do' +Add or remove newline before 'for' +Add or remove newline before 'if' +Add or remove newline before 'if'/'else if' closing parenthesis +Add or remove newline before 'switch' +Add or remove newline before 'while' +Add or remove newline before/after each ',' in the base class list, +Add or remove newline between C# property and the '{' +Add or remove newline between C++11 lambda signature and '{' +Add or remove newline between Objective-C block signature and '{' +Add or remove newline between a function call's ')' and '{', as in: +Add or remove newline between a function name and the opening '(' +Add or remove newline between a function name and the opening '(' in the call +Add or remove newline between a function name and the opening '(' in the declaration +Add or remove newline between a function name and the opening '(' in the definition +Add or remove newline between class specification and '::' in 'void A::f() { }' +Add or remove newline between function call and '(' +Add or remove newline between function scope and name +Add or remove newline between function scope and name in a definition +Add or remove newline between function signature and '{' +Add or remove newline between get/set and '{' +Add or remove newline between return type and function name inside a class {} +Add or remove newline between return type and function name in a function definition +Add or remove newline between return type and function name in a prototype +Add or remove newline between return type and function name in definition +Add or remove newline between two open or close braces +Add or remove newline between 'catch' and '{' +Add or remove newline between 'class' and '{' +Add or remove newline between 'do' and '{' +Add or remove newline between 'else if' and '{' +Add or remove newline between 'else' and 'if' +Add or remove newline between 'else' and '{' +Add or remove newline between 'enum class identifier :' and 'type' and/or 'type' +Add or remove newline between 'enum class' and the identifier +Add or remove newline between 'enum class' type and ':' +Add or remove newline between 'enum' and 'class' +Add or remove newline between 'enum' and '{' +Add or remove newline between 'finally' and '{' +Add or remove newline between 'for' and '{' +Add or remove newline between 'if' and '{' +Add or remove newline between 'scope (x)' and '{' (D) +Add or remove newline between 'struct and '{' +Add or remove newline between 'switch' and '{' +Add or remove newline between 'synchronized' and '{' +Add or remove newline between 'template<>' and whatever follows +Add or remove newline between 'template<>' and 'class' +Add or remove newline between 'try' and '{' +Add or remove newline between 'union' and '{' +Add or remove newline between 'unittest' and '{' (D) +Add or remove newline between 'using' and '{' +Add or remove newline between 'version (x)' and '{' (D) +Add or remove newline between 'while' and '{' +Add or remove newline between '()' in a function call +Add or remove newline between '()' in a function declaration +Add or remove newline between '()' in a function definition +Add or remove newline between ')' and 'throw' +Add or remove newline between '=' and '[' (D only) +Add or remove newline between '=' and '{' +Add or remove newline between '}' and 'catch' +Add or remove newline between '}' and 'else' +Add or remove newline between '}' and 'finally' +Add or remove newline between '}' and 'while' of 'do' statement +Add or remove newline between '}' and ')' in a function invocation +Add or remove newline between '}' and ']' +Add or remove newline when condition spans two or more lines +Add or remove spaces inside cast parens +Add or remove space after C/D cast, ie 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' +Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a' +Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign +Add or remove space after assignment '=' in enum. Overrides sp_enum_assign +Add or remove space after a block pointer caret +Add or remove space after a pointer star '*', if followed by an open paren (function types) +Add or remove space after a pointer star '*', if followed by a func proto/def +Add or remove space after a reference sign '&', if followed by a func proto/def +Add or remove space after cast +Add or remove space after class constructor ':' +Add or remove space after class ':' +Add or remove space after if-condition '('. Overrides sp_inside_sparen +Add or remove space after open brace in an unnamed temporary direct-list-initialization +Add or remove space after pointer star '*' +Add or remove space after pointer star '*', if followed by a func proto/def +Add or remove space after pointer star '*', if followed by a qualifier +Add or remove space after pointer star '*', if followed by a word +Add or remove space after preprocessor '#' stringify operator +Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator +Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator. Default=Add +Add or remove space after preprocessor '#' stringify operator. Default=Add +Add or remove space after reference sign '&' +Add or remove space after reference sign '&', if followed by a word +Add or remove space after the capture specification in C++11 lambda +Add or remove space after the colon in immutable dictionary expression +Add or remove space after the colon in message specs +Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; ) +Add or remove space after the final semicolon of an empty part of a for statment: for ( ; ; ) +Add or remove space after the first (type) in message specs +Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;' +Add or remove space after the tag keyword (Pawn) +Add or remove space after the '~' (invert) operator +Add or remove space after the '~' (invert) operator. Default=Remove +Add or remove space after the '!' (not) operator +Add or remove space after the '!' (not) operator. Default=Remove +Add or remove space after the '&' (address-of) operator +Add or remove space after the '&' (address-of) operator. Default=Remove +Add or remove space after the ')' in 'invariant (C) c' in the D language +Add or remove space after the '*' (dereference) operator +Add or remove space after the '*' (dereference) operator. Default=Remove +Add or remove space after the ':' in 'b ? t : f'. Overrides sp_cond_colon +Add or remove space after the '::' operator +Add or remove space after the '?' in 'b ? t : f'. Overrides sp_cond_question +Add or remove space after the (type) in message specs +Add or remove space after # based on pp_level of #if blocks +Add or remove space after ')' of 'if', 'for', 'switch', and 'while' +Add or remove space after ')' of 'if', 'for', 'switch', and 'while', etc +Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7' +Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove +Add or remove space after ',' +Add or remove space after ',', 'a,b' vs 'a, b' +Add or remove space after ';' in non-empty 'for' statements. Default=Force +Add or remove space after ';', except when followed by a comment. Default=Add +Add or remove space after '<>' +Add or remove space after @property +Add or remove space around arithmetic operator '+' and '-'. Overrides sp_arith +Add or remove space around arithmetic operator '+', '-', '/', '*', etc +Add or remove space around assignment operator '=' in a prototype +Add or remove space around assignment operator '=', '+=', etc +Add or remove space around assignment ':' in enum +Add or remove space around assignment '=' in enum +Add or remove space around boolean operators '&&' and '||' +Add or remove space around compare operator '<', '>', '==', etc +Add or remove space around preprocessor '##' concatenation operator +Add or remove space around preprocessor '##' concatenation operator. Default=Add +Add or remove space around the '.' or '->' operators +Add or remove space around the '.' or '->' operators. Default=Remove +Add or remove space around the ':' in 'b ? t : f' +Add or remove space around the '?' in 'b ? t : f' +Add or remove space around '=' in C++11 lambda capture specifications. Overrides sp_assign +Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign +Add or remove space before assignment '=' in enum. Overrides sp_enum_assign +Add or remove space before a backslash-newline at the end of a line +Add or remove space before a backslash-newline at the end of a line. Default=Add +Add or remove space before a block pointer caret +Add or remove space before a pointer star '*', if followed by a func proto/def +Add or remove space before a reference sign '&' +Add or remove space before a reference sign '&' that isn't followed by a variable name +Add or remove space before a reference sign '&', if followed by a func proto/def +Add or remove space before a semicolon of an empty part of a for statement +Add or remove space before a semicolon of an empty part of a for statment +Add or remove space before case ':' +Add or remove space before case ':'. Default=Remove +Add or remove space before class constructor ':' +Add or remove space before class ':' +Add or remove space before close brace in an unnamed temporary direct-list-initialization +Add or remove space before empty statement ';' on 'if', 'for' and 'while' +Add or remove space before if-condition '('. Overrides sp_inside_sparen +Add or remove space before if-condition ')'. Overrides sp_inside_sparen +Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;' +Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove +Add or remove space before pointer star '*' +Add or remove space before pointer star '*' that isn't followed by a variable name +Add or remove space before preprocessor '#' stringify operator as in '#define x(y) L#y' +Add or remove space before reference sign '&' +Add or remove space before reference sign '&' that isn't followed by a variable name +Add or remove space before the colon in immutable dictionary expression +Add or remove space before the colon in message specs +Add or remove space before the paren in the D constructs 'template Foo(' and 'class Foo(' +Add or remove space before the variadic '...' +Add or remove space before the variadic '...' when preceded by a non-punctuator +Add or remove space before the ':' in 'b ? t : f'. Overrides sp_cond_colon +Add or remove space before the '::' operator +Add or remove space before the '?' in 'b ? t : f'. Overrides sp_cond_question +Add or remove space before '(' of 'if', 'for', 'switch', and 'while' +Add or remove space before '(' of 'if', 'for', 'switch', 'while', etc +Add or remove space before ',' +Add or remove space before ','. Default=Remove +Add or remove space before ';' +Add or remove space before ';' in non-empty 'for' statements +Add or remove space before ';' in 'for' statements +Add or remove space before ';'. Default=Remove +Add or remove space before '<>' +Add or remove space before '[' (except '[]') +Add or remove space before '[]' +Add or remove space between an open paren and comma: '(,' vs '( ,' +Add or remove space between an open paren and comma: '(,' vs '( ,'. Default=Force +Add or remove space between a constructor without parameters or destructor and '()' +Add or remove space between a constructor/destructor and the open paren +Add or remove space between a variable and '{' for C++ uniform initialization +Add or remove space between a variable and '{' for C++ uniform initialization. Default=Add +Add or remove space between a variable and '{' for a namespace +Add or remove space between a variable and '{' for a namespace. Default=Add +Add or remove space between back-to-back parens: ')(' vs ') (' +Add or remove space between function name and '(' on function calls +Add or remove space between function name and '(' on function declaration +Add or remove space between function name and '(' on function definition +Add or remove space between function name and '()' on function calls without parameters +Add or remove space between function name and '()' on function declaration without parameters +Add or remove space between function name and '()' on function definition without parameters +Add or remove space between get/set and '{' if on the same line +Add or remove space between macro and value +Add or remove space between macro function ')' and value +Add or remove space between nested parens +Add or remove space between nested parens: '((' vs ') )' +Add or remove space between pointer stars '*' +Add or remove space between return type and function name +Add or remove space between return type and function name (a minimum of 1 is forced except for pointer return types) +Add or remove space between the operator symbol and the open paren when the operator +Add or remove space between the operator symbol and the open paren when the operator has no arguments, as in 'operator *()' +Add or remove space between the operator symbol and the open paren, as in 'operator ++(' +Add or remove space between the receiver and selector in a message +Add or remove space between the type and open paren in a C++ cast, ie 'int(exp)' vs 'int (exp)' +Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)' +Add or remove space between the user function name and '(' on function calls +Add or remove space between type and open brace of an unnamed temporary direct-list-initialization +Add or remove space between type and word +Add or remove space between type and word. Default=Force +Add or remove space between # and, say, define +Add or remove space between 'catch' and '(' in 'catch (something) { }' +Add or remove space between 'catch' and '{' if on the same line +Add or remove space between 'defined' and '(' in '#if defined (FOO)' +Add or remove space between 'else' and '{' if on the same line +Add or remove space between 'finally' and '{' if on the same line +Add or remove space between 'invariant' and '(' in the D language +Add or remove space between 'operator' and operator sign +Add or remove space between 'return' and '(' +Add or remove space between 'scope' and '(' in 'scope (something) { }' (D language) +Add or remove space between 'sizeof' and '(' +Add or remove space between 'super' and '(' in 'super (something)'. Default=Remove +Add or remove space between 'this' and '(' in 'this (something)'. Default=Remove +Add or remove space between 'throw' and anything other than '(' as in '@throw [...];' +Add or remove space between 'throw' and '(' in 'throw (something)' +Add or remove space between 'try' and '{' if on the same line +Add or remove space between 'version' and '(' in 'version (something) { }' (D language) +Add or remove space between ')' and '{' +Add or remove space between ')' and '{' of function +Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while' +Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while', etc +Add or remove space between ',' and ']' in multidimensional array type 'int[,,]' +Add or remove space between ',' and ']' in multidimensional array type 'int[,,]'. Only for C# +Add or remove space between ',' in multidimensional array type 'int[,,]' +Add or remove space between ',' in multidimensional array type 'int[,,]'. Only for C# +Add or remove space between '<>' and a word as in 'List m;' +Add or remove space between '<>' and a word as in 'List m;' or 'template static ...' +Add or remove space between '<>' and '(' as found in 'new List(foo);' +Add or remove space between '<>' and '(' as found in 'new List();' +Add or remove space between '<>' and '()' as found in 'new List();' +Add or remove space between '<>' and ':' +Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add +Add or remove space between '@selector' and '(' +Add or remove space between '@selector(x)' and the following word +Add or remove space between '[' and ',' in multidimensional array type 'int[,,]' +Add or remove space between '[' and ',' in multidimensional array type 'int[,,]'. Only for C# +Add or remove space between ']' and '(' when part of a function call +Add or remove space between '__attribute__' and '(' +Add or remove space between '}' and the name of a typedef on the same line +Add or remove space between '}' and 'catch' if on the same line +Add or remove space between '}' and 'else' if on the same line +Add or remove space between '}' and 'finally' if on the same line +Add or remove space inside an unnamed temporary direct-list-initialization +Add or remove space inside a non-empty '[' and ']' +Add or remove space inside empty function '()' +Add or remove space inside enum '{' and '}' +Add or remove space inside function '(' and ')' +Add or remove space inside if-condition '(' and ')' +Add or remove space inside struct/union '{' and '}' +Add or remove space inside the first parens in the function type: 'void (*x)(...)' +Add or remove space inside '(' and ')' +Add or remove space inside '<' and '>' +Add or remove space inside '@selector' parens +Add or remove space inside '[' and ']' +Add or remove space inside '{' and '}' +Add or remove space inside '{}' +Add or remove space in 'NS_ENUM (' +Add or remove space in 'template <' vs 'template<' +Add or remove unnecessary paren on 'return' statement +Add parens on 'while' and 'if' statement around bools +Add - makes sure there is 1 or more space/brace/newline/etc +Add/Force work only if the next token is not a closing brace +Affected options: +Affected options: mod_full_brace_for, mod_full_brace_if, mod_full_brace_if_chain, mod_full_brace_if_chain_only, mod_full_brace_while,mod_full_brace_using Not affected options: mod_full_brace_do, mod_full_brace_function +Affects cmt_insert_func_header +Affects cmt_insert_func_header and cmt_insert_class_header +Affects cmt_insert_oc_msg_header, cmt_insert_func_header and cmt_insert_class_header +Affects enums, unions and structures. If set to ignore, uses nl_after_brace_close +Affects enums, unions, and structures. If set to ignore, uses nl_after_brace_close +Aligning parameters in an Obj-C '+' or '-' declaration on the ':' +Aligning the open brace of single-line functions +Align continued statements at the '='. Default=True +Align function protos on the 'operator' keyword instead of what follows +Align lines that start with '<<' with previous '<<'. Default=True +Align lines that start with '<<' with previous '<<'. Default=true +Align macro functions and variables together +Align parameters in an Obj-C message on the ':' +Align parameters in single-line functions that have the same name +Align single-line functions with function prototypes, uses align_func_proto_span +Align text after asm volatile () colons +Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore) +Align variable definitions in prototypes +Align variable definitions in prototypes and functions +Allow interpreting '>=' and '>>=' as part of a template in 'void f(list>=val);' +Also applies to @protocol() constructs +Alternate string escape char for Pawn. Only works right before the quote char +Amount to indent variable declarations after a open brace. neg=relative, pos=absolute +At the second case the option value might be used twice: +A minimum of 1 is forced except for pointer return types +A negative value to force comments which are stuck to the previous token +Blank line options +Blocks removal of braces if the parenthesis of if/for/while/.. span multiple lines +By default, the brace will appear under the 'c' in case +Change a one-liner for statement into simple unbraced for +Change a one-liner if statement into simple unbraced if +Change a one-liner while statement into simple unbraced while +Change simple unbraced for statements into a one-liner +Change simple unbraced if statements into a one-liner +Change simple unbraced while statements into a one-liner +Change simple unbraced while statements into a one-liner while +Code alignment (not left column spaces/tabs) +Code modifying options (non-whitespace) +Comments that are not a brace level are indented with tabs on a tabstop +Comment modifications +Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren +Controls the indent of a BOOL operator when inside a paren.If True, aligns under the open paren +Controls the indent of a BOOL operator when inside a paren. If TRUE, aligns under the open paren +Controls the indent of a BOOL operator when inside a paren. If True, aligns under the open paren +Controls the indent of a close paren after a newline +Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren +Controls the indent of a comma when inside a paren.If True, aligns under the open paren +Controls the indent of a comma when inside a paren. If TRUE, aligns under the open paren +Controls the indent of a comma when inside a paren. If True, aligns under the open paren +Controls the indent of the open paren of a function call, if on it's own line.If True, indents the open paren +Controls the indent of the open paren of a function call, if on it's own line. If True, indents the open paren +Controls the indent of the open paren of a function declaration, if on it's own line.If True, indents the open paren +Controls the indent of the open paren of a function declaration, if on it's own line. If True, indents the open paren +Controls the indent of the open paren of a function definition, if on it's own line.If True, indents the open paren +Controls the indent of the open paren of a function definition, if on it's own line. If True, indents the open paren +Controls the newline after '::' in 'void A::f() { }' +Controls the newline between two annotations +Controls the positioning of the '&' in typedefs. Just try it +Controls the positioning of the '*' in typedefs. Just try it +Controls the spaces after 'new', 'delete' and 'delete[]' +Controls the spaces after 'new', 'delete', and 'delete[' +Controls the spaces after 'new', 'delete', and 'delete[]' +Controls the spaces before a trailing or embedded comment +Controls the spaces between new and '(' in 'new()' +Controls the spaces between #else or #endif and a trailing comment +Controls the spaces between ')' and 'type' in 'new(foo) BAR' +Controls the spaces inside paren of the new operator: 'new(foo) BAR' +Controls the space after open paren of the new operator: 'new(foo) BAR' +Controls the space before close paren of the new operator: 'new(foo) BAR' +Control indent of preprocessors inside #if blocks at brace level 0 +Control indent of preprocessors inside #if blocks at brace level 0 (file-level) +Control indent of preprocessors inside # at brace level 0 +Control space between a Java annotation and the open paren +Control the newline between the close brace and 'b' in: 'struct { int a; } b;' +Control the space after the opening of a C++ comment '// A' vs '//A' +Control the space around the D '..' operator +Control the spacing after ':' in 'for (TYPE VAR : EXPR)' +Control the spacing after ':' in 'for (TYPE VAR : EXPR)' (Java) +Control the spacing after ':' in 'for (TYPE VAR : EXPR)'. Only JAVA +Control the spacing before ':' in 'for (TYPE VAR : EXPR)' +Control the spacing before ':' in 'for (TYPE VAR : EXPR)' (Java) +Control the spacing before ':' in 'for (TYPE VAR : EXPR)'. Only JAVA +Control the spacing in 'extern (C)' (D) +Control what to do with the UTF-8 BOM (recommed 'remove') +Control what to do with the UTF-8 BOM (recommend 'remove') +Control what to do with the UTF-16 BOM (recommed 'force') +Control whether to indent the code between #if, #else and #endif +Control whether to indent the code between #if, #else and #endif when not at file-level +Default is true +Default=1 +Default=True +Determines weight of atomic, nonatomic (Obj-C) +Determines weight of atomic/nonatomic (Obj-C) +Determines weight of class property modifier (Obj-C) +Determines weight of getter type (getter=) (Obj-C) +Determines weight of nullability type (nullable, nonnull, null_unspecified, null_resettable) (Obj-C) +Determines weight of nullability type (nullable/nonnull) (Obj-C) +Determines weight of readwrite (Obj-C) +Determines weight of reference type (retain, copy, assign, weak, strong) (Obj-C) +Determines weight of setter type (setter=) (Obj-C) +Disabled indenting class braces if indent_braces is True +Disabled indenting class braces if indent_braces is true +Disabled indenting function braces if indent_braces is True +Disabled indenting function braces if indent_braces is true +Disabled indenting struct braces if indent_braces is True +Disabled indenting struct braces if indent_braces is true +Doesn't apply if after a brace open or another multi-line comment +Doesn't apply if after a brace open or other CPP comments +Doesn't apply if after a brace open or other single-line C comments +Does not apply if followed by a necessary ';' +Don't change the relative indent of ESQL/C 'EXEC SQL' bodies +Don't remove braces around statements that span N newlines +Don't split one-line C++11 lambdas - '[]() { return 0; }' +Don't split one-line OC messages +Don't split one-line braced assignments - 'foo_t f = { 1, 2 };' +Don't split one-line braced statements inside a class xx { } body +Don't split one-line enums: 'enum foo { BAR = 15 };' +Don't split one-line function definitions - 'int foo() { return 0; }' +Don't split one-line get or set functions +Don't split one-line if/else statements - 'if(a) b++;' +Don't split one-line while statements - 'while(a) b++;' +Don't touch one-line braced assignments - 'foo_t f = { 1, 2 };' +Don't touch one-line enums: 'enum foo { BAR = 15 };' +Don't touch one-line function bodies inside a class xx { } body +Don't touch one-line get or set functions +Double the indent for indent_func_xxx_param options +Do not affect '=' followed by '{' +Due to general newline/brace handling, REMOVE may not work +Enable parsing of digraphs. Default=False +Enable parsing of digraphs. Default=false +Example: +False: align parameters under the open paren +False: indent_continue will be used every time (default) +False: indent_func_call_param will NOT be used +False: use the default behavior +False=treat 'else\ +False=treat 'else\nif' as 'else if' for indenting purposes +Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here +Force a newline in a define after the macro name for multi-line defines +Force the output encoding to UTF-8 +Force - makes sure there is exactly 1 space/brace/newline/etc, +For FreeBSD, this is set to 4 +For FreeBSD, this is set to 4. Negative value is absolute and not increased for each '(' level +For FreeBSD, this is set to 4. Negative value is absolute and not increased for each ( level +For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of +G +Gap for align_single_line_brace +General options +Have precedence of sp_after_operator_sym +Have precedence of sp_inside_newop_paren +How aggressively to remove extra newlines not in preproc +How to align the star in variable definitions +How to align the star in variable definitions. 0=Part of the type, 1=Part of the variable, 2=Dangling +How to align the '&' in variable definitions +How to align typedef'd functions with other typedefs +How to indent goto labels +How to indent goto labels (>0=absolute column where 1 is the leftmost column, <=0=subtract from brace indent) +How to use tabs when indenting code +IARF +If FALSE or the '=' is followed by a newline, the next line is indent one tab +If False or the '=' is followed by a newline, the next line is indent one tab +If False, disable all multi-line comment changes, including cmt_width. keyword substitution and leading chars +If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace +If TRUE, it will organize the properties (Obj-C) +If TRUE, it will remove a void 'return;' that appears as the last statement in a function +If TRUE, will sort consecutive single-line 'import' statements [Java, D] +If TRUE, will sort consecutive single-line 'using' statements [C#] +If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] +If True, align_var_def_XXX options are used instead of align_func_proto_XXX options +If True, always align with the first parameter, even if it is too short +If True, a brace followed by another token (not a newline) will indent all contained lines to match the token.Default=True +If True, a brace followed by another token (not a newline) will indent all contained lines to match the token. Default=True +If True, a is inserted after #define +If True, cpp lambda body will be indentedDefault=False +If True, cpp lambda body will be indented Default=False +If True, it will move a 'break' that appears after a fully braced 'case' before the close brace +If True, it will organize the properties (Obj-C) +If True, it will remove a void 'return;' that appears as the last statement in a function +If True, prioritize aligning with initial colon (and stripping spaces from lines, if necessary) +If True, vbrace tokens are dropped to the previous token and skipped +If True, will sort consecutive single-line 'import' statements [Java, D] +If True, will sort consecutive single-line 'using' statements [C#] +If True, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C] +If True, 'assert(x<0 && y>=3)' will be broken. Default=False +If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment +If any must be braced, they are all braced. If all can be unbraced, then the braces are removed +If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended) +If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended) +If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after +If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after +If a class body exceeds the specified number of newlines and doesn't have a comment after +If a function body exceeds the specified number of newlines and doesn't have a comment after +If a function is declared inline to a class definition, then +If a namespace body exceeds the specified number of newlines and doesn't have a comment after +If a preprocessor is encountered when stepping backwards from a function name, then +If a switch body exceeds the specified number of newlines and doesn't have a comment after +If a trailing comment is more than this number of columns away from the text it follows, +If false, disable all multi-line comment changes, including cmt_width and leading chars +If false, disable all multi-line comment changes, including cmt_width. keyword substitution and leading chars +If false, disable all multi-line comment changes, including cmt_width. keyword substitution, and leading chars +If indent_oc_block_msg and this option are on, blocks will be indented from where the block caret is +If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is +If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is relative to a msg colon +If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is relative to a msg keyword +If indent_oc_block_msg and this option are on, blocks will be indented the way that Xcode does by default (from keyword if the parameter is on its own line; otherwise, from the previous indentation level) +If mod_full_brace_if_chain is used together with this option, all if-else chains will get braces, +If nl_after_brace_open and nl_after_brace_open_cmt are True, a newline is +If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is +If non-zero, this overrides the indent +If pp_indent_at_level=False, specifies the number of columns to indent preprocessors per level at brace level > 0 (function-level) +If pp_indent_at_level=True, sets the indent for #if, #else and #endif when not at file-level +If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1 +If pp_indent_at_level=false, specifies the number of columns to indent preprocessors per level at brace level > 0 (function-level) +If pp_indent_at_level=false, specifies the of columns to indent per level +If pp_indent_at_level=true, control whether to indent the code between #if, #else and #endif when not a file-level +If pp_indent_at_level=true, sets the indent for #if, #else and #endif when not at file-level +If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level +If set to ignore, nl_if_brace is used instead +If set to ignore, sp_before_angle is used +If set to ignore, sp_before_sparen is used +If set to 'ignore' (the default), sp_func_call_paren is used +If set to 'ignore', sp_before_byref is used instead +If set to 'ignore', sp_before_ptr_star is used instead +If set, this option forces 'indent_access_spec=0' +If set, will indent trailing single line ('//') comments relative +If the body of the namespace is longer than this number, it won't be indented +If the file contains bytes with values between 128 and 255, but is not UTF-8, then output as UTF-8 +If the file contains chars between 128 and 255 and is not UTF-8, then output as UTF-8 +If the file only contains chars between 128 and 255 and is not UTF-8, then output as UTF-8 +If the function is a constructor/destructor, then +If true (default), 'assert(x<0 && y>=3)' will be broken +If true, align_var_def_XXX options are used instead of align_func_proto_XXX options +If true, always align with the first parameter, even if it is too short +If true, a brace followed by another token (not a newline) will indent all contained lines to match the token. Default=True +If true, cpp lambda body will be indented Default=False +If true, ignore indent and align for asm blocks as they have their own indentation +If true, prioritize aligning with initial colon (and stripping spaces from lines, if necessary) +If true, vbrace tokens are dropped to the previous token and skipped +If true, 'assert(x<0 && y>=3)' will be broken. Default=False +If 'indent_bool_paren' is True, controls the indent of the first expression. If True, aligns the first expression to the following ones +If 'indent_bool_paren' is True, controls the indent of the first expression. If True, aligns the first expression to the following ones +If 'indent_bool_paren' is true, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones +If 'indent_bool_paren' is true, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones +Ignore - do not do any changes +Improvements to template detection may make this option obsolete +Indentation column for standalone 'const' function decl/proto qualifier +Indentation column for standalone 'throw' function decl/proto qualifier +Indenting +Indent OC blocks at brace level instead of usual rules +Indent OC blocks in a message relative to the parameter name +Indent based on a class colon instead of the stuff after the colon +Indent based on the paren open instead of the brace open in '({ +Indent based on the paren open instead of the brace open in '({\ +Indent based on the paren open instead of the brace open in '({\n', default is to indent by brace +Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc +Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc. +Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc +Indent continued shift expressions ('<<' and '>>') instead of aligning +Indent continued variable declarations instead of aligning +Indent the code after an access specifier by one level +In the abbreviated ternary form (a ?: b), add/remove space between ? and :.'. Overrides all other sp_cond_* options +Java: Add or remove space between ')' and '{{' of double brace initializer +Java: Control the newline between the ')' and '{{' of the double brace initializer +Line Splitting options +Makes the nl_squeeze_ifdef option affect the top-level #ifdefs as well +Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if +Make all if/elseif/else statements with at least one 'else' or 'else if' fully braced +Meaning of the settings: +Minimum gap between the return type and the function name +Minimum indent for subsequent parameters +My favorite format ("--update-config-with-doc") +Negative values decrease indent down to the first column. Default=0 +Newline adding and removing options +Newline between namespace and { +Note that it takes 2 newlines to get a blank line +Note: align_assign_span must be set also +Not affected options: +Number of spaces before a trailing or embedded comment +Only affects annotations that are after a newline +Only appears in separate member implementation (does not appear with in-line implmementation) +Only applies to the indent of the preprocesser that the braces are directly inside of +Only applies to the indent of the preprocesser that the case statements directly inside of +Only applies to the indent of the preprocesser that the extern block is directly inside of +Only applies to the indent of the preprocesser that the function definition is directly inside of +Only indent one namespace and no sub-namepaces +Only indent one namespace and no sub-namespaces +Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch and nl_catch_brace +Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace +Overrides nl_func_call_paren for functions with no parameters +Overrides nl_func_decl_end when there is only one parameter +Overrides nl_func_decl_end when there is only one paramter +Overrides nl_func_decl_start when there is only one parameter +Overrides nl_func_decl_start when there is only one paramter +Overrides nl_func_def_end when there is only one parameter +Overrides nl_func_def_paren for functions with no parameters +Overrides nl_func_def_start when there is only one parameter +Overrides nl_func_paren for functions with no parameters +Overrides sp_after_operator_sym when the operator has no arguments, as in 'operator *()' +Overrides sp_inside_newop_paren +Overrides 'nl_typedef_blk_start' and 'nl_var_def_blk_start' +Override the default ' *INDENT-OFF*' in comments for disabling processing of part of the file +Override the default ' *INDENT-ON*' in comments for enabling processing of part of the file +Permit removal of the space between '>>' in 'foo >' (C++11 only). Default=False +Positioning options +Preprocessor options +Region stuff is always explicitly controlled +Related to nl_constr_colon, nl_constr_init_args and pos_constr_colon +Related to nl_constr_colon, nl_constr_init_args and pos_constr_comma +Related to nl_constr_colon, pos_constr_colon and pos_constr_comma +Related to nl_constr_init_args, pos_constr_colon and pos_constr_comma +Related to pos_class_colon, nl_class_init_args, and pos_class_comma +Related to pos_class_colon, nl_class_init_args, and pos_comma +Related to pos_constr_colon, nl_constr_init_args, and pos_constr_comma +Remove - removes space/brace/newline/etc +Replace tab characters found in string literals with the escape sequence \t instead +Replace tab characters found in string literals with the escape sequence \\t instead +Requires align_single_line_func=True, uses align_func_proto_span +Requires align_single_line_func=true, uses align_func_proto_span +Requires indent_align_string=True +Requires indent_class_colon=True. Default=False +Requires indent_class_colon=true. Default=False +Requires indent_class_colon=true. Default=false +Requires indent_namespace=True +Requires indent_namespace=True. Default=0 (no limit) +Requires indent_namespace=true +Requires indent_namespace=true. Default=0 (no limit) +Requires indent_with_tabs=2. If false, will use spaces +SIGNAL/SLOT Qt macros have special formatting options. See options_for_QT.cpp for details +Same as indent_func_call_param, but for class declarations +Same as indent_func_call_param, but for class variable constructors +Same as indent_func_call_param, but for function defs +Same as indent_func_call_param, but for function protos +Same as indent_func_call_param, but for templates +Same as indent_label, but for access specifiers that are followed by a colon +Same as indent_label, but for access specifiers that are followed by a colon. Default=1 +See nl_oc_msg_leave_one_liner +Sets the number of spaces added with pp_space +Set the comment reflow mode (Default=0) +Set the comment reflow mode (default: 0) +Sort includes options +Spaces to indent single line ('//') comments on lines before code +Spaces to indent 'case' body from 'case' +Spaces to indent 'case' from 'switch' +Spaces to indent '{' from level +Spaces to indent '{' from 'case' +Spaces to shift the 'case' line, without affecting any other lines +Spacing options +Span for aligning parameters in an Obj-C message call on the ':' (0=don't align) +Specifies the number of columns to indent preprocessors per level at brace level 0 (file-level) +TRUE: If space is added with sp_cmt_cpp_start, do it after Qt translator or meta-data comments like '//:', '//=', and '//~' +TRUE: If space is added with sp_cmt_cpp_start, do it after doxygen sequences like '///', '///<', '//!' and '//!<' +TRUE: When identing after virtual brace open and newline add further spaces after regular indent to reach next tabstop +TRUE: When identing after virtual brace open and newline add further spaces after regular indent to reach next tabstop." ); +These occur in un-braced if/while/do/for statement bodies +The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn) +The ASCII value of the string escape char, usually 92 (\\) or 94 (^). (Pawn) +The ascii value of the string escape char, usually 92 (\). (Pawn) +The ascii value of the string escape char, usually 92 (\\) or 94 (^). (Pawn) +The ascii value of the string escape char, usually 92 (\\). (Pawn) +The continuation indent for func_*_param if they are true +The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents +The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment +The filename that contains text to insert at the head of a file if the file doesn't start with a C++ comment +The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment +The filename that contains text to insert before a Obj-C message specification if the method isn't preceded with a C/C++ comment +The filename that contains text to insert before a Obj-C message specification if the method isn't preceeded with a C/C++ comment +The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment +The filename that contains text to insert before a class if the class isn't preceeded with a C++ comment +The filename that contains text to insert before a class if the class isn't preceeded with a C/C++ comment +The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment +The filename that contains text to insert before a function implementation if the function isn't preceeded with a C++ comment +The filename that contains text to insert before a function implementation if the function isn't preceeded with a C/C++ comment +The first arg is the language name used with the '-l' option +The full syntax description of all custom definition config entries +The function names must already be aligned with each other +The gap for aligning class member definitions +The gap for aligning function parameter definitions +The gap for aligning struct/union member definitions +The gap for aligning variable definitions +The indent for #if, #else, and #endif when not at file-level +The indent for #region and #endregion in C# and '#pragma region' in C/C++ +The maximum consecutive newlines +The maximum consecutive newlines in function +The maximum consecutive newlines within a block of typedefs +The maximum consecutive newlines within a block of variable definitions +The maximum consecutive newlines (3 = 2 blank lines) +The minimum number of newlines before a CPP comment +The minimum number of newlines before a CPP comment (doesn't apply if after a brace open or other CPP comments) +The minimum number of newlines before a multi-line comment +The minimum number of newlines before a multi-line comment (doesn't apply if after a brace open or another multi-line comment) +The minimum number of newlines before a multi-line comment (doesn't apply if after a brace open) +The minimum number of newlines before a single-line C comment +The minimum number of newlines before a single-line C comment (doesn't apply if after a brace open or other single-line C comments) +The minimum space between label and value of a preprocessor define +The minimum space between the type and the synonym of a typedef +The number of blank lines after a block of variable definitions +The number of blank lines after a block of variable definitions at the top of a function body +The number of columns to indent per level +The number of columns to indent per level (usually 2, 3, 4, or 8) +The number of newlines after a block of typedefs +The number of newlines after a block of variable definitions +The number of newlines after a block of variable definitions not at the top of a function body +The number of newlines after a function class prototype, if followed by another function class prototype +The number of newlines after a function class prototype, if not followed by another function class prototype +The number of newlines after a function prototype, if followed by another function prototype +The number of newlines after a function prototype, if not followed by another function prototype +The number of newlines after a try-catch-finally block that isn't followed by a brace close +The number of newlines after a 'private:', 'public:', 'protected:', 'signals:' or 'slots:' label +The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label +The number of newlines after '}' of a multi-line function body +The number of newlines after '}' of a multi-line function body in a class declaration +The number of newlines after '}' of a single line function body +The number of newlines after '}' of the function body +The number of newlines after '}' or ';' of a class definition +The number of newlines after '}' or ';' of a struct/enum/union definition +The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force') +The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force' +The number of newlines before and after a property, indexer or event decl +The number of newlines before a block of typedefs +The number of newlines before a block of variable definitions not at the top of a function body +The number of newlines before a class definition +The number of newlines before a multi-line function def body +The number of newlines before a multi-line function prototype body +The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label +The number of newlines between a function def and the function comment +The number of newlines between the get/set/add/remove handlers in C# +The number of spaces to indent a continued '->' or '.' +The number of spaces to indent a namespace block +The number of spaces to indent multi-line XML strings +The number of spaces to indent multi-line XML strings. Requires indent_align_string=True +The number of spaces to insert after the star on subsequent comment lines +The number of spaces to insert at the start of subsequent comment lines +The of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label +The of newlines between the get/set/add/remove handlers in C# +The original size of tabs in the input +The original size of tabs in the input. Default=8 +The position of arithmetic operators in wrapped expressions +The position of assignment in wrapped expressions +The position of boolean operators in wrapped expressions +The position of colons between class and base class list +The position of colons between constructor and member initialization +The position of colons between constructor and member initialization, +The position of comparison operators in wrapped expressions +The position of conditional (b ? t : f) operators in wrapped expressions +The position of the comma in enum entries +The position of the comma in the base class list if there are more than one line, +The position of the comma in the class base list +The position of the comma in the constructor initialization list +The position of the comma in wrapped expressions +The position of trailing/leading class colon, between class and base class list +The regex for include category with priority 0 +The regex for include category with priority 1 +The regex for include category with priority 2 +The remaining args are file extensions, matched with 'endswith' +The size of tabs in the output (only used if align_with_tabs=True). Default=8 +The size of tabs in the output (only used if align_with_tabs=true) +The size of tabs in the output (only used if align_with_tabs=true). Default=8 +The span for aligning ObjC msg spec (0=don't align) +The span for aligning class (0=don't align) +The span for aligning comments that end lines (0=don't align) +The span for aligning function prototypes (0=don't align) +The span for aligning on '#define' bodies (0=don't align) +The span for aligning on '#define' bodies (0=don't align, other=number of lines including comments between blocks) +The span for aligning on '=' in assignments (0=don't align) +The span for aligning on '=' in enums (0=don't align) +The span for aligning parameter definitions in function on parameter name (0=don't align) +The span for aligning single-line typedefs (0=don't align) +The span for aligning struct initializer values (0=don't align) +The span for aligning struct/union (0=don't align) +The span for aligning variable definitions (0=don't align) +The threshold for aligning class member definitions (0=no limit) +The threshold for aligning function parameter definitions (0=no limit) +The threshold for aligning on '=' in assignments (0=no limit) +The threshold for aligning on '=' in enums (0=no limit) +The threshold for aligning struct/union member definitions (0=no limit) +The threshold for aligning variable definitions (0=no limit) +The type of line endings +The type of line endings. Default=Auto +The value of the indentation for a continuation line is calculate differently if the line is: +This also adds a newline before the matching brace close +This can also be achieved with `set TYPE int c_uint_8 Rectangle` +This does not affect the spacing after a '&' that is part of a type +This does not affect the spacing after a '*' that is part of a type +This is generally a bad idea, as it may break your code +This will not work right if the macro contains a multi-line comment +To embed whitespace in tokenStrings use the '\' escape character, or quote +To prevent the double use of the option value, use this option with the value 'True' +To prevent the double use of the option value, use this option with the value 'true' +True: If space is added with sp_cmt_cpp_start, do it after Qt translator or meta-data comments like '//:', '//=', and '//~' +True: If space is added with sp_cmt_cpp_start, do it after doxygen sequences like '///', '///<', '//!' and '//!<' +True: When identing after virtual brace open and newline add further spaces after regular indent to reach next tabstop +True: When identing after virtual brace open and newline add further spaces after regular indent to reach next tabstop +True: force indentation of function definition to start in column 1 +True: indent continued function call parameters one indent level +True: indent_continue will be used only once +True: indent_func_call_param will be used +True: indent_func_call_param will be used (default) +True=indent the 'if' one level +Try to limit code width to N number of columns +Try to wrap comments at cmt_width columns +Try to wrap comments at cmt_witdth columns +Turn align_left_shift off when enabling this +Uncrustify 0.37 +Uncrustify 0.38 +Uncrustify 0.39 +Uncrustify 0.40 +Uncrustify 0.41 +Uncrustify 0.42 +Uncrustify 0.43 +Uncrustify 0.44 +Uncrustify 0.45 +Uncrustify 0.46 +Uncrustify 0.47 +Uncrustify 0.48 +Uncrustify 0.49 +Uncrustify 0.50 +Uncrustify 0.51 +Uncrustify 0.52 +Uncrustify 0.53 +Uncrustify 0.54 +Uncrustify 0.55 +Uncrustify 0.56 +Uncrustify 0.57 +Uncrustify 0.58 +Uncrustify 0.59 +Uncrustify 0.60 +Uncrustify 0.61 +Uncrustify 0.62 +Uncrustify 0.63 +Uncrustify 0.64 +Uncrustify 0.65 +Uncrustify 0.66 +Uncrustify-0.65-301-b52ce477 +Uses nl_func_type_name or nl_func_proto_type_name if set to ignore +Use both values of the options indent_columns and indent_param +Use or Do not Use options +Usually 0 +Usually 0 or indent_columns +Usually 2, 3, 4, or 8 +Usually 2, 3, 4, or 8. Default=8 +Usually set to 0 or indent_columns +Usually set to 0, 1, or indent_columns +Usually set to indent_columns +Virtual indent from the ':' for member initializers. Default is 2 +Virtual indent from the ':' for member initializers. Default=2 +Warning is given if doing tab-to-\t replacement and we have found one in a C# verbatim string literal +Warning is given if doing tab-to-\\t replacement and we have found one in a C# verbatim string literal +Warn levels - 1: error, 2: warning (default), 3: note +When identing after virtual brace open and newline add further spaces to reach this min. indent +Whether braces are indented to the body level +Whether the pointer star is part of the variable name or not +Whether the 'class' body is indented +Whether the 'extern "C"' body is indented +Whether the 'extern \"C\"' body is indented +Whether the 'namespace' body is indented +Whether to add newline after each ',' in a function call if '(' and ')' are in different lines +Whether to add newline after each ',' in a function declaration if '(' and ')' are in different lines +Whether to add newline after each ',' in a function definition if '(' and ')' are in different lines +Whether to add newline after '(' in a function call if '(' and ')' are in different lines +Whether to add newline after '(' in a function declaration if '(' and ')' are in different lines +Whether to add newline after '(' in a function definition if '(' and ')' are in different lines +Whether to add newline before ')' in a function call if '(' and ')' are in different lines +Whether to add newline before ')' in a function declaration if '(' and ')' are in different lines +Whether to add newline before ')' in a function definition if '(' and ')' are in different lines +Whether to align any attribute after the variable name +Whether to align inline struct/enum/union variable definitions +Whether to align macros wrapped with a backslash and a newline +Whether to align macros wrapped with a backslash and a newline. This will not work right if the macro contains a multi-line comment +Whether to align the colon in struct bit fields +Whether to alter newlines in '#define' macros +Whether to balance spaces inside nested parens +Whether to bump out to the next tab when aligning +Whether to change cpp-comments into c-comments +Whether to change optional semicolons to real semicolons +Whether to collapse empty blocks between '{' and '}' +Whether to convert all tabs to spaces in comments. Default is to leave tabs inside comments alone, unless used for indenting +Whether to double-space before the close brace of a struct/union/enum +Whether to double-space commented-entries in struct/enum +Whether to double-space commented-entries in struct/union/enum +Whether to force a newline after a label's colon +Whether to force a newline after a mulit-line comment +Whether to force a newline after a multi-line comment +Whether to fully split long function protos/calls at commas +Whether to fully split long 'for' statements at semi-colons +Whether to group cpp-comments that look like they are in a block +Whether to group c-comments that look like they are in a block +Whether to ignore the '#define' body while formatting +Whether to indent at the brace level (true) or from column 1 (false) +Whether to indent braces directly inside #if, #else, and #endif +Whether to indent case statements between #if, #else, and #endif +Whether to indent comments found in first column +Whether to indent continued function call parameters one indent level (true) or aligns instead of indent (false) +Whether to indent extern C blocks between #if, #else, and #endif +Whether to indent preproccesor statements inside of switch statements +Whether to indent strings broken by '\' so that they line up +Whether to indent strings broken by '\\' so that they line up +Whether to indent the code between #if, #else and #endif when not a file-level +Whether to indent the code between #region and #endregion +Whether to indent the stuff after a leading base class colon +Whether to indent the stuff after a leading class colon +Whether to indent the stuff after a leading class initializer colon +Whether to indent whole function definitions between #if, #else, and #endif +Whether to indent #if/#else/#endif at the brace level (True) or from column 1 (False) +Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) +Whether to indent #if/#else/# at the brace level (true) or from column 1 (false) +Whether to indent '#define' at the brace level (True) or from column 1 (false) +Whether to indent '#define' at the brace level (true) or from column 1 (false) +Whether to keep non-indenting tabs +Whether to keep whitespace not required for alignment +Whether to left-align numbers +Whether to mess with the indent of multi-line comments +Whether to mix aligning prototype and variable declarations +Whether to not put blanks after '#ifxx', '#elxx', or before '#endif' +Whether to not put blanks after '#ifxx', '#elxx', or before '#endif'. Does not affect the whole-file #ifdef +Whether to not put blanks after '#ifxx', '#elxx', or before '#' +Whether to put an empty '/*' on the first line of the combined cpp-comment +Whether to put an empty '/*' on the first line of the combined c-comment +Whether to put a blank line after 'return' statements, unless followed by a close brace +Whether to put a blank line before 'return' statements, unless after an open brace +Whether to put a newline after a Java annotation statement +Whether to put a newline after a brace close +Whether to put a newline after a virtual brace close +Whether to put a newline after a virtual brace open +Whether to put a newline after a virtual brace open with an empty body +Whether to put a newline after a virtual brace open with a non-empty body +Whether to put a newline after brace open +Whether to put a newline after open brace in an unnamed temporary direct-list-initialization +Whether to put a newline after semicolons, except in 'for' statements +Whether to put a newline after the type in an unnamed temporary direct-list-initialization +Whether to put a newline after 'case' statement +Whether to put a newline after 'return' statement +Whether to put a newline before close brace in an unnamed temporary direct-list-initialization +Whether to put a newline before the closing '*/' of the combined cpp-comment +Whether to put a newline before the closing '*/' of the combined c-comment +Whether to put a newline before 'case' statement +Whether to put a newline before 'case' statement, not after the first 'case' +Whether to put a star on subsequent comment lines +Whether to put each OC message parameter on a separate line +Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and '#endif'. Does not affect the whole-file #ifdef +Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and '#endif'. Does not affect top-level #ifdefs +Whether to remove blank lines after '{' +Whether to remove blank lines before '}' +Whether to remove superfluous semicolons +Whether to right-align numbers +Whether to split lines as close to code_width as possible and ignore some groupings +Whether to use tabs for aligning +Whether to use tabs for alinging +Will add or remove the braces around a fully braced case statement +Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } +Will not change the newline count if after a brace open +Will only remove the braces if there are no variable declarations in the block +Will substitue $(class) with the class name +Will substitue $(filename) with the current file's name +Will substitue $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff +Will substitute $(class) with the class name +Will substitute $(filename) with the current file's name +Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff +Will substitute $(message) with the function name and $(javaparam) with the javadoc @param and @return stuff +Would add a newline before return in: 'if (foo) a++; return;' +Xcode inserts <#code placeholders#> into files that will otherwise be mangled. Turn option on to ignore these +You can add support for other file extensions using the 'file_ext' command +You can assign any keyword to any type with the set option +You can create custom macro-based indentation using macro-open, +You can force a token to be a type with the 'type' option +You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file +added using the 'file_ext' command +align variable defs gap for bit colons +all tokens are separated by any mix of ',' commas, '=' equal signs +also '>>>' '<<' '>>' '%' '|' +and simple 'if' statements will lose them (if possible) +and whitespace (space, tab) +an assigment :your case with pSettings = new QSettings( ... +an assignment :your case with pSettings = new QSettings( ... +at the assigment +at the assignment +at the function call (if present) +auto/lf/crlf/cr +a declaration :your case with QString fileName ... +behaves like Add in some contexts +bool +define custom tokens as: +define def_token output_token +e.g. PP_PRAGMA +false/true +false/true/ignore +file_ext CPP .ch .cxx .cpp.in +foo(i);' +foo(i);' => 'for (i=0;i<5;i++) foo(i);' +foo(i++);' +foo(i++);' => 'while (i<5) foo(i++);' +force nl before } of a struct/union/enum +has no arguments, as in 'operator *()' +if' as 'else if' for indenting purposes +ignore/add/remove/force +ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force +ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +ignore/lead/trail +indent a C# delegate by another level, default is to not indent by another level +indent the continuation of ternary operator +indent (or not) an using block if no braces are used. Only for C#.Default=True +indent (or not) an using block if no braces are used. Only for C#. Default=True +is overridden by the option 'nl_after_access_spec' +is shown below: +it will qualify for being aligned +it will qualify for being aligned. This has to be > 0 to do anything +i++;' +i++;' => 'if(b) i++;' +langTypes are defined in uncrusify_types.h in the lang_flag_e enum, use +list_for_each(item, &list) { } +macro-close END_MESSAGE_MAP +macro-close token +macro-else and macro-close +macro-else token +macro-open token +macro-open BEGIN_MESSAGE_MAP +macro-open BEGIN_TEMPLATE_MESSAGE_MAP +mod_full_brace_do, mod_full_brace_function +mod_full_brace_for, mod_full_brace_if, mod_full_brace_if_chain, mod_full_brace_if_chain_only, mod_full_brace_while,mod_full_brace_using +negative value are OK +number +placed between the open brace and a trailing single-line comment +put token in quotes +set func_call_user _ N_ +set id token1 token2 ... +sp_angle_shift cannot remove the space without this option +string +them without the 'LANG_' prefix: 'LANG_CPP' -> 'CPP' +the close brace, a comment will be added +the comment are the same length AND if the length is bigger as the first_len minimum. Default=4 +the comment are the same length. Default=True +the option 'nl_after_access_spec' takes preference over 'nl_typedef_blk_start' +the option 'nl_after_access_spec' takes preference over 'nl_typedef_blk_start' and 'nl_var_def_blk_start' +the option 'nl_after_access_spec' takes preference over 'nl_var_def_blk_start' +the tokenStrings. These quotes are supported: "'` +the #else, a comment will be added +the #endif, a comment will be added +this option decides whether the comment should be inserted +tokenTypes are defined in src/token_enum.h, use them without the +to the code instead of trying to keep the same absolute column +type myfoo1 myfoo2 +type token1 token2 token3 ... +unsigned number +#option(s) with 'not default' value: 0 +# Align macro functions and variables together +'CT_' prefix: 'CT_BOOL' -> 'BOOL' +'NSDictionary *test = @{@"foo" :@"bar"};' +'NSDictionary *test = @{@\"foo\" :@\"bar\"};' +'for (i=0;i<5;i++)\ +'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);' +'for (i=0;<5;i++) foo(i);' => 'for (i=0;<5;i++) foo(i);' +'for (i=0;<5;i++) foo(i);' => 'for (i=0;<5;i++)\ +'for (i=0;<5;i++) foo(i);' => 'for (i=0;<5;i++)\n foo(i);' +'if(b) i++;' => 'if(b) i++;' +'if(b) i++;' => 'if(b)\ +'if(b) i++;' => 'if(b)\n i++;' +'if(b)\ +'if(b)\n i++;' => 'if(b) i++;' +'macro-else' and 'macro-close' +'while (i<5) foo(i++);' => 'while (i<5)\ +'while (i<5) foo(i++);' => 'while (i<5)\n foo(i++);' +'while (i<5)\ +'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);' +', default is to indent by brace +'-(int)f: (int) x;' vs '-(int)f: (int)x;' +'-(int) f: (int) x;' vs '+(int)f : (int)x;' +'-(int) f: (int) x;' vs '+(int) f : (int) x;' +'-(int) f: (int) x;' vs '-(int) f : (int) x;' +'-(int) f: (int) x;' vs '-(int) f: (int)x;' +'-(int) f:(int)x;' vs '-(int)f:(int)x;' +'-(int) f:(int) x;' vs '-(int) f: (int) x;' +'@selector(foo) a:' vs '@selector(foo)a:' +'@selector(foo)' vs '@selector( foo )' +'@selector(msgName)' vs '@selector (msgName)' +'@selector(msgName).' vs '@selector (msgName)' +'[object setValue:1];' vs '[object setValue :1];' +'[object setValue:1];' vs '[object setValue: 1];' +'[receiver selector ...]' +'^int (int arg){...}' vs. ' ^int (int arg){...}' +'^int (int arg){...}' vs. '^ int (int arg){...}' +(a minimum of 1 is forced except for pointer return types) +(gap=0) into alignment with the others +(lower priority than 'eat_blanks_before_close_brace') +(tied to UO_nl_constr_colon) +(tied to nl_class_colon) +(tied to nl_class_init_args) +(tied to nl_constr_colon) +(tied to pos_class_colon) +(tied to pos_class_comma) +- Custom macro-based indentation can be set up using 'macro-open', +- Support for the auto detection of languages through the file ending can be +- Token(s) can be treated as specific type(s) with the 'set' option: +- Token(s) can be treated as type(s) with the 'type' option +- embed whitespace in token using '' escape character, or +- these: ' " and ` are recognized as quote delimiters +<=0 : subtract from brace indent +<=0: subtract from brace indent +>0 : absolute column where 1 is the leftmost column +>0: absolute column where 1 is the leftmost column +>0: column at which all preprocessors will be indented +^ id is one of the names in token_enum.h sans the CT_ prefix, +^ optionally specify multiple tokens on a single line +^ output_token is optional, then NULL is assumed +`file_ext CPP .ch .cxx .cpp.in` +`file_ext langType langString [langString..]` +`macro-close END_MESSAGE_MAP` +`macro-open BEGIN_MESSAGE_MAP` +`macro-open BEGIN_TEMPLATE_MESSAGE_MAP` +`set BOOL __AND__ __OR__` +`set tokenType tokenString [tokenString...]` +`type int c_uint_8 Rectangle` +`type tokenString [tokenString...]` +`(macro-open | macro-else | macro-close) tokenString` +{ IARF } +{ auto/lf/crlf/cr } +{ bool } +{ false/true } +{ false/true/ignore } +{ ignore/add/remove/force } +{ ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force } +{ ignore/lead/lead_break/lead_force/trail/trail_break/trail_force } +{ ignore/lead/trail } +{ number } +{ string } +{ unsigned number } +new tab size +My favorite format ("--update-config-with-doc") +My favorite format +original tab size +1=indent to level only, 2=indent with tabs +AUTO (default), DOS, MAC, or UNIX +"int foo (){" vs "int foo(){" +"foo (" vs "foo(" +"int foo ();" vs "int foo();" +use tabs to align +align on tabstops +pos : absolute col, neg : relative column +Whether to fully split long function protos/calls at commas + +"do {" vs "do \n {" +"if () {" vs "if () \n {" +"for () {" vs "for () \n {" +"else {" vs "else \n {" +"while () {" vs "while () \n {" +"switch () {" vs "switch () \n {" +"foo() {" vs "foo()\n{" +"if (" vs "if(" +"if () {" vs "if (){" + +"enum {" vs "enum \n {" +"union {" vs "union \n {" +"struct {" vs "struct \n {" +"= {" vs "= \n {" +space between (( and )) +"sizeof (int)" vs "sizeof(int)" +"(int) a" vs "(int)a" +"{ 1 }" vs "{1}" +"return (1);" vs "return(1);" +"return 1;" vs "return (1);" +"} while" vs "} \n while" - cuddle while +"} else" vs "} \n else" - cuddle else +align broken strings +"if (a) a--;" vs "if (a) { a--; }" +"for () a--;" vs "for () { a--; }" +"do a--; while ();" vs "do { a--; } while ();" +"while (a) a--;" vs "while (a) { a--; }" +pos: absolute col, neg: relative column +pos: absolute col, neg: relative column +"func( param )" vs "func(param)" +don't remove if more than 3 newlines +"list_for_each() {" vs "list_for_each()\n{" +"while (a) a--;" vs "while (a) { a--; }" +pos: absolute col, neg: relative column +"while (a) a--;" vs "while (a) { a--; }" \ No newline at end of file diff --git a/tests/default_strings_remover.py b/tests/default_strings_remover.py new file mode 100755 index 0000000000..61f9f89b56 --- /dev/null +++ b/tests/default_strings_remover.py @@ -0,0 +1,729 @@ +#!/usr/bin/python +from __future__ import print_function # python >= 2.6 +from glob import glob +from sys import argv +import editdistance +from re import search + +STRINGS_FILE_PATH = "default_strings.txt" +MATCH_MAX_DELTA_PERCENT = 5 +# OR +MATCH_MAX_DELTA_CHARS = 3 + +OPTIONS_LIST = [ + "newlines", "input_tab_size", "output_tab_size", "string_escape_char", + "string_escape_char2", "string_replace_tab_chars", "tok_split_gte", + "disable_processing_cmt", "enable_processing_cmt", "enable_digraphs", + "utf8_bom", "utf8_byte", "utf8_force", "sp_arith", "sp_arith_additive", + "sp_assign", "sp_cpp_lambda_assign", "sp_cpp_lambda_paren", + "sp_assign_default", "sp_before_assign", "sp_after_assign", "sp_enum_paren", + "sp_enum_assign", "sp_enum_before_assign", "sp_enum_after_assign", + "sp_enum_colon", "sp_pp_concat", "sp_pp_stringify", + "sp_before_pp_stringify", "sp_bool", "sp_compare", "sp_inside_paren", + "sp_paren_paren", "sp_cparen_oparen", "sp_balance_nested_parens", + "sp_paren_brace", "sp_before_ptr_star", "sp_before_unnamed_ptr_star", + "sp_between_ptr_star", "sp_after_ptr_star", "sp_after_ptr_star_qualifier", + "sp_after_ptr_star_func", "sp_ptr_star_paren", "sp_before_ptr_star_func", + "sp_before_byref", "sp_before_unnamed_byref", "sp_after_byref", + "sp_after_byref_func", "sp_before_byref_func", "sp_after_type", + "sp_before_template_paren", "sp_template_angle", "sp_before_angle", + "sp_inside_angle", "sp_angle_colon", "sp_after_angle", "sp_angle_paren", + "sp_angle_paren_empty", + "sp_angle_word", + "sp_angle_shift", + "sp_permit_cpp11_shift", + "sp_before_sparen", + "sp_inside_sparen", + "sp_inside_sparen_close", + "sp_inside_sparen_open", + "sp_after_sparen", + "sp_sparen_brace", + "sp_invariant_paren", + "sp_after_invariant_paren", + "sp_special_semi", + "sp_before_semi", + "sp_before_semi_for", + "sp_before_semi_for_empty", + "sp_after_semi", + "sp_after_semi_for", + "sp_after_semi_for_empty", + "sp_before_square", + "sp_before_squares", + "sp_inside_square", + "sp_after_comma", + "sp_before_comma", + "sp_after_mdatype_commas", + "sp_before_mdatype_commas", + "sp_between_mdatype_commas", + "sp_paren_comma", + "sp_before_ellipsis", + "sp_after_class_colon", + "sp_before_class_colon", + "sp_after_constr_colon", + "sp_before_constr_colon", + "sp_before_case_colon", + "sp_after_operator", + "sp_after_operator_sym", + "sp_after_operator_sym_empty", + "sp_after_cast", + "sp_inside_paren_cast", + "sp_cpp_cast_paren", + "sp_sizeof_paren", + "sp_after_tag", + "sp_inside_braces_enum", + "sp_inside_braces_struct", + "sp_after_type_brace_init_lst_open", + "sp_before_type_brace_init_lst_close", + "sp_inside_type_brace_init_lst", + "sp_inside_braces", + "sp_inside_braces_empty", + "sp_type_func", + "sp_type_brace_init_lst", + "sp_func_proto_paren", + "sp_func_proto_paren_empty", + "sp_func_def_paren", + "sp_func_def_paren_empty", + "sp_inside_fparens", + "sp_inside_fparen", + "sp_inside_tparen", + "sp_after_tparen_close", + "sp_square_fparen", + "sp_fparen_brace", + "sp_fparen_dbrace", + "sp_func_call_paren", + "sp_func_call_paren_empty", + "sp_func_call_user_paren", + "sp_func_class_paren", + "sp_func_class_paren_empty", + "sp_return_paren", + "sp_attribute_paren", + "sp_defined_paren", + "sp_throw_paren", + "sp_after_throw", + "sp_catch_paren", + "sp_version_paren", + "sp_scope_paren", + "sp_super_paren", + "sp_this_paren", + "sp_macro", + "sp_macro_func", + "sp_else_brace", + "sp_brace_else", + "sp_brace_typedef", + "sp_catch_brace", + "sp_brace_catch", + "sp_finally_brace", + "sp_brace_finally", + "sp_try_brace", + "sp_getset_brace", + "sp_word_brace", + "sp_word_brace_ns", + "sp_before_dc", + "sp_after_dc", + "sp_d_array_colon", + "sp_not", + "sp_inv", + "sp_addr", + "sp_member", + "sp_deref", + "sp_sign", + "sp_incdec", + "sp_before_nl_cont", + "sp_after_oc_scope", + "sp_after_oc_colon", + "sp_before_oc_colon", + "sp_after_oc_dict_colon", + "sp_before_oc_dict_colon", + "sp_after_send_oc_colon", + "sp_before_send_oc_colon", + "sp_after_oc_type", + "sp_after_oc_return_type", + "sp_after_oc_at_sel", + "sp_after_oc_at_sel_parens", + "sp_inside_oc_at_sel_parens", + "sp_before_oc_block_caret", + "sp_after_oc_block_caret", + "sp_after_oc_msg_receiver", + "sp_after_oc_property", + "sp_cond_colon", + "sp_cond_colon_before", + "sp_cond_colon_after", + "sp_cond_question", + "sp_cond_question_before", + "sp_cond_question_after", + "sp_cond_ternary_short", + "sp_case_label", + "sp_range", + "sp_after_for_colon", + "sp_before_for_colon", + "sp_extern_paren", + "sp_cmt_cpp_start", + "sp_cmt_cpp_doxygen", + "sp_cmt_cpp_qttr", + "sp_endif_cmt", + "sp_after_new", + "sp_between_new_paren", + "sp_after_newop_paren", + "sp_inside_newop_paren", + "sp_inside_newop_paren_open", + "sp_inside_newop_paren_close", + "sp_before_tr_emb_cmt", + "sp_num_before_tr_emb_cmt", + "sp_annotation_paren", + "sp_skip_vbrace_tokens", + "force_tab_after_define", + "indent_columns", + "indent_continue", + "indent_param", + "indent_with_tabs", + "indent_cmt_with_tabs", + "indent_align_string", + "indent_xml_string", + "indent_brace", + "indent_braces", + "indent_braces_no_func", + "indent_braces_no_class", + "indent_braces_no_struct", + "indent_brace_parent", + "indent_paren_open_brace", + "indent_cs_delegate_brace", + "indent_namespace", + "indent_namespace_single_indent", + "indent_namespace_level", + "indent_namespace_limit", + "indent_extern", + "indent_class", + "indent_class_colon", + "indent_class_on_colon", + "indent_constr_colon", + "indent_ctor_init_leading", + "indent_ctor_init", + "indent_else_if", + "indent_var_def_blk", + "indent_var_def_cont", + "indent_shift", + "indent_func_def_force_col1", + "indent_func_call_param", + "indent_func_def_param", + "indent_func_proto_param", + "indent_func_class_param", + "indent_func_ctor_var_param", + "indent_template_param", + "indent_func_param_double", + "indent_func_const", + "indent_func_throw", + "indent_member", + "indent_sing_line_comments", + "indent_relative_single_line_comments", + "indent_switch_case", + "indent_switch_pp", + "indent_case_shift", + "indent_case_brace", + "indent_col1_comment", + "indent_label", + "indent_access_spec", + "indent_access_spec_body", + "indent_paren_nl", + "indent_paren_close", + "indent_paren_after_func_def", + "indent_paren_after_func_decl", + "indent_paren_after_func_call", + "indent_comma_paren", + "indent_bool_paren", + "indent_first_bool_expr", + "indent_square_nl", + "indent_preserve_sql", + "indent_align_assign", + "indent_oc_block", + "indent_oc_block_msg", + "indent_oc_msg_colon", + "indent_oc_msg_prioritize_first_colon", + "indent_oc_block_msg_xcode_style", + "indent_oc_block_msg_from_keyword", + "indent_oc_block_msg_from_colon", + "indent_oc_block_msg_from_caret", + "indent_oc_block_msg_from_brace", + "indent_min_vbrace_open", + "indent_vbrace_open_on_tabstop", + "indent_token_after_brace", + "indent_cpp_lambda_body", + "indent_using_block", + "indent_ternary_operator", + "nl_collapse_empty_body", + "nl_assign_leave_one_liners", + "nl_class_leave_one_liners", + "nl_enum_leave_one_liners", + "nl_getset_leave_one_liners", + "nl_func_leave_one_liners", + "nl_cpp_lambda_leave_one_liners", + "nl_if_leave_one_liners", + "nl_while_leave_one_liners", + "nl_oc_msg_leave_one_liner", + "nl_oc_block_brace", + "nl_start_of_file", + "nl_start_of_file_min", + "nl_end_of_file", + "nl_end_of_file_min", + "nl_assign_brace", + "nl_assign_square", + "nl_after_square_assign", + "nl_func_var_def_blk", + "nl_typedef_blk_start", + "nl_typedef_blk_end", + "nl_typedef_blk_in", + "nl_var_def_blk_start", + "nl_var_def_blk_end", + "nl_var_def_blk_in", + "nl_fcall_brace", + "nl_enum_brace", + "nl_enum_class", + "nl_enum_class_identifier", + "nl_enum_identifier_colon", + "nl_enum_colon_type", + "nl_struct_brace", + "nl_union_brace", + "nl_if_brace", + "nl_brace_else", + "nl_elseif_brace", + "nl_else_brace", + "nl_else_if", + "nl_before_if_closing_paren", + "nl_brace_finally", + "nl_finally_brace", + "nl_try_brace", + "nl_getset_brace", + "nl_for_brace", + "nl_catch_brace", + "nl_brace_catch", + "nl_brace_square", + "nl_brace_fparen", + "nl_while_brace", + "nl_scope_brace", + "nl_unittest_brace", + "nl_version_brace", + "nl_using_brace", + "nl_brace_brace", + "nl_do_brace", + "nl_brace_while", + "nl_switch_brace", + "nl_synchronized_brace", + "nl_multi_line_cond", + "nl_multi_line_define", + "nl_before_case", + "nl_before_throw", + "nl_after_case", + "nl_case_colon_brace", + "nl_namespace_brace", + "nl_template_class", + "nl_class_brace", + "nl_class_init_args", + "nl_constr_init_args", + "nl_enum_own_lines", + "nl_func_type_name", + "nl_func_type_name_class", + "nl_func_class_scope", + "nl_func_scope_name", + "nl_func_proto_type_name", + "nl_func_paren", + "nl_func_paren_empty", + "nl_func_def_paren", + "nl_func_def_paren_empty", + "nl_func_call_paren", + "nl_func_call_paren_empty", + "nl_func_decl_start", + "nl_func_def_start", + "nl_func_decl_start_single", + "nl_func_def_start_single", + "nl_func_decl_start_multi_line", + "nl_func_def_start_multi_line", + "nl_func_decl_args", + "nl_func_def_args", + "nl_func_decl_args_multi_line", + "nl_func_def_args_multi_line", + "nl_func_decl_end", + "nl_func_def_end", + "nl_func_decl_end_single", + "nl_func_def_end_single", + "nl_func_decl_end_multi_line", + "nl_func_def_end_multi_line", + "nl_func_decl_empty", + "nl_func_def_empty", + "nl_func_call_empty", + "nl_func_call_start_multi_line", + "nl_func_call_args_multi_line", + "nl_func_call_end_multi_line", + "nl_oc_msg_args", + "nl_fdef_brace", + "nl_cpp_ldef_brace", + "nl_return_expr", + "nl_after_semicolon", + "nl_paren_dbrace_open", + "nl_type_brace_init_lst", + "nl_type_brace_init_lst_open", + "nl_type_brace_init_lst_close", + "nl_after_brace_open", + "nl_after_brace_open_cmt", + "nl_after_vbrace_open", + "nl_after_vbrace_open_empty", + "nl_after_brace_close", + "nl_after_vbrace_close", + "nl_brace_struct_var", + "nl_define_macro", + "nl_squeeze_ifdef", + "nl_squeeze_ifdef_top_level", + "nl_before_if", + "nl_after_if", + "nl_before_for", + "nl_after_for", + "nl_before_while", + "nl_after_while", + "nl_before_switch", + "nl_after_switch", + "nl_before_synchronized", + "nl_after_synchronized", + "nl_before_do", + "nl_after_do", + "nl_ds_struct_enum_cmt", + "nl_ds_struct_enum_close_brace", + "nl_before_func_class_def", + "nl_before_func_class_proto", + "nl_class_colon", + "nl_constr_colon", + "nl_create_if_one_liner", + "nl_create_for_one_liner", + "nl_create_while_one_liner", + "nl_split_if_one_liner", + "nl_split_for_one_liner", + "nl_split_while_one_liner", + "nl_max", + "nl_max_blank_in_func", + "nl_after_func_proto", + "nl_after_func_proto_group", + "nl_after_func_class_proto", + "nl_after_func_class_proto_group", + "nl_before_func_body_def", + "nl_before_func_body_proto", + "nl_after_func_body", + "nl_after_func_body_class", + "nl_after_func_body_one_liner", + "nl_before_block_comment", + "nl_before_c_comment", + "nl_before_cpp_comment", + "nl_after_multiline_comment", + "nl_after_label_colon", + "nl_after_struct", + "nl_before_class", + "nl_after_class", + "nl_before_access_spec", + "nl_after_access_spec", + "nl_comment_func_def", + "nl_after_try_catch_finally", + "nl_around_cs_property", + "nl_between_get_set", + "nl_property_brace", + "eat_blanks_after_open_brace", + "eat_blanks_before_close_brace", + "nl_remove_extra_newlines", + "nl_before_return", + "nl_after_return", + "nl_after_annotation", + "nl_between_annotation", + "pos_arith", + "pos_assign", + "pos_bool", + "pos_compare", + "pos_conditional", + "pos_comma", + "pos_enum_comma", + "pos_class_comma", + "pos_constr_comma", + "pos_class_colon", + "pos_constr_colon", + "code_width", + "ls_for_split_full", + "ls_func_split_full", + "ls_code_width", + "align_keep_tabs", + "align_with_tabs", + "align_on_tabstop", + "align_number_right", + "align_keep_extra_space", + "align_func_params", + "align_func_params_span", + "align_func_params_thresh", + "align_func_params_gap", + "align_same_func_call_params", + "align_var_def_span", + "align_var_def_star_style", + "align_var_def_amp_style", + "align_var_def_thresh", + "align_var_def_gap", + "align_var_def_colon", + "align_var_def_colon_gap", + "align_var_def_attribute", + "align_var_def_inline", + "align_assign_span", + "align_assign_thresh", + "align_enum_equ_span", + "align_enum_equ_thresh", + "align_var_class_span", + "align_var_class_thresh", + "align_var_class_gap", + "align_var_struct_span", + "align_var_struct_thresh", + "align_var_struct_gap", + "align_struct_init_span", + "align_typedef_gap", + "align_typedef_span", + "align_typedef_func", + "align_typedef_star_style", + "align_typedef_amp_style", + "align_right_cmt_span", + "align_right_cmt_mix", + "align_right_cmt_gap", + "align_right_cmt_at_col", + "align_func_proto_span", + "align_func_proto_gap", + "align_on_operator", + "align_mix_var_proto", + "align_single_line_func", + "align_single_line_brace", + "align_single_line_brace_gap", + "align_oc_msg_spec_span", + "align_nl_cont", + "align_pp_define_together", + "align_pp_define_gap", + "align_pp_define_span", + "align_left_shift", + "align_asm_colon", + "align_oc_msg_colon_span", + "align_oc_msg_colon_first", + "align_oc_decl_colon", + "cmt_width", + "cmt_reflow_mode", + "cmt_convert_tab_to_spaces", + "cmt_indent_multi", + "cmt_c_group", + "cmt_c_nl_start", + "cmt_c_nl_end", + "cmt_cpp_group", + "cmt_cpp_nl_start", + "cmt_cpp_nl_end", + "cmt_cpp_to_c", + "cmt_star_cont", + "cmt_sp_before_star_cont", + "cmt_sp_after_star_cont", + "cmt_multi_check_last", + "cmt_multi_first_len_minimum", + "cmt_insert_file_header", + "cmt_insert_file_footer", + "cmt_insert_func_header", + "cmt_insert_class_header", + "cmt_insert_oc_msg_header", + "cmt_insert_before_preproc", + "cmt_insert_before_inlines", + "cmt_insert_before_ctor_dtor", + "mod_full_brace_do", + "mod_full_brace_for", + "mod_full_brace_function", + "mod_full_brace_if", + "mod_full_brace_if_chain", + "mod_full_brace_if_chain_only", + "mod_full_brace_nl", + "mod_full_brace_nl_block_rem_mlcond", + "mod_full_brace_while", + "mod_full_brace_using", + "mod_paren_on_return", + "mod_pawn_semicolon", + "mod_full_paren_if_bool", + "mod_remove_extra_semicolon", + "mod_add_long_function_closebrace_comment", + "mod_add_long_namespace_closebrace_comment", + "mod_add_long_class_closebrace_comment", + "mod_add_long_switch_closebrace_comment", + "mod_add_long_ifdef_endif_comment", + "mod_add_long_ifdef_else_comment", + "mod_sort_import", + "mod_sort_using", + "mod_sort_include", + "mod_move_case_break", + "mod_case_brace", + "mod_remove_empty_return", + "mod_sort_oc_properties", + "mod_sort_oc_property_class_weight", + "mod_sort_oc_property_thread_safe_weight", + "mod_sort_oc_property_readwrite_weight", + "mod_sort_oc_property_reference_weight", + "mod_sort_oc_property_getter_weight", + "mod_sort_oc_property_setter_weight", + "mod_sort_oc_property_nullability_weight", + "pp_indent", + "pp_indent_at_level", + "pp_indent_count", + "pp_space", + "pp_space_count", + "pp_indent_region", + "pp_region_indent_code", + "pp_indent_if", + "pp_if_indent_code", + "pp_define_at_level", + "pp_ignore_define_body", + "pp_indent_case", + "pp_indent_func_def", + "pp_indent_extern", + "pp_indent_brace", + "include_category_0", + "include_category_1", + "include_category_2", + "use_indent_func_call_param", + "use_indent_continue_only_once", + "use_options_overriding_for_qt_macros", + "warn_level_tabs_found_in_verbatim_string_literals", + "option_count", +] + +# ------------------------------------------------------------------------------ + + +def enum(**enums): + return type('Enum', (), enums) + + +MODE = enum(ALL=0, TRAILING=1, STARTING=2) + + +def get_strings(fp): + lines = [] + with open(fp, 'r') as f: + lines = f.read().splitlines() + return lines + + +def process(in_lines, out_lines, strings_list, mode): + for in_line in in_lines: + flag_continue = False + comment_start = in_line.find('#') + + if comment_start == -1: + out_lines.append(in_line) + continue + + if mode == MODE.ALL: + pass + elif mode == MODE.TRAILING: + if comment_start == 0: + flag_continue = True + else: + before_comment_lstripped = in_line[:comment_start + 1].lstrip() + trailing_test_start = before_comment_lstripped.find('#') + if trailing_test_start == 0: + flag_continue = True + + elif mode == MODE.STARTING: + in_line_lstripped = in_line.lstrip() + comment_start = in_line_lstripped.find('#') + if comment_start != 0: + flag_continue = True + else: + raise Exception("Unknown Mode") + + if flag_continue: + out_lines.append(in_line) + continue + + comment_string = in_line[comment_start + 1:].strip() + if not comment_string: + continue # removes '#' in line ending with it + + flag_matched = False + + ns_comment_string = comment_string.lower().replace(' ', '') + for search_str in strings_list: + ns_search_str = search_str.lower().replace(' ', '') + + edits = editdistance.eval(ns_search_str, ns_comment_string) + p = 100 * edits / len(ns_comment_string) + + if p <= MATCH_MAX_DELTA_PERCENT or edits <= MATCH_MAX_DELTA_CHARS: + flag_matched = True + break + + if flag_matched: + if mode == MODE.STARTING: + continue + + out_lines.append(in_line[:comment_start].rstrip()) + else: + out_lines.append(in_line) + + +def rewrite_lineends(in_lines, out_lines): + out_lines.clear() + out_lines.extend(in_lines) + + +def rem_option_comments(in_lines, out_lines, options_list): + for in_line in in_lines: + s_in_line = in_line.strip() + comment_start = s_in_line.find('#') + equals_start = s_in_line.find('=') + if comment_start != 0 or equals_start < comment_start: + out_lines.append(in_line) + continue + + comment_string = s_in_line[comment_start + 1:].strip() + + # ignore lines: #